gaptool 0.10.3 → 0.10.4

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gem 'net-ssh'
+gem 'net-scp'
 gem 'trollop'
 gem 'aws-sdk'
 gem 'json'

data/Gemfile.lock

@@ -12,6 +12,8 @@ GEM
     json (1.6.1)
     multi_json (1.3.6)
     multi_xml (0.5.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.2)
     peach (0.4)
@@ -25,6 +27,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk
   json
+  net-scp
   net-ssh
   peach
   rainbow

data/gaptool.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "gaptool"
-  s.version = "0.10.3"
+  s.version = "0.10.4"
   s.authors = ['Matt Bailey']
   s.email = ['m@mdb.io']
   s.homepage = 'http://mdb.io'
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_dependency "net-ssh"
+  s.add_dependency "net-scp"
   s.add_dependency "trollop"
   s.add_dependency "aws-sdk"
   s.add_dependency "json"

data/lib/app.rb

@@ -89,13 +89,17 @@ class GTBase
     end
     return hosts
   end
-  def sshcmd(host, commands, user='admin', key=@user_settings['mykey'])
+  def sshcmd(host, commands, options = {}, user='admin', key=@user_settings['mykey'])
     Net::SSH.start(host, user, :key_data => [key], :config => false, :keys_only => true, :paranoid => false) do |ssh|
       commands.each do |command|
-        puts command.color(:cyan)
+        if !options[:quiet]
+          puts command.color(:cyan)
+        end
         ssh.exec! command do
           |ch, stream, line|
-          puts "#{host.color(:yellow)}:#{line}"
+          if !options[:quiet]
+            puts "#{host.color(:yellow)}:#{line}"
+          end
         end
       end
     end
@@ -118,14 +122,14 @@ class GTBase
       "sudo chmod 600 ~#{@env_settings['user']}/.ssh/config",
       "rm /tmp/key"
     ]
-    sshcmd(host, run)
+    sshcmd(host, run, :quiet => true)
   end
   def sshReachable?
     hosts = getCluster()
     hosts.each do |host|
       begin
         puts "Checking SSH to: #{host}"
-        sshcmd(host, ["exit 0"])
+        sshcmd(host, ["exit 0"], :quiet => true)
       rescue
         puts "ERROR: Could not ssh to #{host}\nEither your connection is failing or AWS is having routing issues.\nAborting."
         exit 255

data/lib/plugins/Base/plugin.rb

@@ -6,8 +6,26 @@ module Base
     system "rm /tmp/mykey 2> /dev/null"
   end
   def scpfrom
+    require 'net/scp'
+    # net-scp does not handle ~ well...
+    remote = ARGV[-2].gsub('~', "/data/admin")
+    local = ARGV[-1].gsub('~', ENV['HOME'])
+    host = singleHost()
+    session = Net::SSH.start(host, 'admin', :key_data => [@user_settings['mykey']], :config => false, :keys_only => true, :paranoid => false)
+    session.scp.download!(remote, local, :recursive => true) do |ch, name, sent, total|
+      print "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
+    end
   end
   def scpto
+    require 'net/scp'
+    # net-scp does not handle ~ well...
+    remote = ARGV[-1].gsub(/~/, "/data/admin")
+    local = ARGV[-2].gsub(/~/, ENV['HOME'])
+    host = singleHost()
+    session = Net::SSH.start(host, 'admin', :key_data => [@user_settings['mykey']], :config => false, :keys_only => true, :paranoid => false)
+    session.scp.upload!(local, remote, :recursive => true) do |ch, name, sent, total|
+      print "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
+    end
   end
   def chefrun
     if sshReachable?
@@ -81,13 +99,13 @@ module Base
       hosts = getCluster()
       if @args[:enable]
         hosts.peach do |host|
-          sshcmd(host, "sudo -u #{@env_settings['user']} rm /data/#{@args[:app]}/shared/system/maintenance.html 2> /dev/null")
+          sshcmd(host, "sudo -u #{@env_settings['user']} rm /data/#{@args[:app]}/shared/system/maintenance.html 2> /dev/null", :quiet => true)
           puts "#{host} : web enabled"
         end
       end
       if @args[:disable]
         hosts.peach do |host|
-          sshcmd(host, "sudo -u #{@env_settings['user']} ln -sf /data/#{@args[:app]}/current/public/maintenance.html /data/#{@args[:app]}/shared/system/maintenance.html")
+          sshcmd(host, "sudo -u #{@env_settings['user']} ln -sf /data/#{@args[:app]}/current/public/maintenance.html /data/#{@args[:app]}/shared/system/maintenance.html", :quiet => true)
           puts "#{host} : web disabled"
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000Z
+date: 2012-07-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70324593881460 !ruby/object:Gem::Requirement
+  requirement: &70173691043640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593881460
+  version_requirements: *70173691043640
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: &70173691043200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70173691043200
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70324593881020 !ruby/object:Gem::Requirement
+  requirement: &70173691042780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593881020
+  version_requirements: *70173691042780
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70324593880600 !ruby/object:Gem::Requirement
+  requirement: &70173691042360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593880600
+  version_requirements: *70173691042360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70324593880180 !ruby/object:Gem::Requirement
+  requirement: &70173691041940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593880180
+  version_requirements: *70173691041940
 - !ruby/object:Gem::Dependency
   name: peach
-  requirement: &70324593879760 !ruby/object:Gem::Requirement
+  requirement: &70173691041520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593879760
+  version_requirements: *70173691041520
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70324593879340 !ruby/object:Gem::Requirement
+  requirement: &70173691041100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324593879340
+  version_requirements: *70173691041100
 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: