gaptool-client 0.3.6 → 0.4.0

data/Gemfile

@@ -20,3 +20,4 @@ gem 'clamp'
 gem 'net-ssh'
 gem 'net-scp'
 gem 'gaptool-api', ">= 0.3.2"
+gem 'builder'

data/Gemfile.lock

@@ -1,16 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    clamp (0.5.0)
-    gaptool-api (0.3.2)
+    builder (3.2.0)
+    clamp (0.6.1)
+    gaptool-api (0.3.3)
       httparty
     git (1.2.5)
-    httparty (0.10.2)
+    httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.1)
@@ -19,27 +18,23 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.6)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    multi_xml (0.5.2)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.2)
+    json (1.8.0)
+    multi_json (1.7.3)
+    multi_xml (0.5.3)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
     peach (0.5.1)
     rainbow (1.1.4)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.4.2)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -49,6 +44,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder
   bundler
   clamp
   gaptool-api (>= 0.3.2)

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/gaptool-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-client"
-  s.version = "0.3.6"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey"]
-  s.date = "2013-02-07"
+  s.date = "2013-05-16"
   s.description = "client for gaptool-server"
   s.email = "m@mdb.io"
   s.executables = ["gt"]
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<net-scp>, [">= 0"])
       s.add_runtime_dependency(%q<gaptool-api>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -61,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<net-ssh>, [">= 0"])
       s.add_dependency(%q<net-scp>, [">= 0"])
       s.add_dependency(%q<gaptool-api>, [">= 0.3.2"])
+      s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -75,6 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-ssh>, [">= 0"])
     s.add_dependency(%q<net-scp>, [">= 0"])
     s.add_dependency(%q<gaptool-api>, [">= 0.3.2"])
+    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/gaptool-client.rb

@@ -40,16 +40,48 @@ def sshcmd(node, commands)
     :keys_only => true,
     :paranoid => false
   ) do |ssh|
+    stdout_data = ""
+    stderr_data = ""
+    exit_code = nil
+    exit_signal = nil
     commands.each do |command|
-      command.color(:cyan)
-      ssh.exec! command do
-        |ch, stream, line|
-        puts "#{node['role'].color(:yellow)}:#{node['environment'].color(:yellow)}:#{node['instance'].color(:yellow)}> #{line}"
+      ssh.open_channel do |channel|
+        channel.exec(command) do |ch, success|
+          unless success
+            abort "FAILED: couldn't execute command (ssh.channel.exec)"
+          end
+          channel.on_data do |ch,data|
+            puts "#{node['role'].color(:yellow)}:#{node['environment'].color(:yellow)}:#{node['instance'].color(:yellow)}> #{data}"
+          end
+
+          channel.on_extended_data do |ch,type,data|
+            puts "#{node['role'].color(:yellow)}:#{node['environment'].color(:yellow)}:#{node['instance'].color(:red)}> #{data}"
+          end
+
+          channel.on_request("exit-status") do |ch,data|
+            exit_code = data.read_long
+            if exit_code != 0
+              exit exit_code
+            end
+          end
+
+          channel.on_request("exit-signal") do |ch, data|
+            exit_signal = data.read_string
+          end
+        end
       end
     end
+#    ssh.loop
+#    [stdout_data, stderr_data, exit_code, exit_signal]
   end
 end
 
+#def sshcmd(node, commands)
+#  commands.each do |command|
+#    ssh_exec!(node, command)
+#  end
+#end
+
 module Gaptool
   class InitCommand < Clamp::Command
     option ["-r", "--role"], "ROLE", "Resource name to initilize", :required => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1782639922451775426
+      hash: 1836818138274775584
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: