Skip to content

Commit

Permalink
Merge pull request #41 from westonplatter/version-bump
Browse files Browse the repository at this point in the history
Version bump in pre for release
  • Loading branch information
westonplatter committed Mar 19, 2014
2 parents 39910db + da4d59b commit 5776d66
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Gemfile.lock
tmp

## PROJECT::SPECIFIC
ext/phashion_ext/include/
ext/phashion_ext/lib/
ext/phashion_ext
!ext/phashion_ext/extconf.rb
!ext/phashion_ext/phashion_ext.c
!ext/phashion_ext/pHash-0.9.6.tar.gz
lib/phashion_ext.bundle
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
History
=========

1.1.0
-----
* Converted to Minitest (issue #35)
* Added Phashion.distance_from method (issue #30)
* Add Sqlite3 extension to handle distance calculations (issue #27)

1.0.8
------
* Renamed the pHashion tar.gz archive as "pHash-0.9.6.tar.gz" to solve/enable install from github
Expand Down
3 changes: 3 additions & 0 deletions lib/phashion/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module Phashion
VERSION = '1.1.0'
end
13 changes: 8 additions & 5 deletions phashion.gemspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# -*- encoding: utf-8 -*-

lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'phashion/version'

Gem::Specification.new do |s|
s.name = %q{phashion}
s.version = "1.0.8"
s.name = 'phashion'
s.version = Phashion::VERSION
s.authors = ["Mike Perham"]
s.email = ["mperham@gmail.com"]
s.description = %q{Simple wrapper around the pHash library}
s.homepage = %q{http://github.com/westonplatter/phashion}
s.description = 'Simple wrapper around the pHash library'
s.homepage = 'http://github.com/westonplatter/phashion'

s.extensions = ["ext/phashion_ext/extconf.rb"]
s.files = `git ls-files`.split("\n")
Expand Down

0 comments on commit 5776d66

Please sign in to comment.