cityhash 0.4.0 → 0.5.0

data/cityhash.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cityhash}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["nashby"]
-  s.date = %q{2011-04-23}
+  s.authors = [%q{nashby}]
+  s.date = %q{2011-10-28}
   s.description = %q{ffi wrapper for google's cityhash}
   s.email = %q{younash@gmail.com}
+  s.extensions = [%q{ext/cityhash/extconf.rb}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -24,21 +25,20 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "cityhash.gemspec",
+    "ext/cityhash/city.cc",
+    "ext/cityhash/city.h",
+    "ext/cityhash/city_ruby_bridge.cpp",
+    "ext/cityhash/city_ruby_bridge.h",
+    "ext/cityhash/extconf.rb",
     "lib/cityhash.rb",
-    "lib/cityhash/ext/libcity.so",
-    "lib/cityhash/ext/src/Makefile",
-    "lib/cityhash/ext/src/city.cc",
-    "lib/cityhash/ext/src/city.h",
-    "lib/cityhash/ext/src/city_ruby_bridge.cpp",
-    "lib/cityhash/ext/src/city_ruby_bridge.h",
     "lib/cityhash/version.rb",
     "test/helper.rb",
     "test/test_cityhash.rb"
   ]
   s.homepage = %q{http://github.com/nashby/cityhash}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{ffi wrapper for google's cityhash}
   s.test_files = [
     "test/helper.rb",

data/ext/cityhash/extconf.rb

@@ -0,0 +1,12 @@
+require 'mkmf'
+
+have_library('objc') if RUBY_PLATFORM =~ /darwin/
+
+%w{g O3 Wall rdynamic}.each do |flag|
+  flag = "-#{flag}"
+  $CPPFLAGS += " #{flag}" unless $CPPFLAGS.split.include? flag
+end
+
+CONFIG['LDSHARED'] = '$(CXX) -shared' unless RUBY_PLATFORM =~ /darwin/
+
+create_makefile('cityhash')

data/lib/cityhash.rb

@@ -8,7 +8,17 @@ module CityHash
   module Internal
     extend FFI::Library
 
-    ffi_lib File.dirname(__FILE__)+"/cityhash/ext/libcity.so"
+    ffi_lib(
+      case RUBY_PLATFORM
+        when /darwin/
+          File.join(File.dirname(__FILE__), '..', 'ext', 'cityhash', 'cityhash.bundle')
+        when /mingw|mswin|linux/
+          File.join(File.dirname(__FILE__), '..', 'ext', 'cityhash', 'cityhash.so')
+        else
+          File.join(File.dirname(__FILE__), '..', 'ext', 'cityhash', "cityhash.#{RbConfig::CONFIG['DLEXT']}")
+      end
+    )
+
     attach_function :city_hash64, :CityHash64, [:string, :size_t], :uint64
     attach_function :city_hash64_with_seed, :CityHash64WithSeed, [:string, :size_t, :uint64], :uint64
     attach_function :city_hash64_with_seeds, :CityHash64WithSeeds, [:string, :size_t, :uint64, :uint64], :uint64

data/lib/cityhash/version.rb

@@ -1,12 +1,12 @@
 module CityHash
- 
+
   module Version
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end
-  
+
 end

metadata

@@ -1,94 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cityhash
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - nashby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-23 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &24780520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24780520
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &24779860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24779860
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &24779220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24779220
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &24778500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24778500
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &24777780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24777780
+- !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &24776560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *24776560
 description: ffi wrapper for google's cityhash
 email: younash@gmail.com
 executables: []
-
-extensions: []
-
-extra_rdoc_files: 
+extensions:
+- ext/cityhash/extconf.rb
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -96,47 +93,43 @@ files:
 - README.md
 - Rakefile
 - cityhash.gemspec
+- ext/cityhash/city.cc
+- ext/cityhash/city.h
+- ext/cityhash/city_ruby_bridge.cpp
+- ext/cityhash/city_ruby_bridge.h
+- ext/cityhash/extconf.rb
 - lib/cityhash.rb
-- lib/cityhash/ext/libcity.so
-- lib/cityhash/ext/src/Makefile
-- lib/cityhash/ext/src/city.cc
-- lib/cityhash/ext/src/city.h
-- lib/cityhash/ext/src/city_ruby_bridge.cpp
-- lib/cityhash/ext/src/city_ruby_bridge.h
 - lib/cityhash/version.rb
 - test/helper.rb
 - test/test_cityhash.rb
-has_rdoc: true
 homepage: http://github.com/nashby/cityhash
-licenses: 
+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 
-      hash: 282303183
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4372501756799673446
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ffi wrapper for google's cityhash
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_cityhash.rb

data/lib/cityhash/ext/src/Makefile

@@ -1,2 +0,0 @@
-all:
-	g++ -shared -fPIC city.cc city_ruby_bridge.cpp -o ../libcity.so