remy 0.0.9 → 0.0.10

data/lib/remy/bootstrap.rb

@@ -2,7 +2,7 @@ module Remy
   class Bootstrap
     include ::Remy::Shell
 
-    attr_reader :ip_address, :ruby_version, :password, :gems, :public_ssh_key
+    attr_reader :ip_address, :ruby_version, :password, :gems, :ssh_key
 
     def initialize(options = { })
       @ip_address = options[:ip_address]
@@ -10,7 +10,7 @@ module Remy
       options = (Remy::Config::Chef.bootstrap || {}).merge(options).symbolize_keys
       @ruby_version = options[:ruby_version] || '1.8.7'
       @gems = options[:gems] || {}
-      @public_ssh_key = options[:public_ssh_key]
+      @ssh_key = options[:ssh_key]
       @quiet = options[:quiet] || false
     end
 
@@ -30,9 +30,8 @@ module Remy
     end
 
     def add_ssh_key_locally_if_necessary
-      private_ssh_key = public_ssh_key.chomp(File.extname(public_ssh_key))
-      unless `ssh-add -l`.match(/#{File.basename(private_ssh_key)}/)
-        `ssh-add $HOME/.ssh/#{private_ssh_key}`
+      unless `ssh-add -l`.match(/#{File.basename(ssh_key)}/)
+        `ssh-add #{ssh_key}`
       end
     end
 
@@ -70,9 +69,9 @@ module Remy
       raise "ssh-copy-id is not installed locally! On the Mac, do 'brew install ssh-copy-id'" unless is_ssh_copy_id_installed_locally?
       is_ssh_key_in_local_known_hosts_file = `grep "#{ip_address}" ~/.ssh/known_hosts`.length > 0
       if is_ssh_key_in_local_known_hosts_file
-        execute %Q{expect -c 'spawn ssh-copy-id -i $env(HOME)/.ssh/#{public_ssh_key} #{user}@#{ip_address}; expect assword ; send "#{password}\\n" ; interact'}
+        execute %Q{expect -c 'spawn ssh-copy-id -i #{ssh_key} #{user}@#{ip_address}; expect assword ; send "#{password}\\n" ; interact'}
       else
-        execute %Q{expect -c 'spawn ssh-copy-id -i $env(HOME)/.ssh/#{public_ssh_key} #{user}@#{ip_address}; expect continue; send "yes\\n"; expect assword ; send "#{password}\\n" ; interact'}
+        execute %Q{expect -c 'spawn ssh-copy-id -i #{ssh_key} #{user}@#{ip_address}; expect continue; send "yes\\n"; expect assword ; send "#{password}\\n" ; interact'}
       end
     end
 

data/lib/remy/version.rb

@@ -1,3 +1,3 @@
 module Remy
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remy
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -196,12 +196,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 815515230505159834
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 815515230505159834
 requirements: []
 rubyforge_project: remy
 rubygems_version: 1.8.24