modernise packaging

* use bundler to manage the load path during development
* upgrade to rspec 2.x

Author: yob

.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

Gemfile

@@ -0,0 +1,3 @@
+source :gemcutter
+
+gemspec

Rakefile

@@ -1,22 +1,20 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
+require "rubygems"
+require "bundler"
+Bundler.setup
 
+require 'rake'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
-require 'rake/gempackagetask'
-
-# allow require of spec/spec_helper
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+require 'rspec/core/rake_task'
 
-require 'onix'
 
 desc "Default Task"
 task :default => [ :spec ]
 
+# run all rspecs
+desc "Run all rspec files"
+RSpec::Core::RakeTask.new("spec") do |t|
+  t.rspec_opts  = ["--color", "--format progress"]
+end
 desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -27,52 +25,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-desc "Generate RCov reports"
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems', '--exclude', 'riddle']
-end
-
-spec = Gem::Specification.new do |s|
-  s.name              = "onix"
-  s.version           = ONIX::Version::String
-  s.summary           = "A convient mapping between ruby objects and the ONIX XML specification"
-  s.description       = "A convient mapping between ruby objects and the ONIX XML specification"
-  s.author            = "James Healy"
-  s.email             = "jimmy@deefa.com"
-  s.has_rdoc          = true
-  s.rubyforge_project = "rbook"
-  s.homepage          = "http://github.com/yob/onix/tree/master"
-  s.rdoc_options     << "--title" << "ONIX - Working with the ONIX XML spec" <<
-                        "--line-numbers"
-  s.test_files        = FileList["spec/**/*.rb"]
-  s.files             = FileList[
-    "lib/**/*.rb",
-    "README.markdown",
-    "TODO",
-    "CHANGELOG",
-    "tasks/**/*.rb",
-    "tasks/**/*.rake",
-    "dtd/**/*.*",
-    "support/**/*.*",
-    "spec/**/*.*"
-  ]
-  s.add_dependency('roxml', '>=3.1.6')
-  s.add_dependency('andand')
-  s.add_dependency('nokogiri', '>=1.4')
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end

onix.gemspec

@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+  s.name              = "onix"
+  s.version           = "0.8.4"
+  s.summary           = "A convient mapping between ruby objects and the ONIX XML specification"
+  s.description       = "A convient mapping between ruby objects and the ONIX XML specification"
+  s.authors           = ["James Healy"]
+  s.email             = ["jimmy@deefa.com"]
+  s.has_rdoc          = true
+  s.homepage          = "http://github.com/yob/onix"
+  s.rdoc_options     << "--title" << "ONIX - Working with the ONIX XML spec" <<
+                        "--line-numbers"
+  s.test_files        = Dir.glob("spec/**/*.rb")
+  s.files             = Dir.glob("{lib/support/dtd}/**/*") + ["README.markdown", "TODO", "CHANGELOG"]
+
+  s.add_dependency('yob-roxml', '>=3.1.6')
+  s.add_dependency('activesupport', '< 3.0')
+  s.add_dependency('andand')
+  s.add_dependency('nokogiri', '>=1.4')
+
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec", "~>2.1")
+end
+

spec/apa_product_spec.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'date'
 
-context "ONIX::APAProduct" do
+describe "ONIX::APAProduct" do
 
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -12,7 +12,7 @@
     @product_node = @doc.root
   end
 
-  specify "should provide read access to attributes" do
+  it "should provide read access to attributes" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @apa     = ONIX::APAProduct.new(@product)
 
@@ -26,7 +26,7 @@
     @apa.pack_quantity.should eql(12)
   end
 
-  specify "should provide write access to attributes" do
+  it "should provide write access to attributes" do
     apa = ONIX::APAProduct.new
 
     apa.notification_type = 3
@@ -56,8 +56,8 @@
 
 end
 
-context ONIX::APAProduct, "series method" do
-  specify "should set the nested series value on the underlying product class" do
+describe ONIX::APAProduct, "series method" do
+  it "should set the nested series value on the underlying product class" do
     apa = ONIX::APAProduct.new
 
     apa.series = "Harry Potter"
@@ -66,31 +66,31 @@
   end
 end
 
-context ONIX::APAProduct, "price method" do
+describe ONIX::APAProduct, "price method" do
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(@data_path, "usd.xml")
     @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @product_node = @doc.root
   end
 
-  specify "should return the first price in the file, regardless of type" do
+  it "should return the first price in the file, regardless of type" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @apa     = ONIX::APAProduct.new(@product)
 
     @apa.price.should eql(BigDecimal.new("99.95"))
   end
 end
 
-context ONIX::APAProduct, "rrp_exc_sales_tax method" do
+describe ONIX::APAProduct, "rrp_exc_sales_tax method" do
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(@data_path, "usd.xml")
     @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @product_node = @doc.root
   end
 
-  specify "should return the first price in the file of type 1" do
+  it "should return the first price in the file of type 1" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @apa     = ONIX::APAProduct.new(@product)
 

spec/audience_range_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::AudienceRange" do
+describe ONIX::AudienceRange do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
     aud.to_xml.to_s[0,15].should eql("<AudienceRange>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
 
     aud.audience_range_qualifier.should eql(11)
@@ -28,7 +28,7 @@
     aud.audience_range_values[1].should eql(5)
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     aud = ONIX::AudienceRange.new
 
     aud.audience_range_qualifier = 12

spec/contributor_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Contributor" do
+describe ONIX::Contributor do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,20 +11,20 @@
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     header = ONIX::Contributor.from_xml(@root.to_s)
     header.to_xml.to_s[0,13].should eql("<Contributor>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     contrib = ONIX::Contributor.from_xml(@root.to_s)
 
     contrib.contributor_role.should eql("A01")
     contrib.person_name_inverted.should eql("SHAPIRO")
     contrib.sequence_number.should eql(1)
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     contrib = ONIX::Contributor.new
 
     contrib.contributor_role = "A02"

spec/header_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Header" do
+describe ONIX::Header do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@
     @header_node = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     header = ONIX::Header.from_xml(@header_node.to_s)
     header.to_xml.to_s[0,8].should eql("<Header>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     header = ONIX::Header.from_xml(@header_node.to_s)
 
     header.from_ean_number.should eql("1111111111111")
@@ -42,7 +42,7 @@
     header.default_class_of_trade.should eql("f")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     header = ONIX::Header.new
 
     header.from_ean_number = "1111111111111"
@@ -95,7 +95,7 @@
     header.to_xml.to_s.include?("<DefaultClassOfTrade>f</DefaultClassOfTrade>").should be_true
   end
 
-  specify "should correctly handle text with & < and >" do
+  it "should correctly handle text with & < and >" do
     header = ONIX::Header.new
 
     header.from_company = "James & Healy"
@@ -109,9 +109,9 @@
   end
 end
 
-context "ONIX::Header" do
+describe ONIX::Header do
 
-  specify "should correctly handle headers with an invalid sent date" do
+  it "should correctly handle headers with an invalid sent date" do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file = File.join(data_path, "header_invalid_sentdate.xml")
     header = ONIX::Header.from_xml(File.read(file))

spec/imprint_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Imprint" do
+describe ONIX::Imprint do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,18 +11,18 @@
     @root     = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     imp = ONIX::Imprint.from_xml(@root.to_s)
     imp.to_xml.to_s[0,9].should eql("<Imprint>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     imp = ONIX::Imprint.from_xml(@root.to_s)
 
     imp.imprint_name.should eql("Oxford University Press UK")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     imp = ONIX::Imprint.new
 
     imp.imprint_name = "Paulist Press"

spec/language_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Language" do
+describe ONIX::Language do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,20 +11,20 @@
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     lan = ONIX::Language.from_xml(@root.to_s)
     lan.to_xml.to_s[0,10].should eql("<Language>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     lan = ONIX::Language.from_xml(@root.to_s)
 
     lan.language_role.should eql(1)
     lan.language_code.should eql("eng")
     lan.country_code.should eql("US")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     lan = ONIX::Language.new
 
     lan.language_role = 2