ubalo 0.14 → 0.15

data/bin/ubalo

@@ -7,6 +7,8 @@ include GLI
 
 require 'yaml'
 require 'fileutils'
+require 'shellwords'
+require 'launchy'
 
 require 'highline'
 hl = HighLine.new
@@ -171,16 +173,12 @@ end
 
 desc 'Run a pod'
 command :run do |c|
-  c.action do |global_options,options,args|
-    logger.puts "Running #{pod.fullname}."
-    task = pod.run(args.shift)
+  c.flag :arg
+  c.switch :v2
 
-    tailer = Ubalo::Tailer.new(logger)
-    tailer.poll_on("Waiting for task #{task.label.inspect}") do
-      task.refresh!
-      tailer.update(task.process_output)
-      task.complete?
-    end
+  c.action do |global_options,options,args|
+    task = pod.run(options.v2 || pod_dir.v2?, args, options.arg)
+    task.tail_process
     puts task.printable_result
   end
 end
@@ -193,11 +191,19 @@ command :pod do |c|
   end
 end
 
+desc 'Open the pod in a browser'
+command 'pod:open' do |c|
+  c.action do |global_options,options,args|
+    Launchy.open(pod.url)
+  end
+end
+
 desc 'Run a pod in the background'
 command :submit do |c|
+  c.flag :arg
+
   c.action do |global_options,options,args|
-    logger.print "Submitting #{pod.fullname}..."
-    task = pod.run(args.shift)
+    task = pod.run(pod_dir.v2?, args, options.arg)
     logger.puts " done."
     puts task.printable_result
   end
@@ -217,6 +223,20 @@ command :task do |c|
   end
 end
 
+desc 'Open the task in a browser'
+arg_name '<task label>'
+command 'task:open' do |c|
+  c.action do |global_options,options,args|
+    if label = args.shift
+      task = account.task_by_label!(label)
+    else
+      task = pod.latest_task
+    end
+
+    Launchy.open(task.url)
+  end
+end
+
 desc 'Stop a task'
 arg_name '<task label>'
 command 'task:stop' do |c|
@@ -240,14 +260,25 @@ end
 desc 'Push files to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
-    logger.print "Pushing files to #{pod.fullname.inspect}..."
     pod.push_from(pod_dir)
-    logger.puts " done."
-    logger.poll_on("Waiting for #{pod.fullname.inspect} to compile") do
-      pod.refresh!
-      pod.compiled?
-    end
+    pod.tail_process
+    puts pod.printable_result
+  end
+end
+
+desc 'Push files and run'
+command 'push-run' do |c|
+  c.flag :arg
+  c.switch :v2
+
+  c.action do |global_options,options,args|
+    pod.push_from(pod_dir)
+    pod.tail_process
     puts pod.printable_result
+
+    task = pod.run(options.v2 || pod_dir.v2?, args, options.arg)
+    task.tail_process
+    puts task.printable_result
   end
 end
 

data/lib/ubalo/account.rb

@@ -15,7 +15,11 @@ module Ubalo
       if authorization and !options[:skip_authorization]
         options[:authorization] = authorization
       end
-      Util.http_request(method, "#{@base_url}#{path}", options)
+      Util.http_request(method, url_for(path), options)
+    end
+
+    def url_for(path)
+      "#{@base_url}#{path}"
     end
 
     def authorize(login, password)

data/lib/ubalo/pod.rb

@@ -37,12 +37,28 @@ module Ubalo
       end
     end
 
-    def run(arg)
+    def run(version2, argv, arg)
+      if version2
+        if argv.empty?
+          raise Ubalo::Error, "Specify the command to run"
+        end
+      else
+        arg = argv.shift || arg
+        argv = ["sh", "run.sh"]
+      end
+
+      logger.print "Running #{Shellwords.join(argv)} inside #{fullname}..."
+
       params = {
         :arg_content_type => UbaloJSON.content_type,
-        :arg => UbaloJSON.dump(arg)
+        :arg => UbaloJSON.dump(arg),
+        :argv => argv,
       }
-      @account.task_from_json(request(:post, "/tasks", :params => params))
+      task = @account.task_from_json(request(:post, "/tasks", :params => params))
+
+      logger.puts " done."
+
+      task
     rescue RestClient::Conflict
       raise Ubalo::Error, "Cannot run pod while compiling"
     rescue RestClient::ResourceNotFound
@@ -58,10 +74,14 @@ module Ubalo
     end
 
     def push_from(pod_dir)
+      logger.print "Pushing files to #{fullname.inspect}..."
+
       pod_dir.assert_not_empty!
       update!
       new_archive.activate_from(pod_dir)
       refresh!
+
+      logger.puts " done."
     end
 
     def clone_to(pod_dir)
