bcrypt-ruby 3.1.1-x86-mswin32-60 → 3.1.2.rc1-x86-mswin32-60

data/.gitignore

@@ -1,6 +1,7 @@
 *.o
 *.bundle
 *.so
+*.jar
 ext/mri/Makefile
 doc
 pkg

data/CHANGELOG

@@ -53,3 +53,7 @@
 
 3.1.1  Jul 10 2013
   - Remove support for Ruby 1.8 in compiled win32 binaries
+
+3.1.2  Aug 23 2013
+  - Add support for Ruby 1.8 and 2.0 (in addition to 1.9) in compiled Windows binaries
+  - Add support for 64-bit Windows

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bcrypt-ruby (3.1.1)
+    bcrypt-ruby (3.1.2.rc1)
 
 GEM
   remote: https://rubygems.org/
@@ -9,8 +9,8 @@ GEM
     diff-lcs (1.2.4)
     json (1.7.3)
     json (1.7.3-java)
-    rake (10.0.4)
-    rake-compiler (0.8.3)
+    rake (10.1.0)
+    rake-compiler (0.9.1)
       rake
     rdoc (3.12)
       json (~> 1.4)
@@ -30,6 +30,6 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby!
-  rake-compiler
+  rake-compiler (~> 0.9.0)
   rdoc
   rspec

data/README.md

@@ -31,13 +31,13 @@ re-hash those passwords. This vulernability only affected the JRuby gem.
 The bcrypt-ruby gem is available on the following ruby platforms:
 
 * JRuby
-* RubyInstaller 1.9 builds on win32
-* Any 1.8 or 1.9 ruby on a BSD/OSX/Linux system with a compiler
+* RubyInstaller 1.8, 1.9, and 2.0 builds on win32
+* Any 1.8, 1.9, or 2.0 ruby on a BSD/OSX/Linux system with a compiler
 
 ## How to use `bcrypt()` in your Rails application
 
 *Note*: Rails versions >= 3 ship with `ActiveModel::SecurePassword` which uses bcrypt-ruby.
-`has_secure_password` [docs](http://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password) 
+`has_secure_password` [docs](http://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password)
 implements a similar authentication strategy to the code below.
 
 ### The _User_ model

data/Rakefile

@@ -57,7 +57,7 @@ else
   Rake::ExtensionTask.new("bcrypt_ext", GEMSPEC) do |ext|
     ext.ext_dir = 'ext/mri'
     ext.cross_compile = true
-    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60', 'x64-mingw32']
   end
 end
 

data/bcrypt-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt-ruby'
-  s.version = '3.1.1'
+  s.version = '3.1.2.rc1'
 
   s.summary = "OpenBSD's bcrypt() password hashing algorithm."
   s.description = <<-EOF
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'rake-compiler', '~> 0.9.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rdoc'
 

data/lib/bcrypt.rb

@@ -9,7 +9,13 @@ else
   require "openssl"
 end
 
-require 'bcrypt_ext'
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/bcrypt_ext"
+rescue LoadError
+  require "bcrypt_ext"
+end
+
 require 'bcrypt/error'
 require 'bcrypt/engine'
 require 'bcrypt/password'

metadata

@@ -1,71 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
-version: !ruby/object:Gem::Version
-  version: 3.1.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 2560206937
+  prerelease: 6
+  segments: 
+  - 3
+  - 1
+  - 2
+  - rc
+  - 1
+  version: 3.1.2.rc1
 platform: x86-mswin32-60
-authors:
+authors: 
 - Coda Hale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2013-08-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  name: rake-compiler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "    bcrypt() is a sophisticated and secure hash algorithm designed
-  by The OpenBSD project\n    for hashing passwords. bcrypt-ruby provides a simple,
-  humane wrapper for safely handling\n    passwords.\n"
+  type: :development
+  requirement: *id003
+description: "    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project\n    for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling\n    passwords.\n"
 email: coda.hale@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - COPYING
 - CHANGELOG
@@ -73,7 +77,7 @@ extra_rdoc_files:
 - lib/bcrypt/error.rb
 - lib/bcrypt/password.rb
 - lib/bcrypt.rb
-files:
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -102,42 +106,48 @@ files:
 - spec/bcrypt/error_spec.rb
 - spec/bcrypt/password_spec.rb
 - spec/spec_helper.rb
-- lib/bcrypt_ext.so
+- lib/1.8/bcrypt_ext.so
+- lib/1.9/bcrypt_ext.so
+- lib/2.0/bcrypt_ext.so
 homepage: http://bcrypt-ruby.rubyforge.org
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - bcrypt-ruby
 - --line-numbers
 - --inline-source
 - --main
 - README.md
-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'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 295284865
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 295284865
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: bcrypt-ruby
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OpenBSD's bcrypt() password hashing algorithm.
 test_files: []
+