ubalo 0.0.22 → 0.0.23

data/bin/ubalo

@@ -139,7 +139,9 @@ def process_download response, destination_path=nil
   end
 
   files.each do |filename,content|
-    File.open(File.join(destination_path, filename), "w") do |f|
+    local_filename = File.join(destination_path, filename)
+    FileUtils.mkdir_p(File.dirname(local_filename))
+    File.open(local_filename, "w") do |f|
       f.puts content
     end
   end
@@ -217,18 +219,24 @@ end
 desc 'Delete a pod'
 arg_name '<pod name>'
 command :delete do |c|
+  c.switch :force
+
   c.action do |global_options,options,args|
     pod_name = normalize_pod_name(args.shift)
 
-    hl.choose do |menu|
-      menu.prompt = "Are you sure you want to delete #{pod_name}? "
-      menu.choice :yes do
-        $stderr.print "Deleting #{pod_name}..."
-        response = ubalo.delete_pod(pod_name)
-        $stderr.puts " done."
-      end
-      menu.choice :no do
-        raise UbaloMessage, "Cancelled! No changes made to #{pod_name}."
+    if options.force
+      ubalo.delete_pod(pod_name)
+    else
+      hl.choose do |menu|
+        menu.prompt = "Are you sure you want to delete #{pod_name}? "
+        menu.choice :yes do
+          $stderr.print "Deleting #{pod_name}..."
+          response = ubalo.delete_pod(pod_name)
+          $stderr.puts " done."
+        end
+        menu.choice :no do
+          raise UbaloMessage, "Cancelled! No changes made to #{pod_name}."
+        end
       end
     end
   end
@@ -237,84 +245,43 @@ end
 desc 'Run a pod'
 arg_name '<pod name>'
 command :run do |c|
-  c.desc 'Use JSON for input and output'
-  c.switch :json
-
   c.action do |global_options,options,args|
     pod_name = normalize_pod_name(args.shift)
-    if options.json
-      arg = receive_json_from_stdin
-    else
-      arg = args.join(" ")
-      $stderr.print "Running #{pod_name}..."
-    end
+    arg = args.join(" ")
+    $stderr.print "Running #{pod_name}..."
 
     response = ubalo.submit_task(pod_name, arg)
     task_label = response.fetch('label')
-    result = ubalo.wait_task(task_label, options.json)
-    ubalo.show_result(result, options.json)
-  end
-end
-
-def receive_json_from_stdin
-  if $stdin.tty?
-    raise UbaloMessage, "please pipe to stdin when using --json"
-  else
-    JSON.parse($stdin.read)
+    result = ubalo.wait_task(task_label)
+    ubalo.show_result(result)
   end
 end
 
 desc 'Submit a pod for running in the background'
 arg_name '<pod name>'
 command :submit do |c|
-  c.desc 'Receive JSON from stdin'
-  c.switch :json
-
   c.action do |global_options,options,args|
-    if options.json
-      args = receive_json_from_stdin
-      result = ubalo.submit_task_json(args)
-    else
-      pod_name = normalize_pod_name(args.shift)
+    pod_name = normalize_pod_name(args.shift)
 
-      $stderr.print "Submitting #{pod_name}..."
-      result = ubalo.submit_task(pod_name, args.join(" "))
-      $stderr.puts " submitted."
-    end
-    ubalo.show_result(result, options.json)
+    $stderr.print "Submitting #{pod_name}..."
+    result = ubalo.submit_task(pod_name, args.join(" "))
+    $stderr.puts " submitted."
+
+    ubalo.show_result(result)
   end
 end
 
 desc 'Check or get the result of a task'
 arg_name '<task label>'
 command :check do |c|
-  c.desc 'Get details and give output as JSON'
-  c.switch :json
-
   c.action do |global_options,options,args|
