scrypt 1.0.4 → 1.0.5

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create 1.9.3@scrypt

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    scrypt (1.0.4)
+    scrypt (1.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rake (0.8.7)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
+    awesome_print (1.0.2)
+    diff-lcs (1.1.3)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake
+  awesome_print
+  rake (~> 0.9.2)
   rspec
   scrypt!

data/Rakefile

@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rspec/core/rake_task'
 
 task :default => [:compile, :spec]

data/lib/scrypt/version.rb

@@ -1,3 +1,3 @@
 module SCrypt
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/scrypt.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = "scrypt password hashing algorithm."
   s.description = <<-EOF
-    The scrypt key derivation function is designed to be far 
-    more secure against hardware brute-force attacks than 
+    The scrypt key derivation function is designed to be far
+    more secure against hardware brute-force attacks than
     alternative functions such as PBKDF2 or bcrypt.
   EOF
 
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "awesome_print"
 
   s.rubyforge_project = "scrypt"
 

data/spec/scrypt/engine_spec.rb

@@ -7,8 +7,8 @@ describe "The SCrypt engine" do
   end
 end
 
-describe "Generating SCrypt salts" do
 
+describe "Generating SCrypt salts" do
   it "should produce strings" do
     SCrypt::Engine.generate_salt.should be_an_instance_of(String)
   end
@@ -16,17 +16,16 @@ describe "Generating SCrypt salts" do
   it "should produce random data" do
     SCrypt::Engine.generate_salt.should_not equal(SCrypt::Engine.generate_salt)
   end
-
 end
 
-describe "Autodetecting of salt cost" do
 
+describe "Autodetecting of salt cost" do
   it "should work" do
     SCrypt::Engine.autodetect_cost("2a$08$c3$randomjunkgoeshere").should == "2a$08$c3$"
   end
-
 end
 
+
 describe "Generating SCrypt hashes" do
 
   class MyInvalidSecret
@@ -56,3 +55,4 @@ describe "Generating SCrypt hashes" do
     SCrypt::Engine.hash_secret(false, @salt).should == SCrypt::Engine.hash_secret("false", @salt)
   end
 end
+

data/spec/scrypt/password_spec.rb

@@ -9,7 +9,7 @@ describe "Creating a hashed password" do
     @password.should be_an_instance_of(SCrypt::Password)
   end
 
-  it "should return a valid bcrypt password" do
+  it "should return a valid password" do
     lambda { SCrypt::Password.new(@password) }.should_not raise_error
   end
 
@@ -60,3 +60,4 @@ describe "Comparing a hashed password with a secret" do
     (@password == "@secret").should be(false)
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrypt
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -29,6 +29,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,8 +59,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    The scrypt key derivation function is designed to be far \n    more
-  secure against hardware brute-force attacks than \n    alternative functions such
+description: ! "    The scrypt key derivation function is designed to be far\n    more
+  secure against hardware brute-force attacks than\n    alternative functions such
   as PBKDF2 or bcrypt.\n"
 email:
 - pbhogan@gmail.com
@@ -55,13 +71,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
 - CHANGELOG
 - COPYING
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
-- Rakefile.old
 - autotest/discover.rb
 - ext/mri/Makefile
 - ext/mri/crypto_scrypt-ref.c
@@ -99,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 194968761822727959
+      hash: 2356724981074653609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 194968761822727959
+      hash: 2356724981074653609
 requirements: []
 rubyforge_project: scrypt
 rubygems_version: 1.8.21

data/Rakefile.old

@@ -1,104 +0,0 @@
-gem "rspec"
-
-require "rake"
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/clean'
-require 'rake/rdoctask'
-require "benchmark"
-require "rspec/core/rake_task"
-
-PKG_NAME = "scrypt-ruby"
-PKG_VERSION   = "2.1.2"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-PKG_FILES = FileList[
-  '[A-Z]*',
-  'lib/**/*.rb', 
-  'spec/**/*.rb', 
-  'ext/mri/*.c',
-  'ext/mri/*.h',
-  'ext/mri/*.rb'
-]
-CLEAN.include(
-  "ext/mri/*.o",
-  "ext/mri/*.bundle",
-  "ext/mri/*.so"
-)
-CLOBBER.include(
-  "ext/mri/Makefile",
-  "doc/coverage",
-  "pkg"
-)
-
-task :default => [:spec]
-
-desc "Run all specs"
-RSpec::Core::RakeTask.new do |t|
-  rspec_opts = ['--colour','--backtrace']
-end
-
-desc 'Generate RDoc'
-rd = Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.options << '--title' << 'scrypt-ruby' << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE']
-  rdoc.rdoc_files.include('README', 'COPYING', 'CHANGELOG', 'lib/**/*.rb')
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "scrypt password hashing algorithm."
-  s.description = <<-EOF
-    The scrypt key derivation function was originally developed for 
-    use in the Tarsnap online backup system and is designed to be far 
-    more secure against hardware brute-force attacks than 
-    alternative functions such as PBKDF2 or bcrypt.
-  EOF
-
-  s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-
-  s.has_rdoc = true
-  s.rdoc_options = rd.options
-  s.extra_rdoc_files = rd.rdoc_files.to_a
-  
-  s.extensions = FileList["ext/mri/extconf.rb"].to_a
-  
-  s.authors = ["Patrick Hogan"]
-  s.email = "pbhogan@gmail.com"
-  s.homepage = "http://scrypt-ruby.rubyforge.org"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-desc "Clean, then compile the extension that's native to the current Ruby compiler."
-task :compile => 'compile:mri'
-
-namespace :compile do
-  desc "CLean, then compile all extensions"
-  task :all => [:mri]
-  
-  desc "Clean, then compile the MRI extension"
-  task :mri => :clean do
-    Dir.chdir('ext/mri') do
-      ruby "extconf.rb"
-      sh "make"
-    end
-  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", "scrypt"))
-  Benchmark.bmbm do |results|
-    4.upto(10) do |n|
-      results.report("cost #{n}:") { TESTS.times { scrypt::Password.create(TEST_PWD, :cost => n) } }
-    end
-  end
-end