bcrypt-ruby 3.1.2.rc1-java → 3.1.3-java

data/CHANGELOG

@@ -54,6 +54,10 @@
 3.1.1  Jul 10 2013
   - Remove support for Ruby 1.8 in compiled win32 binaries
 
-3.1.2  Aug 23 2013
+3.1.2  Aug 26 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
+
+3.1.3  Feb 21 2014
+  - Add support for Ruby 2.1 in compiled Windows binaries
+  - Rename gem from "bcrypt-ruby" to just "bcrypt". [GH #86 by @sferik]

data/README.md

@@ -2,7 +2,6 @@
 
 An easy way to keep your users' passwords secure.
 
-* http://bcrypt-ruby.rubyforge.org/
 * http://github.com/codahale/bcrypt-ruby/tree/master
 
 [![Build Status](https://travis-ci.org/codahale/bcrypt-ruby.png?branch=master)](https://travis-ci.org/codahale/bcrypt-ruby)
@@ -18,21 +17,21 @@ security experts is not a professional response to risk.
 
 `bcrypt()` allows you to easily harden your application against these kinds of attacks.
 
-*Note*: JRuby versions of bcrypt-ruby `<= 2.1.3` had a [security
+*Note*: JRuby versions of the bcrypt gem `<= 2.1.3` had a [security
 vulnerability](http://www.mindrot.org/files/jBCrypt/internat.adv) that
 was fixed in `>= 2.1.4`. If you used a vulnerable version to hash
 passwords with international characters in them, you will need to
-re-hash those passwords. This vulernability only affected the JRuby gem.
+re-hash those passwords. This vulnerability only affected the JRuby gem.
 
 ## How to install bcrypt
 
-    gem install bcrypt-ruby
+    gem install bcrypt
 
-The bcrypt-ruby gem is available on the following ruby platforms:
+The bcrypt gem is available on the following ruby platforms:
 
 * JRuby
-* 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
+* RubyInstaller 1.8, 1.9, 2.0, and 2.1 builds on win32
+* Any 1.8, 1.9, 2.0, or 2.1 ruby on a BSD/OSX/Linux system with a compiler
 
 ## How to use `bcrypt()` in your Rails application
 

data/lib/bcrypt.rb

@@ -1,21 +1,8 @@
-# A Ruby library implementing OpenBSD's bcrypt()/crypt_blowfish algorithm for
-# hashing passwords.
+# :stopdoc:
+# This dummy class is to keep RDoc and YARD from complaining about an empty
+# lib directory.
 module BCrypt
+  class Dummy
+  end
 end
-
-if RUBY_PLATFORM == "java"
-  require 'java'
-else
-  require "openssl"
-end
-
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/bcrypt_ext"
-rescue LoadError
-  require "bcrypt_ext"
-end
-
-require 'bcrypt/error'
-require 'bcrypt/engine'
-require 'bcrypt/password'
+# :startdoc:

metadata

@@ -1,141 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
-version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 3.1.2.rc1
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 3.1.3
 platform: java
-authors:
-- Coda Hale
-autorequire:
+authors: 
+  - Coda Hale
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-  type: :development
-description: |2
-      bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
-      for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
-      passwords.
+
+date: 2014-02-21 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: rake-compiler
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.9.2
+    requirement: *id001
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rdoc
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "3.12"
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: bcrypt
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.1.3
+    requirement: *id004
+    prerelease: false
+    type: :runtime
+description: "    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project\n    for hashing passwords. The bcrypt Ruby gem provides a simple wrapper for safely handling\n    passwords.\n"
 email: coda.hale@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- README.md
-- COPYING
-- CHANGELOG
-- lib/bcrypt.rb
-- lib/bcrypt/engine.rb
-- lib/bcrypt/error.rb
-- lib/bcrypt/password.rb
-files:
-- .gitignore
-- .rspec
-- .travis.yml
-- CHANGELOG
-- COPYING
-- Gemfile
-- Gemfile.lock
-- README.md
-- Rakefile
-- bcrypt-ruby.gemspec
-- ext/jruby/bcrypt_jruby/BCrypt.java
-- ext/mri/bcrypt_ext.c
-- ext/mri/crypt.c
-- ext/mri/crypt.h
-- ext/mri/crypt_blowfish.c
-- ext/mri/crypt_gensalt.c
-- ext/mri/extconf.rb
-- ext/mri/ow-crypt.h
-- ext/mri/wrapper.c
-- lib/bcrypt.rb
-- lib/bcrypt/engine.rb
-- lib/bcrypt/error.rb
-- lib/bcrypt/password.rb
-- spec/TestBCrypt.java
-- spec/bcrypt/engine_spec.rb
-- spec/bcrypt/error_spec.rb
-- spec/bcrypt/password_spec.rb
-- spec/spec_helper.rb
-- lib/bcrypt_ext.jar
-homepage: http://bcrypt-ruby.rubyforge.org
-licenses:
-- MIT
-post_install_message:
-rdoc_options:
-- --title
-- bcrypt-ruby
-- --line-numbers
-- --inline-source
-- --main
-- README.md
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: '0'
+
+extra_rdoc_files: 
+  - README.md
+  - COPYING
+  - CHANGELOG
+  - lib/bcrypt.rb
+files: 
+  - lib/bcrypt.rb
+  - ext/mri/extconf.rb
+  - README.md
+  - COPYING
+  - CHANGELOG
+  - lib/bcrypt_ext.jar
+homepage: https://github.com/codahale/bcrypt-ruby
+licenses: 
+  - MIT
+post_install_message: |+
+  
+  #######################################################
+  
+  The bcrypt-ruby gem has changed it's name to just bcrypt.  Instead of
+  installing `bcrypt-ruby`, you should install `bcrypt`.  Please update your
+  dependencies accordingly.
+  
+  #######################################################
+  
+rdoc_options: 
+  - --title
+  - bcrypt-ruby
+  - --line-numbers
+  - --inline-source
+  - --main
+  - README.md
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 requirements: []
-rubyforge_project: bcrypt-ruby
+
+rubyforge_project: 
 rubygems_version: 1.8.25
-signing_key:
+signing_key: 
 specification_version: 3
 summary: OpenBSD's bcrypt() password hashing algorithm.
 test_files: []
+

data/.gitignore

@@ -1,10 +0,0 @@
-*.o
-*.bundle
-*.so
-*.jar
-ext/mri/Makefile
-doc
-pkg
-*.class
-tmp/
-.DS_Store

data/.rspec

@@ -1,3 +0,0 @@
---color
---backtrace
---format documentation

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-script: bundle exec rake

data/Gemfile

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

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bcrypt-ruby (3.1.2.rc1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    json (1.7.3)
-    json (1.7.3-java)
-    rake (10.1.0)
-    rake-compiler (0.9.1)
-      rake
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-
-PLATFORMS
-  java
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  bcrypt-ruby!
-  rake-compiler (~> 0.9.0)
-  rdoc
-  rspec

data/Rakefile

@@ -1,74 +0,0 @@
-require 'rspec/core/rake_task'
-require 'rubygems/package_task'
-require 'rake/extensiontask'
-require 'rake/javaextensiontask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/clean'
-require 'rdoc/task'
-require 'benchmark'
-
-CLEAN.include(
-  "ext/mri/*.o",
-  "ext/mri/*.bundle",
-  "ext/mri/*.so",
-  "ext/jruby/bcrypt_jruby/*.class"
-)
-CLOBBER.include(
-  "ext/mri/Makefile",
-  "doc/coverage",
-  "pkg"
-)
-GEMSPEC = eval(File.read(File.expand_path("../bcrypt-ruby.gemspec", __FILE__)))
-
-task :default => [:compile, :spec]
-
-desc "Run all specs"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.ruby_opts = '-w'
-end
-
-desc "Run all specs, with coverage testing"
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rcov = true
-  t.rcov_path = 'doc/coverage'
-  t.rcov_opts = ['--exclude', 'rspec,diff-lcs,rcov,_spec,_helper']
-end
-
-desc 'Generate RDoc'
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.options += GEMSPEC.rdoc_options
-  rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE']
-  rdoc.rdoc_files.include(*GEMSPEC.extra_rdoc_files)
-end
-
-Gem::PackageTask.new(GEMSPEC) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-if RUBY_PLATFORM =~ /java/
-  Rake::JavaExtensionTask.new('bcrypt_ext', GEMSPEC) do |ext|
-    ext.ext_dir = 'ext/jruby'
-  end
-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', 'x64-mingw32']
-  end
-end
-
-desc "Run a set of benchmarks on the compiled extension."
-task :benchmark do
-  TESTS = 100
-  TEST_PWD = "this is a test"
-  require File.expand_path(File.join(File.dirname(__FILE__), "lib", "bcrypt"))
-  Benchmark.bmbm do |results|
-    4.upto(10) do |n|
-      results.report("cost #{n}:") { TESTS.times { BCrypt::Password.create(TEST_PWD, :cost => n) } }
-    end
-  end
-end