git ssb

0+

dangerousbeans / %aPBe2k3ugtjBr4rrsU1…



Commit 273946f2ba549b9119868331388e8cf30d2af37c

Browse Files

Merge branch 'rename_gem' of github.com:sferik/bcrypt-ruby into sferik-rename_gem-pr86

Conflicts:
	Gemfile.lock
T.J. Schuck committed on 2/21/2014, 6:56:33 PM
Parent: f89fffe1c60225f03b21fb7984e70fa1cd792883
Parent: aadbef48c12ae1bd4cb989c4373da2bda110f058

Files changed

Gemfile.lockchanged
README.mdchanged
Rakefilechanged
bcrypt-ruby.gemspecdeleted
bcrypt.gemspecadded
Gemfile.lockView
@@ -1,34 +1,34 @@
11 PATH
22 remote: .
33 specs:
4- bcrypt-ruby (3.1.2)
4+ bcrypt (3.1.2)
55
66 GEM
77 remote: https://rubygems.org/
88 specs:
9- diff-lcs (1.2.4)
10- json (1.7.3)
11- json (1.7.3-java)
9+ diff-lcs (1.2.5)
10+ json (1.8.1)
11+ json (1.8.1-java)
1212 rake (10.1.0)
1313 rake-compiler (0.9.2)
1414 rake
15- rdoc (3.12)
15+ rdoc (4.0.1)
1616 json (~> 1.4)
17- rspec (2.13.0)
18- rspec-core (~> 2.13.0)
19- rspec-expectations (~> 2.13.0)
20- rspec-mocks (~> 2.13.0)
21- rspec-core (2.13.1)
22- rspec-expectations (2.13.0)
17+ rspec (2.14.1)
18+ rspec-core (~> 2.14.0)
19+ rspec-expectations (~> 2.14.0)
20+ rspec-mocks (~> 2.14.0)
21+ rspec-core (2.14.7)
22+ rspec-expectations (2.14.4)
2323 diff-lcs (>= 1.1.3, < 2.0)
24- rspec-mocks (2.13.1)
24+ rspec-mocks (2.14.4)
2525
2626 PLATFORMS
2727 java
2828 ruby
2929
3030 DEPENDENCIES
31- bcrypt-ruby!
31+ bcrypt!
3232 rake-compiler (~> 0.9.2)
3333 rdoc
3434 rspec
README.mdView
@@ -1,9 +1,8 @@
11 # bcrypt-ruby
22
33 An easy way to keep your users' passwords secure.
44
5-* http://bcrypt-ruby.rubyforge.org/
65 * http://github.com/codahale/bcrypt-ruby/tree/master
76
87 [![Build Status](https://travis-ci.org/codahale/bcrypt-ruby.png?branch=master)](https://travis-ci.org/codahale/bcrypt-ruby)
98
@@ -17,19 +16,19 @@
1716 security experts is not a professional response to risk.
1817
1918 `bcrypt()` allows you to easily harden your application against these kinds of attacks.
2019
21-*Note*: JRuby versions of bcrypt-ruby `<= 2.1.3` had a [security
20+*Note*: JRuby versions of bcrypt `<= 2.1.3` had a [security
2221 vulnerability](http://www.mindrot.org/files/jBCrypt/internat.adv) that
2322 was fixed in `>= 2.1.4`. If you used a vulnerable version to hash
2423 passwords with international characters in them, you will need to
2524 re-hash those passwords. This vulnerability only affected the JRuby gem.
2625
2726 ## How to install bcrypt
2827
29- gem install bcrypt-ruby
28+ gem install bcrypt
3029
31-The bcrypt-ruby gem is available on the following ruby platforms:
30+The bcrypt gem is available on the following ruby platforms:
3231
3332 * JRuby
3433 * RubyInstaller 1.8, 1.9, and 2.0 builds on win32
3534 * Any 1.8, 1.9, or 2.0 ruby on a BSD/OSX/Linux system with a compiler
RakefileView
@@ -1,9 +1,8 @@
11 require 'rspec/core/rake_task'
22 require 'rubygems/package_task'
33 require 'rake/extensiontask'
44 require 'rake/javaextensiontask'
5-require 'rake/contrib/rubyforgepublisher'
65 require 'rake/clean'
76 require 'rdoc/task'
87 require 'benchmark'
98
@@ -17,9 +16,9 @@
1716 "ext/mri/Makefile",
1817 "doc/coverage",
1918 "pkg"
2019 )
21-GEMSPEC = eval(File.read(File.expand_path("../bcrypt-ruby.gemspec", __FILE__)))
20+GEMSPEC = eval(File.read(File.expand_path("../bcrypt.gemspec", __FILE__)))
2221
2322 task :default => [:compile, :spec]
2423
2524 desc "Run all specs"
bcrypt-ruby.gemspecView
@@ -1,30 +1,0 @@
1-Gem::Specification.new do |s|
2- s.name = 'bcrypt-ruby'
3- s.version = '3.1.2'
4-
5- s.summary = "OpenBSD's bcrypt() password hashing algorithm."
6- s.description = <<-EOF
7- bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
8- for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
9- passwords.
10- EOF
11-
12- s.files = `git ls-files`.split("\n")
13- s.require_path = 'lib'
14-
15- s.add_development_dependency 'rake-compiler', '~> 0.9.2'
16- s.add_development_dependency 'rspec'
17- s.add_development_dependency 'rdoc'
18-
19- s.has_rdoc = true
20- s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md']
21- s.extra_rdoc_files += ['README.md', 'COPYING', 'CHANGELOG', *Dir['lib/**/*.rb']]
22-
23- s.extensions = 'ext/mri/extconf.rb'
24-
25- s.authors = ["Coda Hale"]
26- s.email = "coda.hale@gmail.com"
27- s.homepage = "http://bcrypt-ruby.rubyforge.org"
28- s.rubyforge_project = "bcrypt-ruby"
29- s.license = "MIT"
30-end
bcrypt.gemspecView
@@ -1,0 +1,29 @@
1+Gem::Specification.new do |s|
2+ s.name = 'bcrypt'
3+ s.version = '3.1.2'
4+
5+ s.summary = "OpenBSD's bcrypt() password hashing algorithm."
6+ s.description = <<-EOF
7+ bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
8+ for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
9+ passwords.
10+ EOF
11+
12+ s.files = `git ls-files`.split("\n")
13+ s.require_path = 'lib'
14+
15+ s.add_development_dependency 'rake-compiler', '~> 0.9.2'
16+ s.add_development_dependency 'rspec'
17+ s.add_development_dependency 'rdoc'
18+
19+ s.has_rdoc = true
20+ s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md']
21+ s.extra_rdoc_files += ['README.md', 'COPYING', 'CHANGELOG', *Dir['lib/**/*.rb']]
22+
23+ s.extensions = 'ext/mri/extconf.rb'
24+
25+ s.authors = ["Coda Hale"]
26+ s.email = "coda.hale@gmail.com"
27+ s.homepage = "https://github.com/codahale/bcrypt-ruby"
28+ s.license = "MIT"
29+end

Built with git-ssb-web