ffi-msgpack 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1,2 @@
+doc
+pkg

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 0.2.1 / 2012-05-11
+
+* Temporarily drop support for [Rubinius](http://rubini.us/) due to [missing
+  FFI::Union](https://github.com/rubinius/rubinius/issues/1717).
+* Load `libmsgpack.so.3` if `libmsgpack.so` does not exist.
+* Use `:string`, `:buffer_out`, `:buffer_in` FFI types.
+* {FFI::MsgPack::MsgObject#set!} now raises a TypeError when given
+  ambigious values.
+
 ### 0.2.0 / 2011-02-18
 
 * Added {FFI::MsgPack::MsgObject#set!}.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-2012 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 # ffi-msgpack
 
-* [Source](http://github.com/postmodern/ffi-msgpack/)
-* [Issues](http://github.com/postmodern/ffi-msgpack/issues)
+* [Source](https://github.com/postmodern/ffi-msgpack/)
+* [Issues](https://github.com/postmodern/ffi-msgpack/issues)
 * [Documentation](http://rubydoc.info/ffi-msgpack)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
@@ -80,15 +80,19 @@ Enumerates over each unpacked Object from a stream:
 
 ## Requirements
 
+* [Ruby](http://ruby-lang.org/) >= 1.8.7 or
+  [JRruby](http://jruby.org) >= 1.6
+  * [Rubinius](http://rubini.us/) is not currently supported due to
+    [Issue 1717](https://github.com/rubinius/rubinius/issues/1717)
 * [libmsgpack](http://msgpack.sourceforge.net/) >= 0.5.0
-* [ffi](http://github.com/ffi/ffi) >= 0.6.0, <= 1.1.0
+* [ffi](http://github.com/ffi/ffi) ~> 1.0
 
 ## Install
 
-    $ sudo gem install ffi-msgpack
+    $ gem install ffi-msgpack
 
 ## License
 
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-2012 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.6.0'
+  gem 'yard', '~> 0.7'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/ffi-msgpack.gemspec

@@ -1,15 +1,127 @@
-# -*- encoding: utf-8 -*-
-
-begin
-  Ore::Specification.new do |gemspec|
-    # custom logic here
-  end
-rescue NameError
-  begin
-    require 'ore/specification'
-    retry
-  rescue LoadError
-    STDERR.puts "The 'ffi-msgpack.gemspec' file requires Ore."
-    STDERR.puts "Run `gem install ore-core` to install Ore."
+# encoding: utf-8
+
+require 'yaml'
+
+Gem::Specification.new do |gemspec|
+  files = if File.directory?('.git')
+            `git ls-files`.split($/)
+          elsif File.directory?('.hg')
+            `hg manifest`.split($/)
+          elsif File.directory?('.svn')
+            `svn ls -R`.split($/).select { |path| File.file?(path) }
+          else
+            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
+          end
+
+  filter_files = lambda { |paths|
+    case paths
+    when Array
+      (files & paths)
+    when String
+      (files & Dir[paths])
+    end
+  }
+
+  version = {
+    :file => 'lib/ffi/msgpack/version.rb',
+    :constant => 'FFI::MsgPack::VERSION'
+  }
+
+  defaults = {
+    'name' => File.basename(File.dirname(__FILE__)),
+    'files' => files,
+    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+  }
+
+  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+
+  gemspec.name = metadata.fetch('name',defaults[:name])
+  gemspec.version = if metadata['version']
+                      metadata['version']
+                    elsif File.file?(version[:file])
+                      require File.join('.',version[:file])
+                      eval(version[:constant])
+                    end
+
+  gemspec.summary = metadata.fetch('summary',metadata['description'])
+  gemspec.description = metadata.fetch('description',metadata['summary'])
+
+  case metadata['license']
+  when Array
+    gemspec.licenses = metadata['license']
+  when String
+    gemspec.license = metadata['license']
+  end
+
+  case metadata['authors']
+  when Array
+    gemspec.authors = metadata['authors']
+  when String
+    gemspec.author = metadata['authors']
+  end
+
+  gemspec.email = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  case metadata['require_paths']
+  when Array
+    gemspec.require_paths = metadata['require_paths']
+  when String
+    gemspec.require_path = metadata['require_paths']
+  end
+
+  gemspec.files = filter_files[metadata['files']]
+
+  gemspec.executables = metadata['executables']
+  gemspec.extensions = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  gemspec.test_files = filter_files[metadata['test_files']]
+
+  unless gemspec.files.include?('.document')
+    gemspec.extra_rdoc_files = metadata['extra_doc_files']
+  end
+
+  gemspec.post_install_message = metadata['post_install_message']
+  gemspec.requirements = metadata['requirements']
+
+  if gemspec.respond_to?(:required_ruby_version=)
+    gemspec.required_ruby_version = metadata['required_ruby_version']
+  end
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
 end

data/gemspec.yml

@@ -1,19 +1,19 @@
 name: ffi-msgpack
-version: 0.2.0
+version: 0.2.1
 summary: FFI bindings for msgpack
 description: Ruby FFI bindings for the msgpack library.
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/postmodern/ffi-msgpack
+homepage: https://github.com/postmodern/ffi-msgpack
 has_yard: true
 
 requirements: libmsgpack >= 0.5.0
 
 dependencies:
-  ffi: >= 0.6.0, <= 1.1.0
+  ffi: ~> 1.0
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
-  yard: ~> 0.6.0
+  yard: ~> 0.7

data/lib/ffi/msgpack/msg_object.rb

@@ -328,7 +328,7 @@ module FFI
       # @return [MsgObject]
       #   The new Msg Object.
       #
-      # @raise [ArgumentError]
+      # @raise [TypeError]
       #   The object was not a {Hash}, {Array}, {String}, {Symbol}, {Float},
       #   {Integer}, `true`, `false` or `nil`.
       #
@@ -351,7 +351,7 @@ module FFI
         when NilClass
           set_nil!
         else
-          raise(ArgumentError,"ambigious object to create MsgObject from: #{value.inspect}")
+          raise(TypeError,"ambigious object to create MsgObject from: #{value.inspect}")
         end
 
         return value

data/lib/ffi/msgpack/msgpack.rb

@@ -8,7 +8,7 @@ module FFI
   module MsgPack
     extend FFI::Library
 
-    ffi_lib 'msgpack'
+    ffi_lib ['msgpack', 'libmsgpack.so.3']
 
     begin
       attach_function :msgpack_version, [], :string
@@ -65,7 +65,7 @@ module FFI
 
     #attach_function :msgpack_unpacker_message_size, [:pointer], :size_t
 
-    attach_function :msgpack_unpack, [:pointer, :size_t, :pointer, :pointer, :pointer], :msgpack_unpack_return
+    attach_function :msgpack_unpack, [:string, :size_t, :pointer, :pointer, :pointer], :msgpack_unpack_return
 
     #attach_function :msgpack_unpacker_parsed_size, [:pointer], :size_t
 
@@ -109,7 +109,7 @@ module FFI
 
     #attach_function :msgpack_pack_raw, [:pointer, :size_t], :int
 
-    #attach_function :msgpack_pack_raw_body, [:pointer, :pointer, :size_t], :int
+    #attach_function :msgpack_pack_raw_body, [:pointer, :buffer_in, :size_t], :int
 
     attach_function :msgpack_pack_object, [:pointer, MsgObject.by_value], :int
 

data/lib/ffi/msgpack/packer.rb

@@ -97,10 +97,10 @@ module FFI
       #   The new callback.
       #
       def callback(&block)
-        self[:callback] = Proc.new do |data_ptr,packed_ptr,length|
+        self[:callback] = Proc.new do |data_ptr,packed_buffer,length|
           @total += length
 
-          packed = packed_ptr.get_bytes(0,length)
+          packed = packed_buffer.get_bytes(0,length)
 
           if block.arity == 2
             block.call(packed,length)

metadata

@@ -1,76 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi-msgpack
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
-    - - <=
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ore-tasks
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Ruby FFI bindings for the msgpack library.
-email: 
-- postmodern.mod3@gmail.com
+email: postmodern.mod3@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- ChangeLog.md
+- LICENSE.txt
 - README.md
-files: 
+files:
 - .gemtest
+- .gitignore
 - .rspec
 - .yardopts
 - ChangeLog.md
@@ -119,44 +134,42 @@ files:
 - spec/packer_spec.rb
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
-has_rdoc: true
-homepage: http://github.com/postmodern/ffi-msgpack
-licenses: 
+homepage: https://github.com/postmodern/ffi-msgpack
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - libmsgpack >= 0.5.0
-rubyforge_project: ffi-msgpack
-rubygems_version: 1.5.0
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FFI bindings for msgpack
-test_files: 
-- spec/msg_object_spec.rb
-- spec/packer_spec.rb
-- spec/unpacker_spec.rb
-- spec/extensions/integer_spec.rb
-- spec/extensions/true_class_spec.rb
+test_files:
 - spec/extensions/array_spec.rb
 - spec/extensions/false_class_spec.rb
 - spec/extensions/float_spec.rb
-- spec/extensions/symbol_spec.rb
-- spec/extensions/string_spec.rb
-- spec/extensions/nil_class_spec.rb
 - spec/extensions/hash_spec.rb
+- spec/extensions/integer_spec.rb
+- spec/extensions/nil_class_spec.rb
+- spec/extensions/string_spec.rb
+- spec/extensions/symbol_spec.rb
+- spec/extensions/true_class_spec.rb
+- spec/msg_object_spec.rb
+- spec/packer_spec.rb
+- spec/unpacker_spec.rb