@@ -74,6 +94,15 @@ module Ubalo
       state == 'compiled'
     end
 
+    def tail_process
+      tailer = Ubalo::Tailer.new(logger)
+      tailer.poll_on("Waiting for #{fullname.inspect} to compile") do
+        refresh!
+        tailer.update(process_output)
+        compiled?
+      end
+    end
+
     def delete!
       request(:delete, nil, :parse => false)
       @deleted = true
@@ -107,6 +136,20 @@ module Ubalo
       fullname == other.fullname
     end
 
+    attr_reader :compilation_process
+
+    def process_output
+      if compilation_process
+        if data = compilation_process.fetch('output')
+          data
+        end
+      end
+    end
+
+    def url
+      @account.url_for(path_prefix)
+    end
+
     private
     def update_attributes(attributes)
       @state = attributes['state']
@@ -124,7 +167,11 @@ module Ubalo
     end
 
     def request method, path = nil, options = {}
-      @account.request(method, "/pods/#{fullname}#{path}", options)
+      @account.request(method, "#{path_prefix}#{path}", options)
+    end
+
+    def path_prefix
+      "/pods/#{fullname}"
     end
   end
 end

data/lib/ubalo/pod_dir.rb

@@ -10,6 +10,16 @@ module Ubalo
       @path = path
     end
 
+    def v2?
+      inited? && manifest.include?(".ubalov2")
+    end
+
+    def inited?
+      in_path do
+        File.exist?("Ubalopod")
+      end
+    end
+
     def name
       in_path do
         File.read("Ubalopod").strip

data/lib/ubalo/task.rb

@@ -1,6 +1,6 @@
 module Ubalo
   class Task
-    attr_reader :label, :state, :pod_name, :arg_error, :output_error, :submitted_at, :elapsed_time
+    attr_reader :label, :state, :pod_name, :argv, :arg_error, :output_error, :submitted_at, :elapsed_time
 
     def self.create_with_json(account, json)
       new(account, json.fetch('label'), json)
@@ -26,6 +26,15 @@ module Ubalo
       state == 'exited'
     end
 
+    def tail_process
+      tailer = Ubalo::Tailer.new(logger)
+      tailer.poll_on("Waiting for task #{label.inspect}") do
+        refresh!
+        tailer.update(process_output)
+        complete?
+      end
+    end
+
     def stop!
       request(:put, "/stop")
       refresh!
@@ -43,6 +52,7 @@ module Ubalo
       s = ""
       s << " label: #{label}\n"
       s << "   pod: #{pod_name}\n"
+      s << "  argv: #{pretty_argv}\n"
       if arg?
         if @arg_error
           s << "! Parse error in arg: #{@arg_error.message}"
@@ -83,12 +93,21 @@ module Ubalo
       end
     end
 
+    def pretty_argv
+      Shellwords.join(argv)
+    end
+
     attr_reader :container_process
 
+    def url
+      @account.url_for(path_prefix)
+    end
+
     private
 
     def update_attributes(attributes)
       @state = attributes['state']
+      @argv = attributes['argv']
       @arg = attributes['arg']
       @pod_name = attributes['pod_name']
       @container_process = attributes['container_process']
@@ -130,9 +149,12 @@ module Ubalo
       @output || @output_error
     end
 
-
     def request method, path = nil, options = {}
-      @account.request(method, "/tasks/#{label}#{path}", options)
+      @account.request(method, "#{path_prefix}#{path}", options)
+    end
+
+    def path_prefix
+      "/tasks/#{label}"
     end
   end
 end

data/lib/ubalo/version.rb

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

data/resources/init_files/run.sh

@@ -19,7 +19,7 @@ echo "Please edit run.sh to get started."
 # Sample main.py:
 #
 #   import ubalo
-#   ubalo.output("The argument was %s." % ubalo.arg)
+#   ubalo.output("The argument was %s." % ubalo.arg())
 
 
 ## R code? ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70233277486400 !ruby/object:Gem::Requirement
+  requirement: &70318706609560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233277486400
+  version_requirements: *70318706609560
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70233277485980 !ruby/object:Gem::Requirement
+  requirement: &70318706608600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233277485980
+  version_requirements: *70318706608600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70233277485560 !ruby/object:Gem::Requirement
+  requirement: &70318706607400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233277485560
+  version_requirements: *70318706607400
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70233277485060 !ruby/object:Gem::Requirement
+  requirement: &70318706606660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70233277485060
+  version_requirements: *70318706606660
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70233277484640 !ruby/object:Gem::Requirement
+  requirement: &70318706605940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233277484640
+  version_requirements: *70318706605940
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70318706604880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70318706604880
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -110,4 +121,3 @@ signing_key:
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
-has_rdoc: