ubalo 0.28 → 0.29

data/bin/ubalo

@@ -199,6 +199,16 @@ command :run do |c|
   end
 end
 
+desc 'SSH into as a task'
+command :ssh do |c|
+  c.action do |global_options,options,args|
+    task = pod.run(nil, nil)
+    task.wait_for_process
+    task.container_process.ssh
+    task.stop!
+  end
+end
+
 desc 'Show information about a pod'
 command :pod do |c|
   c.action do |global_options,options,args|

data/lib/ubalo/container_process.rb

@@ -8,7 +8,7 @@ module Ubalo
       container_process
     end
 
-    attr_reader :state, :exit_type, :exit_result, :output
+    attr_reader :state, :exit_type, :exit_result, :output, :ssh_uri
 
     def initialize(account)
       @account = account
@@ -22,6 +22,15 @@ module Ubalo
       @exit_type = attributes.fetch('exit_type')
       @exit_result = attributes.fetch('exit_result')
       @output = attributes.fetch('output')
+      @ssh_uri = attributes.fetch('ssh_uri')
+    end
+
+    def ssh
+      unless @ssh_uri
+        raise Ubalo::Error, "Unable to ssh: no connection information available"
+      end
+      uri = URI.parse(@ssh_uri)
+      system("ssh", "-o", "StrictHostKeyChecking=no", "-o", "CheckHostIp=no", "-p", uri.port.to_s, "#{uri.user}@#{uri.host}")
     end
 
     def tail(tailer, message)

data/lib/ubalo/pod.rb

@@ -38,15 +38,22 @@ module Ubalo
     end
 
     def run(argv, arg)
-      if argv.empty?
+      if argv && argv.empty?
         raise Ubalo::Error, "Specify the command to run"
       end
 
-      params = {
-        :arg_content_type => UbaloJSON.content_type,
-        :arg => UbaloJSON.dump(arg),
-        :argv => argv,
-      }
+      params = {}
+
+      if arg
+        params.merge!(
+          :arg_content_type => UbaloJSON.content_type,
+          :arg => UbaloJSON.dump(arg),
+        )
+      end
+
+      if argv
+        params.merge!(:argv => argv)
+      end
       task = @account.task_from_json(request(:post, "/tasks", :params => params))
 
       task

data/lib/ubalo/task.rb

@@ -29,11 +29,7 @@ module Ubalo
     def tail_process
       tailer = Ubalo::TimedTailer.new(logger)
 
-      logger.poll do
-        tailer.update("Starting...")
-        refresh!
-        container_process
-      end
+      wait_for_process(tailer)
 
       container_process.tail(tailer, "Running #{label}...") do
         refresh!
@@ -43,11 +39,20 @@ module Ubalo
       tailer.update("Completed #{label}. Exit code: #{container_process.exit_result}.\n")
     end
 
+    def wait_for_process(tailer = nil)
+      logger.poll do
+        tailer.update("Starting...") if tailer
+        refresh!
+        container_process
+      end
+    end
+
     def stop!
       tailer = Ubalo::TimedTailer.new(logger)
 
       tailer.update("Stopping #{label}...")
       request(:put, "/stop")
+      refresh!
 
       logger.poll do
         tailer.update("Stopping #{label}...")
@@ -70,7 +75,9 @@ module Ubalo
       s = ""
       s << " label: #{label}\n"
       s << "   pod: #{pod_name}\n"
-      s << "  argv: #{pretty_argv}\n"
+      if argv
+        s << "  argv: #{pretty_argv}\n"
+      end
       if arg?
         if @arg_error
           s << "! Parse error in arg: #{@arg_error.message}"

data/lib/ubalo/version.rb

@@ -1,6 +1,6 @@
 module Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.28"
+    VERSION = "0.29"
   end
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.28'
+  version: '0.29'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958033980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70223958033980
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958033560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70223958033560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958033140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70223958033140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958027240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.3
+  version_requirements: *70223958027240
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958026680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70223958026680
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70223958026100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70223958026100
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -147,8 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
+has_rdoc: