gaptool 0.10.4 → 0.10.5

data/gaptool.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "gaptool"
-  s.version = "0.10.4"
+  s.version = "0.10.5"
   s.authors = ['Matt Bailey']
   s.email = ['m@mdb.io']
   s.homepage = 'http://mdb.io'

data/lib/app.rb

@@ -89,7 +89,17 @@ class GTBase
     end
     return hosts
   end
-  def sshcmd(host, commands, options = {}, user='admin', key=@user_settings['mykey'])
+  def sshcmd(host, commands, options = {})
+    if options[:user]
+      user = options[:user]
+    else
+      user = 'admin'
+    end
+    if options[:key]
+      key = options[:key]
+    else
+      key = @user_settings['mykey']
+    end
     Net::SSH.start(host, user, :key_data => [key], :config => false, :keys_only => true, :paranoid => false) do |ssh|
       commands.each do |command|
         if !options[:quiet]

data/lib/plugins/Base/plugin.rb

@@ -164,7 +164,7 @@ module Base
       loop do
         begin
           ip = instance.ip_address
-          sshcmd(ip, ["exit 0"], user, key)
+          sshcmd(ip, ["exit 0"], :user => user, :key => key)
           break
         rescue
           print ".".color(:yellow)
@@ -187,7 +187,7 @@ module Base
           "sudo su -c 'chef-solo -c ~admin/ops/cookbooks/solo.rb -j /tmp/solo.json'",
           "sudo rm /tmp/solo.json"
         ]
-      sshcmd(ip, run, user, key)
+      sshcmd(ip, run, :user => user, :key => key)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000Z
+date: 2012-07-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70173691043640 !ruby/object:Gem::Requirement
+  requirement: &70275685552980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691043640
+  version_requirements: *70275685552980
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70173691043200 !ruby/object:Gem::Requirement
+  requirement: &70275685543500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691043200
+  version_requirements: *70275685543500
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70173691042780 !ruby/object:Gem::Requirement
+  requirement: &70275685538760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691042780
+  version_requirements: *70275685538760
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70173691042360 !ruby/object:Gem::Requirement
+  requirement: &70275685534980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691042360
+  version_requirements: *70275685534980
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70173691041940 !ruby/object:Gem::Requirement
+  requirement: &70275685511920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691041940
+  version_requirements: *70275685511920
 - !ruby/object:Gem::Dependency
   name: peach
-  requirement: &70173691041520 !ruby/object:Gem::Requirement
+  requirement: &70275685509060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691041520
+  version_requirements: *70275685509060
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70173691041100 !ruby/object:Gem::Requirement
+  requirement: &70275685478520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173691041100
+  version_requirements: *70275685478520
 description: This command line tool will service a chef repo for building out, configuring,
   and deploying environments in EC2 and EC2 compatable infrastructure clouds
 email: