trocla 0.0.7 → 0.0.8

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7

data/Gemfile

@@ -3,17 +3,17 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "moneta", ">= 0.6.1", :git => 'git://github.com/duritong/moneta.git'
+gem "moneta", "~> 0.7.2"
 gem "highline"
 gem "bcrypt-ruby"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.4.0"
   gem "rdoc", "~> 3.8"
   gem "mocha"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.2.3"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,14 +1,8 @@
-GIT
-  remote: git://github.com/duritong/moneta.git
-  revision: 38125d0d598891f27fa6836cbc57cb928831ac4f
-  specs:
-    moneta (0.6.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     bcrypt-ruby (2.1.4)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
     highline (1.6.2)
     jeweler (1.6.4)
@@ -16,28 +10,29 @@ GEM
       git (>= 1.2.5)
       rake
     mocha (0.9.12)
+    moneta (0.7.2)
     rake (0.9.2)
     rcov (0.9.9)
     rdoc (3.8)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bcrypt-ruby
-  bundler (~> 1.0.0)
+  bundler (~> 1.2.3)
   highline
   jeweler (~> 1.6.4)
   mocha
-  moneta (>= 0.6.1)!
+  moneta (~> 0.7.2)
   rcov
   rdoc (~> 3.8)
-  rspec (~> 2.3.0)
+  rspec (~> 2.4.0)

data/README.md

@@ -1,4 +1,5 @@
 # trocla
+[![Build Status](https://travis-ci.org/duritong/trocla.png)](https://travis-ci.org/duritong/trocla)
 
 Trocla provides you a simple way to create and store (random) passwords on a
 central server, which can be retrieved by other applications. An example for
@@ -77,15 +78,24 @@ far.
 
 This will ask you for a password and set it under the appropriate key/format.
 
-    trocla set --pwd-from-stdin user4 plain mysupersecretpassword
+    trocla set --password mysupersecretpassword user4 plain
 
 This will take the password from the cli without asking you.
 
-    trocla set --pwd-from-stdin user5 mysql *ABC....
+    trocla set user5 mysql -p *ABC....
 
 This will store a mysql sha1 hash for the key user5, without storing any kind
 of plain text password.
 
+You can also pipe in a password:
+
+    echo -n foo | trocla set user6 plain -p
+
+or a file
+
+    cat some_file | trocla set user6 plain -p
+    trocla set user6 plain -p < some_file
+
 ### reset
 
     trocla reset user1 md5crypt
@@ -113,9 +123,7 @@ to address.
 
 ## Installation
 
-Simply build and install the gem. BUT trocla is based on a not yet published
-version of [moneta](https://github.com/wycats/moneta). You can build a new
-moneta version based on the latest master as version 0.6.1 and instal that one.
+Simply build and install the gem. 
 
 ## Contributing to trocla
  

data/bin/trocla

@@ -26,20 +26,19 @@ OptionParser.new do |opts|
   opts.on("--no-random") do
     options['random'] = false
   end
-    
+
   opts.on("--length LENGTH") do |v|
     options['length'] = v.to_i
   end
-  
-  opts.on("--pwd-from-stdin") do
+
+  opts.on("--password [PASSWORD]", "-p", "Provide password at command line") do |pass|
     options[:ask_password] = false
+    options[:password] = pass
   end
-    
 
 end.parse!
 
 def create(options)
-  miss_format unless options[:trocla_format]
   Trocla.new(options.delete(:config_file)).password(
     options.delete(:trocla_key),
     options.delete(:trocla_format),
@@ -48,14 +47,12 @@ def create(options)
 end
 
 def get(options)
-  miss_format unless options[:trocla_format]
   Trocla.new(options.delete(:config_file)).get_password(
     options.delete(:trocla_key),
     options.delete(:trocla_format)
   )
 end
 def set(options)
-  miss_format unless options[:trocla_format]
   if options.delete(:ask_password)
     require 'highline/import'
     password = ask("Enter your password: ") { |q| q.echo = "x" }
@@ -65,7 +62,7 @@ def set(options)
       exit 1
     end
   else
-    password = options.delete(:other_options).shift
+    password = options.delete(:password) || STDIN.read.chomp
   end
   Trocla.new(options.delete(:config_file)).set_password(
     options.delete(:trocla_key),
@@ -76,7 +73,6 @@ def set(options)
 end
 
 def reset(options)
-  miss_format unless options[:trocla_format]
   Trocla.new(options.delete(:config_file)).reset_password(
     options.delete(:trocla_key),
     options.delete(:trocla_format),
@@ -91,9 +87,14 @@ def delete(options)
   )
 end
 
-def miss_format
-  STDERR.puts "Missing format, exiting..."
-  exit 1
+def check_format(format_name)
+  if format_name.nil?
+    STDERR.puts "Missing format, exiting..."
+    exit 1
+  elsif !Trocla::Formats.available?(format_name)
+    STDERR.puts "Error: The format #{format_name} is not available"
+    exit 1
+  end
 end
 
 actions=['create','get','set','reset','delete']
@@ -102,6 +103,7 @@ if !(ARGV.length < 2) && (action=ARGV.shift) && actions.include?(action)
     options[:trocla_key] = ARGV.shift
     options[:trocla_format] = ARGV.shift
     options[:other_options] = ARGV
+    check_format(options[:trocla_format]) unless action == 'delete'
     begin
       if result = send(action,options)
         puts result.is_a?(String) ? result : result.inspect

data/lib/VERSION

@@ -1,4 +1,4 @@
 major:0
 minor:0
-patch:7
+patch:8
 build:

data/lib/trocla/default_config.yaml

@@ -2,6 +2,6 @@
 options:
     random: true
     length: 12
-adapter: YAML
+adapter: :YAML
 adapter_options:
-    :path: '/tmp/trocla.yaml'
+    :file: '/tmp/trocla.yaml'

data/lib/trocla/util.rb

@@ -1,12 +1,13 @@
+require 'securerandom'
 class Trocla
   class Util
     class << self
       def random_str(length=12)
-        (1..length).collect{|a| chars[rand(chars.size)] }.join.to_s
+        (1..length).collect{|a| chars[SecureRandom.random_number(chars.size)] }.join.to_s
       end
 
       def salt(length=8)
-        (1..length).collect{|a| normal_chars[rand(normal_chars.size)] }.join.to_s
+        (1..length).collect{|a| normal_chars[SecureRandom.random_number(normal_chars.size)] }.join.to_s
       end
 
       private

data/lib/trocla.rb

@@ -65,9 +65,8 @@ class Trocla
   
   def build_cache
     require 'moneta'
-    require "moneta/adapters/#{config['adapter'].downcase}"
     lconfig = config
-    Moneta::Builder.new { run eval( "Moneta::Adapters::#{lconfig['adapter']}"), lconfig['adapter_options'] }
+    Moneta.new(lconfig['adapter'], lconfig['adapter_options']||{})
   end
   
   def config

data/spec/spec_helper.rb

@@ -19,9 +19,8 @@ end
 def test_config
   return @config unless @config.nil?
   @config = default_config
-  yaml_path = File.expand_path(base_dir+'/spec/data/test_config.yaml')
-  File.unlink(yaml_path) if File.exists?(yaml_path)
-  @config['adapter_options'][:path] = yaml_path
+  @config.delete('adapter_options')
+  @config['adapter'] = :Memory
   @config
 end
 

data/trocla.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trocla}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mh"]
-  s.date = %q{2012-01-05}
+  s.date = %q{2013-01-14}
   s.default_executable = %q{trocla}
   s.description = %q{Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival.}
   s.email = %q{mh+trocla@immerda.ch}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -56,34 +57,34 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<moneta>, [">= 0.6.1"])
+      s.add_runtime_dependency(%q<moneta>, ["~> 0.7.2"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      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.0.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.6.1"])
+      s.add_dependency(%q<moneta>, ["~> 0.7.2"])
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      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.0.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.6.1"])
+    s.add_dependency(%q<moneta>, ["~> 0.7.2"])
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    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.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trocla
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - mh
@@ -15,28 +15,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 +01:00
+date: 2013-01-14 00:00:00 +01:00
 default_executable: trocla
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: moneta
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 0
-        - 6
-        - 1
-        version: 0.6.1
-  version_requirements: *id001
-  name: moneta
-  prerelease: false
+        - 7
+        - 2
+        version: 0.7.2
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: highline
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +47,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: highline
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bcrypt-ruby
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,28 +61,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: bcrypt-ruby
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 2
-        - 3
+        - 4
         - 0
-        version: 2.3.0
-  version_requirements: *id004
-  name: rspec
-  prerelease: false
+        version: 2.4.0
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +92,12 @@ dependencies:
         - 3
         - 8
         version: "3.8"
-  version_requirements: *id005
-  name: rdoc
-  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: mocha
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,28 +106,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
-  name: mocha
-  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 25
         segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id007
-  name: bundler
-  prerelease: false
+        - 2
+        - 3
+        version: 1.2.3
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,12 +138,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id008
-  name: jeweler
-  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: rcov
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,9 +152,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
-  name: rcov
-  prerelease: false
+  requirement: *id009
 description: Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival.
 email: mh+trocla@immerda.ch
 executables: 
@@ -165,6 +165,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt