cap-strap 0.1.2 → 0.1.3

data/README.md

@@ -6,7 +6,7 @@ deploy key.
 
 ## Notes
 
-Currently cap-strap has only been tested on Ubuntu 10.04 and 10.10.
+Currently cap-strap has only been tested on Ubuntu 10.04 and 10.10, 12.04.
 
 ## Installation
 
@@ -36,7 +36,8 @@ Note: Paths are relative to the root
 
 ``` ruby
 set :bootstrap_user, "<name of root user for bootstraping>" # default: prompt for user input
-set :bootstrap_password, "<password associated with the root user>" # default: prompt for user input
+set :bootstrap_password, "<password associated with the root user>" # default: empty string
+set :bootstrap_keys, "<array containing path to ssh keys>" # default: empty array
 set :deploy_user, "<name of user for future deployes>" # default: 'deploy'
 set :deploy_user_password, "<password for deploy user>" # default: skips. Recommend using authorized keys
 set :authorized_keys_file, "<location of authorized keys>" # skips if not specified

data/cap-strap.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "cap-strap"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/cap-strap"

data/lib/cap-strap/recipes/bootstrap.rb

@@ -17,19 +17,22 @@ module Capistrano::CapStrap
 
           _cset(:deploy_user, "deploy")
           _cset(:bootstrap_user) { Capistrano::CLI.ui.ask("bootstrap root user: ") }
-          _cset(:bootstrap_password) { Capistrano::CLI.ui.ask("bootstrap root user password: ") }
+          _cset(:bootstrap_password) { ''}
+          _cset(:bootstrap_keys) { [] }
           _cset(:known_hosts) { default_known_hosts }
           _cset(:packages) { [] }
           _cset :authorized_keys_file, ""
           _cset :deploy_key_file, ""
 
           set (:user) { bootstrap_user }
-          set (:password) { bootstrap_password }
+          set (:password) { bootstrap_password } unless bootstrap_password.empty?
+          ssh_options[:keys] = bootstrap_keys unless bootstrap_keys.empty?
 
           desc "Bootstraps a fresh box. Install RVM, create the deploy user, upload keys."
           task :default do
             set (:user) { bootstrap_user }
-            set (:password) { bootstrap_password }
+            set (:password) { bootstrap_password } unless bootstrap_password.empty?
+            ssh_options[:keys] = bootstrap_keys unless bootstrap_keys.empty?
             rvm.default
             bootstrap.create_deploy_user
             bootstrap.upload_deploy_authorized_keys

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-strap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3071073874735159760
+      hash: -848248953766692971
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3071073874735159760
+      hash: -848248953766692971
 requirements: []
 rubyforge_project: cap-strap
 rubygems_version: 1.8.24