bindata 1.4.3 → 1.4.4

data/spec/wrapper_spec.rb

@@ -4,17 +4,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_common"))
 require 'bindata'
 
 describe BinData::Wrapper do
-  let(:r) { BinData::RegisteredClasses }
-
-  it "should not be registered" do
-    lambda {
-      r.lookup("Wrapper")
-    }.should raise_error(BinData::UnRegisteredTypeError)
+  it "is not registered" do
+    expect {
+      BinData::RegisteredClasses.lookup("Wrapper")
+    }.to raise_error(BinData::UnRegisteredTypeError)
   end
 end
 
 describe BinData::Wrapper, "with errors" do
-  it "should not wrap more than one type" do
+  it "does not wrap more than one type" do
     lambda {
       class WrappedMultipleTypes < BinData::Wrapper
         uint8
@@ -25,7 +23,7 @@ describe BinData::Wrapper, "with errors" do
     }
   end
 
-  it "should fail if wrapped type has a name" do
+  it "fails if wrapped type has a name" do
     lambda {
       class WrappedWithName < BinData::Wrapper
         uint8 :a
@@ -35,7 +33,7 @@ describe BinData::Wrapper, "with errors" do
     }
   end
 
-  it "should fail if no types to wrap" do
+  it "fails if no types to wrap" do
     class WrappedNoTypes < BinData::Wrapper
     end
 
@@ -54,23 +52,23 @@ describe BinData::Wrapper, "around a Primitive" do
     uint8 :initial_value => :a
   end
 
-  it "should access custom parameter" do
+  it "accesses custom parameter" do
     subject = WrappedPrimitive.new
     subject.assign(3)
     subject.should == 3
   end
 
-  it "should be able to override custom default parameter" do
+  it "overrides custom default parameter" do
     subject = WrappedPrimitive.new(:a => 5)
     subject.should == 5
   end
 
-  it "should be able to override parameter" do
+  it "overrides parameter" do
     subject = WrappedPrimitive.new(:initial_value => 7)
     subject.should == 7
   end
 
-  it "should clear" do
+  it "clears" do
     subject = WrappedPrimitive.new
     subject.assign(3)
     subject.should_not be_clear
@@ -79,7 +77,7 @@ describe BinData::Wrapper, "around a Primitive" do
     subject.should be_clear
   end
 
-  it "should read" do
+  it "reads" do
     subject = WrappedPrimitive.new
     subject.assign(3)
     str = subject.to_binary_s
@@ -87,7 +85,7 @@ describe BinData::Wrapper, "around a Primitive" do
     WrappedPrimitive.read(str).should == 3
   end
 
-  it "should respond_to and forward messages to the wrapped object" do
+  it "respond_to and forward messages to the wrapped object" do
     subject = WrappedPrimitive.new
     subject.assign(5)
 
@@ -105,12 +103,12 @@ describe BinData::Wrapper, "around an Array" do
     end
   end
 
-  it "should forward parameters" do
+  it "forwards parameters" do
     subject = WrappedIntArray.new(:initial_length => 7)
     subject.length.should == 7
   end
 
-  it "should be able to override default parameters" do
+  it "overrides default parameters" do
     subject = WrappedIntArray.new(:initial_length => 3, :initial_element_value => 5)
     subject.to_binary_s.should == "\x00\x05\x00\x05\x00\x05"
   end
@@ -122,7 +120,7 @@ describe BinData::Wrapper, "around a Choice" do
     choice :choices => { 'a' => :uint8, 'b' => :uint16 }
   end
 
-  it "should forward parameters" do
+  it "forwards parameters" do
     subject = WrappedChoice.new(:selection => 'b')
     subject.num_bytes.should == 2
   end
@@ -138,7 +136,7 @@ describe BinData::Wrapper, "inside a Record" do
     wrapped_uint32le :b, :onlyif => true,  :value => 2
   end
 
-  it "should handle onlyif" do
+  it "handles onlyif" do
     subject = RecordWithWrapped.new
     subject.should == {'b' => 2}
   end
@@ -155,17 +153,17 @@ describe BinData::Wrapper, "around a Record" do
     record_to_be_wrapped
   end
 
-  it "should forward parameters" do
+  it "forwards parameters" do
     subject = WrappedRecord.new(:arg => 5)
     subject.a.should == 5
   end
 
-  it "should assign value" do
+  it "assigns value" do
     subject = WrappedRecord.new(:b => 5)
     subject.b.should == 5
   end
 
-  it "should assign value and forward parameters" do
+  it "assigns value and forward parameters" do
     subject = WrappedRecord.new({:b => 5}, :arg => 7)
     subject.a.should == 7
     subject.b.should == 5
@@ -180,7 +178,7 @@ describe BinData::Wrapper, "derived classes" do
   class ChildDerivedWrapper < ParentDerivedWrapper
   end
 
-  it "should wrap" do
+  it "wraps" do
     a = ChildDerivedWrapper.new
     a.num_bytes.should == 4
   end

data/tasks/pkg.rake

@@ -1,6 +1,6 @@
 begin
   require 'rubygems'
-  require 'rake/gempackagetask'
+  require 'rubygems/package_task'
 
   SPEC = Gem::Specification.new do |s|
     s.name = 'bindata'
@@ -16,7 +16,7 @@ begin
     s.extra_rdoc_files = ['NEWS']
     s.rdoc_options << '--main' << 'NEWS'
     s.files = PKG_FILES
-    s.add_development_dependency('rspec', [">= 1.3.0"])
+    s.add_development_dependency('rspec', [">= 2.10.0"])
     s.add_development_dependency('haml')
     s.add_development_dependency('maruku')
     s.add_development_dependency('syntax')
@@ -30,7 +30,7 @@ begin
     END
   end
 
-  Rake::GemPackageTask.new(SPEC) do |pkg|
+  Gem::PackageTask.new(SPEC) do |pkg|
     pkg.need_tar_gz = true
   end
 

data/tasks/rdoc.rake

@@ -1,4 +1,4 @@
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new() do |rdoc|
   rdoc.main = "NEWS"

data/tasks/rspec.rake

@@ -1,15 +1,15 @@
 begin
-  require 'spec'
-  require 'spec/rake/spectask'
+  require 'rspec'
+  require 'rspec/core/rake_task'
 
-  Spec::Rake::SpecTask.new("spec") do |t|
-    t.warning = false
+  RSpec::Core::RakeTask.new("spec") do |t|
+#    t.ruby_opts = "-w"
     t.rcov = false
-    t.spec_files = FileList['spec/**/*_spec.rb'].exclude("spec/deprecated_spec.rb", "spec/wrapper_spec.rb")
+    t.pattern = 'spec/**/*_spec.rb' #.exclude("spec/deprecated_spec.rb", "spec/wrapper_spec.rb")
   end
 
-  Spec::Rake::SpecTask.new("rcov") do |t|
-    t.warning = true
+  RSpec::Core::RakeTask.new("rcov") do |t|
+    t.ruby_opts = "-w"
     t.rcov = true
   end
 rescue LoadError

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bindata
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Dion Mendel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 +08:00
-default_executable: 
+date: 2012-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 39
         segments: 
-        - 1
-        - 3
+        - 2
+        - 10
         - 0
-        version: 1.3.0
+        version: 2.10.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -92,77 +91,76 @@ extensions: []
 extra_rdoc_files: 
 - NEWS
 files: 
-- COPYING
 - ChangeLog
+- NEWS
+- COPYING
 - BSDL
+- README
 - Rakefile
 - INSTALL
-- README
-- NEWS
-- examples/gzip.rb
 - examples/ip_address.rb
-- examples/nbt.rb
-- examples/NBT.txt
 - examples/list.rb
+- examples/gzip.rb
+- examples/NBT.txt
+- examples/nbt.rb
+- spec/bits_spec.rb
+- spec/stringz_spec.rb
 - spec/count_bytes_remaining_spec.rb
-- spec/base_spec.rb
-- spec/string_spec.rb
-- spec/record_spec.rb
-- spec/example.rb
 - spec/primitive_spec.rb
-- spec/stringz_spec.rb
-- spec/float_spec.rb
 - spec/io_spec.rb
-- spec/system_spec.rb
-- spec/array_spec.rb
+- spec/spec_common.rb
+- spec/example.rb
 - spec/lazy_spec.rb
-- spec/wrapper_spec.rb
-- spec/struct_spec.rb
 - spec/rest_spec.rb
+- spec/struct_spec.rb
+- spec/record_spec.rb
+- spec/deprecated_spec.rb
 - spec/alignment_spec.rb
+- spec/system_spec.rb
 - spec/base_primitive_spec.rb
-- spec/registry_spec.rb
+- spec/array_spec.rb
 - spec/int_spec.rb
-- spec/bits_spec.rb
-- spec/skip_spec.rb
 - spec/choice_spec.rb
-- spec/spec_common.rb
-- spec/deprecated_spec.rb
-- lib/bindata.rb
-- lib/bindata/skip.rb
-- lib/bindata/choice.rb
-- lib/bindata/dsl.rb
-- lib/bindata/params.rb
-- lib/bindata/array.rb
-- lib/bindata/trace.rb
-- lib/bindata/struct.rb
-- lib/bindata/lazy.rb
+- spec/string_spec.rb
+- spec/base_spec.rb
+- spec/registry_spec.rb
+- spec/wrapper_spec.rb
+- spec/skip_spec.rb
+- spec/float_spec.rb
 - lib/bindata/count_bytes_remaining.rb
-- lib/bindata/base.rb
-- lib/bindata/stringz.rb
+- lib/bindata/lazy.rb
+- lib/bindata/rest.rb
+- lib/bindata/int.rb
+- lib/bindata/array.rb
+- lib/bindata/sanitize.rb
+- lib/bindata/params.rb
 - lib/bindata/string.rb
+- lib/bindata/skip.rb
 - lib/bindata/alignment.rb
-- lib/bindata/int.rb
 - lib/bindata/io.rb
+- lib/bindata/registry.rb
+- lib/bindata/deprecated.rb
+- lib/bindata/primitive.rb
 - lib/bindata/base_primitive.rb
-- lib/bindata/wrapper.rb
+- lib/bindata/struct.rb
 - lib/bindata/bits.rb
-- lib/bindata/record.rb
-- lib/bindata/primitive.rb
-- lib/bindata/sanitize.rb
+- lib/bindata/wrapper.rb
 - lib/bindata/offset.rb
-- lib/bindata/rest.rb
-- lib/bindata/deprecated.rb
-- lib/bindata/registry.rb
+- lib/bindata/record.rb
+- lib/bindata/dsl.rb
 - lib/bindata/float.rb
+- lib/bindata/choice.rb
+- lib/bindata/base.rb
+- lib/bindata/trace.rb
+- lib/bindata/stringz.rb
+- lib/bindata.rb
 - tasks/rspec.rake
-- tasks/pkg.rake
 - tasks/manual.rake
 - tasks/rdoc.rake
+- tasks/pkg.rake
 - setup.rb
 - manual.haml
 - manual.md
-has_rdoc: true
 homepage: http://bindata.rubyforge.org
 licenses: []
 
@@ -193,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bindata
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A declarative way to read and write binary file formats