-    if options.json
-      args = receive_json_from_stdin
-      result = ubalo.check_task_json(args)
-    else
-      task_label = args.first
-
-      $stderr.print "Checking task #{task_label}..."
-      result = ubalo.check_task(task_label)
-      $stderr.puts " found."
-    end
+    task_label = args.first
 
-    ubalo.show_result(result, options.json)
-  end
-end
+    $stderr.print "Checking task #{task_label}..."
+    result = ubalo.check_task(task_label)
+    $stderr.puts " found."
 
-desc 'Stop running a specific task'
-arg_name '<task label>'
-command :stop do |c|
-  c.action do |global_options,options,args|
-    task_label = args.first
-    $stderr.print "Stopping task #{task_label}..."
-    result = ubalo.stop_task(task_label)
-    $stderr.puts " stopped."
+    ubalo.show_result(result)
   end
 end
 
@@ -428,19 +395,6 @@ command :unpublish do |c|
   end
 end
 
-
-# XXX testing
-command :upload do |c|
-  c.action do |global_options,options,args|
-    while filename = args.shift
-      $stderr.print "Uploading #{filename.inspect}..."
-      response = ubalo.s3_put filename
-      $stderr.puts " done."
-      puts "Saved as #{response.inspect}."
-    end
-  end
-end
-
 def unauthorized_command?(command)
   command && [:login, :help].include?(command.name)
 end

data/lib/ubalo.rb

@@ -51,12 +51,41 @@ class UbaloMessage < StandardError
 end
 
 class Ubalo
-  class PodError < StandardError
+  class UbaloJSON
+    def self.content_type
+      "application/json; schema=ubalo-data"
+    end
+
+    def self.dump(obj)
+      JSON.dump('data' => obj)
+    end
+
+    def self.load(data)
+      JSON.load(data)['data']
+    end
   end
-  class S3Error < PodError
+
+  class PodError < StandardError
   end
 
   class << self
+    def print_content name, content
+      data = content.fetch('data')
+      content_type = content.fetch('content_type')
+      if content_type == UbaloJSON.content_type
+        s = UbaloJSON.load(data).pretty_inspect.strip
+        if s.include?("\n")
+          puts "#{name}:"
+          puts s
+        else
+          puts "#{name}: #{s}"
+        end
+      else
+        puts "#{name}: (#{content_type})"
+        puts data.indent
+      end
+    end
+
     def format_task task
       "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
     end
@@ -78,13 +107,13 @@ class Ubalo
       seconds = Time.now - Time.parse(time)
       case
       when seconds < 60
-        "#{pluralize seconds.floor, "second"} ago"
+        "#{pluralize(seconds.floor, "second")} ago"
       when seconds/60 < 60
-        "#{pluralize (seconds/60).floor, "minute"} ago"
+        "#{pluralize((seconds/60).floor, "minute")} ago"
       when seconds/60/60 < 24
-        "#{pluralize (seconds/60/60).floor, "hour"} ago"
+        "#{pluralize((seconds/60/60).floor, "hour")} ago"
       else
-        "#{pluralize (seconds/60/60/24).floor, "day"} ago"
+        "#{pluralize((seconds/60/60/24).floor, "day")} ago"
       end
     end
 
@@ -135,7 +164,7 @@ class Ubalo
 
   def whoami
     response = get("#{base_url}/user")
-    "You are #{response['username']}, with role #{response['role']}."
+    "You are logged in as #{response['username'].inspect}."
   end
 
   def tasks count
@@ -143,7 +172,11 @@ class Ubalo
   end
 
   def submit_task pod_name, arg
-    post("#{base_url}/pods/#{pod_name}/tasks", :arg => JSON.dump(:data => arg))
+    params = {
+      :arg_content_type => UbaloJSON.content_type,
+      :arg => UbaloJSON.dump(arg)
+    }
+    post("#{base_url}/pods/#{pod_name}/tasks", params)
   end
 
   def wait_task(label, silent=false)
@@ -173,38 +206,32 @@ class Ubalo
     get("#{base_url}/pods")
   end
 
