secret_service 0.1.0 → 0.1.1

data/README.md

@@ -47,14 +47,25 @@ If you want to use a specific secret, you can put it into the database by callin
 
     rake secret_service:store
 
-The secret will be read from STDIN.
+The secret you'll put into your code as well as the final secret that will be returned are read from STDIN. You can leave the first one blank to have it generated automatically.
 
 To show a previously stored secret, use
 
-    rake secret_service:show SOURCE_SECRET=the_source_secret
+    rake secret_service:show
 
 where `the_source_secret` is the secret used in the `SecretService.secret(...)` call
 
+## Capistrano integration
+
+To get capistrano integration, put this into your `config/deploy.rb`:
+
+    require 'secret_service/capistrano'
+
+You'll get the two rake tasks as corresponding capistrano tasks:
+
+    cap secret_service:store
+    cap secret_service:show
+
 ## Contributing
 
 1. Fork it

data/lib/secret_service/capistrano.rb

@@ -0,0 +1,27 @@
+namespace :secret_service do
+
+  def _run_with_prompt(command)
+    run command do |input, stream, out|
+      puts out
+      if stream == :out and out =~ /^Enter/
+        input.send_data STDIN.gets
+      end
+    end
+  end
+
+  desc "Store a secret using secret_service"
+  task :store, :roles => :db, :only => { :primary => true } do
+    rake = fetch(:rake, "rake")
+    rails_env = fetch(:rails_env, "production")
+
+    _run_with_prompt("cd #{current_path} && #{rake} RAILS_ENV=#{rails_env} secret_service:store")
+  end
+
+  desc "Show a secret previously stored with secret_service"
+  task :show, :roles => :db, :only => { :primary => true } do
+    rake = fetch(:rake, "rake")
+    rails_env = fetch(:rails_env, "production")
+
+    _run_with_prompt("cd #{current_path} && #{rake} RAILS_ENV=#{rails_env} secret_service:show")
+  end
+end

data/lib/secret_service/rake_tasks.rb

@@ -2,7 +2,13 @@ namespace :secret_service do
   desc 'Store a desired secret in the database'
   task :store => :environment do
     store = SecretService::Store.new
-    source_secret = ENV['SOURCE_SECRET'] || store.generate_secret
+
+    puts "Enter source secret (as given in your source code; leave blank to auto-generate):"
+    source_secret = STDIN.gets.chomp
+
+    if source_secret == ''
+      source_secret = store.generate_secret
+    end
 
     puts "Enter secret:"
     final_secret = STDIN.gets.chomp

data/lib/secret_service/version.rb

@@ -1,3 +1,3 @@
 module SecretService
-  VERSION = "0.1.0" unless defined?(SecretService::VERSION)
+  VERSION = "0.1.1" unless defined?(SecretService::VERSION)
 end

data/spec/shared/secret_service/rake_tasks_spec.rb

@@ -5,9 +5,6 @@ describe 'Rake tasks' do
 
   def execute_rake(task, options = {})
     env = "BUNDLE_GEMFILE=#{File.expand_path(File.join(Rails.root, '..', 'Gemfile'))}"
-    options.fetch(:env, {}).each do |key, value|
-      env << " #{key}=#{value}"
-    end
     # this is the only way I could make it work in ruby 1.8 and 1.9
     Open3.popen3("bash -c 'cd #{Rails.root}; #{env} bundle exec rake #{task}'") do |stdin, stdout, stderr, wait_thr|
       if options[:puts]
@@ -25,14 +22,20 @@ describe 'Rake tasks' do
 
   describe 'store' do
 
-    it 'should store the prompted secret under the given key' do
-      output = execute_rake('secret_service:store', :puts => 'the_secret')
+    it 'should store the prompted secret under the returned key' do
+      output = execute_rake('secret_service:store', :puts => "\nthe_secret")
       (output =~ /SecretService\.secret\("(.*)"\)/).should be_true
       SecretService.secret($1).should == 'the_secret'
     end
 
+    it 'should generate a sensible source secret' do
+      output = execute_rake('secret_service:store', :puts => "\nthe_secret")
+      (output =~ /SecretService\.secret\("(.*)"\)/).should be_true
+      $1.size.should > 20
+    end
+
     it 'should allow to set the source secret' do
-      output = execute_rake('secret_service:store', :env => {'SOURCE_SECRET' => 'source_secret'}, :puts => 'the_secret')
+      output = execute_rake('secret_service:store', :puts => "source_secret\nthe_secret")
       output.should =~ /SecretService\.secret\("source_secret"\)/
     end
 

metadata

@@ -1,47 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: secret_service
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-08 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gibberish
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Secret service provides encryption of your application secrets with a server side master password
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Secret service provides encryption of your application secrets with a
+  server side master password
+email:
 - tobias@kraze.eu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -49,6 +42,7 @@ files:
 - README.md
 - Rakefile
 - lib/secret_service.rb
+- lib/secret_service/capistrano.rb
 - lib/secret_service/database_store.rb
 - lib/secret_service/database_store/active_record_store.rb
 - lib/secret_service/rake_tasks.rb
@@ -117,41 +111,32 @@ files:
 - spec/shared/secret_service/store_spec.rb
 - spec/shared/support/reconnect_task.rake
 - spec/shared/support/wipe_store.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Secret service provides encryption of your application secrets with a server side master password
-test_files: 
+summary: Secret service provides encryption of your application secrets with a server
+  side master password
+test_files:
 - spec/rails-2.3/Gemfile
 - spec/rails-2.3/Rakefile
 - spec/rails-2.3/app_root/Rakefile