new version

4 files changed, 12 insertions, 15 deletions

diff --git a/Gemfile b/Gemfile
index d375400..4d2bbb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source "http://rubygems.org"
 
 gem "moneta", "~> 0.7.2"
 gem "highline"
-gem "bcrypt-ruby"
+gem "bcrypt"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a54e22..aad9a21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bcrypt-ruby (2.1.4)
+    bcrypt (3.1.7)
     diff-lcs (1.1.3)
     git (1.2.5)
     highline (1.6.2)
@@ -26,7 +26,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby
+  bcrypt
   highline
   jeweler (~> 1.6.4)
   mocha
diff --git a/lib/VERSION b/lib/VERSION
index 83cc7e6..1be3e38 100644
--- a/lib/VERSION
+++ b/lib/VERSION
@@ -1,4 +1,4 @@
 major:0
 minor:0
-patch:9
+patch:10
 build:
diff --git a/trocla.gemspec b/trocla.gemspec
index 7af5044..1093ee5 100644
--- a/trocla.gemspec
+++ b/trocla.gemspec
@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: trocla 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trocla"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["mh"]
-  s.date = "2013-10-03"
+  s.date = "2014-06-27"
   s.description = "Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival."
   s.email = "mh+trocla@immerda.ch"
   s.executables = ["trocla"]
@@ -36,9 +38,11 @@ Gem::Specification.new do |s|
     "lib/trocla/formats/mysql.rb",
     "lib/trocla/formats/pgsql.rb",
     "lib/trocla/formats/plain.rb",
+    "lib/trocla/formats/sha1.rb",
     "lib/trocla/formats/sha256crypt.rb",
     "lib/trocla/formats/sha512crypt.rb",
     "lib/trocla/formats/ssha.rb",
+    "lib/trocla/formats/x509.rb",
     "lib/trocla/util.rb",
     "lib/trocla/version.rb",
     "spec/data/.keep",
@@ -49,12 +53,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/"
   s.licenses = ["GPLv3"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.3.0"
   s.summary = "Trocla a simple password generator and storage"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<moneta>, ["~> 0.7.2"])
@@ -63,9 +66,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<moneta>, ["~> 0.7.2"])
       s.add_dependency(%q<highline>, [">= 0"])
@@ -73,9 +74,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<moneta>, ["~> 0.7.2"])
@@ -84,9 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.8"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end