-  def stop_task(label)
-    post("#{base_url}/tasks/#{label}/stop")
-  end
+  def show_result(result)
+    puts " label: #{result['label']}"
+    puts "   pod: #{result['pod_name']}"
+    if arg = result['arg']
+      Ubalo.print_content('   arg', arg)
+    end
 
-  def show_result(result, json=false)
-    if json
-      puts JSON.dump(result)
-    else
-      puts " label: #{result['label']}"
-      puts "   pod: #{result['pod_name']}"
-      puts "   arg: #{result['arg']}"
-      puts " state: #{result['state']}"
-      case result['exit_type']
-      when 'exited'
-        puts "status: #{result['exit_result']}"
-      when 'terminated'
-        puts "terminated with signal: #{result['exit_result']}"
-      end
+    puts " state: #{result['state']}"
+
+    if container_process = result['container_process']
+      puts "status: #{container_process['exit_result']}"
 
-      if result['stdout']
+      if stdout = container_process['stdout'] and stdout.length > 0
         puts "stdout:"
-        puts result['stdout'].indent
+        puts stdout.indent
       end
-      if result['stderr']
+
+      if stderr = container_process['stderr'] and stderr.length > 0
         puts "stderr:"
-        puts result['stderr'].indent
-      end
-      if result['outputs']
-        puts "output:"
-        puts result['outputs'].pretty_inspect.indent
+        puts stderr.indent
       end
     end
+
+    if outputs = result['outputs']
+      Ubalo.print_content('output', outputs)
+    end
   end
 
   def get_authorization login, password
@@ -231,10 +258,6 @@ class Ubalo
     get("#{base_url}/tasks/#{label}")
   end
 
-  def check_task_json hash
-    check_task(hash[:label])
-  end
-
   def publish pod_name
     post("#{base_url}/pods/#{pod_name}/publish")
   end
@@ -247,39 +270,7 @@ class Ubalo
     post("#{base_url}/pods/#{pod_name}/unpublish")
   end
 
-  def s3_put filename
-    username = write_s3cfg_and_get_user
-
-    key = "#{username}/uploads/#{filename}"
-    pid = Process.spawn("s3cmd", "put", filename, "#{root_s3_path}/#{key}", {err: "/dev/null", out: "/dev/null"})
-    _, status = Process.wait2(pid)
-
-    unless status.success?
-      raise Ubalo::S3Error, "could not write file #{filename.inspect} from key #{key.inspect}"
-    end
-    key
-  end
-
   private
-  def root_s3_path
-    "s3://ubalo/users"
-  end
-
-  def write_s3cfg_and_get_user
-    return @s3cfg_user if @s3cfg_user
-
-    response = put("#{base_url}/user")
-    conf = <<EOS
-[default]
-access_key = #{response['amazon_access_key_id']}
-secret_key = #{response['amazon_secret_access_key']}
-EOS
-    open(File.expand_path("~/.s3cfg"), "w") do |f|
-      f.write conf
-    end
-    @s3cfg_user = response['username']
-  end
-
 
   def add_headers headers
     # Add authorization headers.

data/lib/ubalo/version.rb

@@ -1,3 +1,5 @@
 class Ubalo
-  VERSION = "0.0.22"
+  unless const_defined?('VERSION')
+    VERSION = "0.0.23"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70246690489020 !ruby/object:Gem::Requirement
+  requirement: &70245226856660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246690489020
+  version_requirements: *70245226856660
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70246690487940 !ruby/object:Gem::Requirement
+  requirement: &70245226856180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246690487940
+  version_requirements: *70245226856180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70246690486780 !ruby/object:Gem::Requirement
+  requirement: &70245226855760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246690486780
+  version_requirements: *70245226855760
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70246690485440 !ruby/object:Gem::Requirement
+  requirement: &70245226855240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70246690485440
+  version_requirements: *70245226855240
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -90,4 +90,3 @@ signing_key:
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
-has_rdoc: