phashion 1.0.5 → 1.0.6

data/CHANGES.md

@@ -1,6 +1,13 @@
 History
 =========
 
+1.0.6
+------
+
+* Update pHash to version 0.9.6
+* PNG support added
+* Requiring rdoc tasks fixed
+ 
 1.0.5
 -------
 

data/Gemfile

@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gemspec

data/README.md

@@ -35,6 +35,17 @@ Usage
     img1.duplicate?(img2)
     --> true
 
+Testing
+------------
+
+To run the test suite:
+
+```bash
+bundle
+rake compile
+rake
+```
+
 Author
 ==========
 

data/Rakefile

@@ -25,7 +25,7 @@ task :test
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "phashion"

data/ext/phashion_ext/extconf.rb

@@ -9,6 +9,7 @@ $libraries = " -L#{HERE}/lib"
 $LIBPATH = ["#{HERE}/lib"]
 $CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
 $LDFLAGS = "#{$libraries} #{$LDFLAGS}"
+$CXXFLAGS = ' -pthread'  
 
 Dir.chdir(HERE) do
   if File.exist?("lib")
@@ -19,7 +20,7 @@ Dir.chdir(HERE) do
     raise "'#{cmd}' failed" unless system(cmd)
 
     Dir.chdir(BUNDLE_PATH) do
-      puts(cmd = "env CFLAGS='#{$CFLAGS}' LDFLAGS='#{$LDFLAGS}' ./configure --prefix=#{HERE} --disable-audio-hash --disable-video-hash --disable-shared --with-pic 2>&1")
+      puts(cmd = "env CXXFLAGS='#{$CXXFLAGS}' CFLAGS='#{$CFLAGS}' LDFLAGS='#{$LDFLAGS}' ./configure --prefix=#{HERE} --disable-audio-hash --disable-video-hash --disable-shared --with-pic 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
 
       puts(cmd = "make || true 2>&1")
@@ -34,12 +35,12 @@ Dir.chdir(HERE) do
 
     system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
   end
-  
+
   Dir.chdir("#{HERE}/lib") do
     system("cp -f libpHash.a libpHash_gem.a")
     system("cp -f libpHash.la libpHash_gem.la")
   end
-  $LIBS = " -lpthread -lpHash_gem -lstdc++ -ljpeg"
+  $LIBS = " -lpthread -lpHash_gem -lstdc++ -ljpeg -lpng"
 end
 
-create_makefile 'phashion_ext'
+create_makefile 'phashion_ext'

data/lib/phashion.rb

@@ -7,7 +7,7 @@
 # int ph_hamming_distance(ulong64 hasha, ulong64 hashb);
 
 module Phashion
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   class Image
     SETTINGS = {

data/phashion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phashion}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
   s.authors = ["Mike Perham"]
   s.description = %q{Simple wrapper around the pHash library}
   s.email = %q{mperham@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phashion
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70298302351400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70298302351400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Simple wrapper around the pHash library
 email: mperham@gmail.com
 executables: []
@@ -32,11 +37,12 @@ files:
 - .document
 - .gitignore
 - CHANGES.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - ext/phashion_ext/extconf.rb
-- ext/phashion_ext/pHash-0.9.3.tar.gz
+- ext/phashion_ext/pHash-0.9.6.tar.gz
 - ext/phashion_ext/phashion_ext.c
 - lib/phashion.rb
 - phashion.gemspec
@@ -73,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple wrapper around the pHash library