ubalo 0.5 → 0.6

data/bin/ubalo

@@ -19,7 +19,10 @@ end
 
 use_openstruct true
 
-logger = Ubalo::Util::Logger.new
+
+def logger
+  @logger ||= Ubalo::Util::Logger.new
+end
 
 def connect_url
   @connect_url
@@ -61,6 +64,7 @@ end
 desc 'Display authentication information'
 command :whoami do |c|
   c.action do |global_options,options,args|
+    account.refresh!
     puts "You are logged in as #{account.username}."
   end
 end
@@ -120,13 +124,10 @@ command :clone do |c|
 end
 
 desc 'Delete a pod'
-arg_name '<pod name>'
-command :delete do |c|
+command 'pod:delete' do |c|
   c.switch :force
 
   c.action do |global_options,options,args|
-    pod = account.pod_by_name!(args.shift)
-
     if options.force
       pod.delete!
     else
@@ -154,7 +155,7 @@ command :init do |c|
   c.action do |global_options,options,args|
     name = options[:name] || hl.ask(" pod name: "){|q| q.echo = true}
     pod = account.pod_or_create_by_name!(name)
-    pod_dir.write_name(pod.fullname)
+    pod_dir.init(pod.fullname, logger)
     logger.puts "Success! Next, run ubalo push."
   end
 end
@@ -172,6 +173,13 @@ command :run do |c|
   end
 end
 
+desc 'Show information about a pod'
+command :pod do |c|
+  c.action do |global_options,options,args|
+    puts pod.printable_result
+  end
+end
+
 desc 'Run a pod in the background'
 command :submit do |c|
   c.action do |global_options,options,args|
@@ -186,13 +194,12 @@ desc 'Get the status of a task'
 arg_name '<task label>'
 command :task do |c|
   c.action do |global_options,options,args|
-    unless label = args.shift
-      raise Ubalo::Error, "please specify a task label"
+    if label = args.shift
+      task = account.task_by_label!(label)
+    else
+      task = pod.latest_task
     end
-    task = account.task_by_label!(label)
-    logger.print "Getting the status for task #{task.label.inspect}..."
-    task.refresh!
-    logger.puts " found."
+
     puts task.printable_result
   end
 end
@@ -207,6 +214,7 @@ command :push do |c|
       pod.refresh!
       pod.compiled?
     end
+    puts pod.printable_result
   end
 end
 
@@ -234,16 +242,14 @@ end
 on_error do |exception|
   logger.complete_line
   case exception
-  when Ubalo::Error, GLI::UnknownCommand
+  when Ubalo::Error, GLI::BadCommandLine
     logger.complete_line
-    logger.puts "Error: #{exception.message}"
-    exit 1
+    abort("Error: #{exception.message}")
   when Interrupt
     logger.complete_line
-    logger.puts "Cancelled!"
-    exit 1
+    abort("Cancelled!")
   else
-    raise
+    raise exception
   end
 end
 

data/lib/ubalo/account.rb

@@ -12,20 +12,26 @@ module Ubalo
     end
 
     def request method, path = nil, options = {}
-      if authorization
+      if authorization and !options[:skip_authorization]
         options[:authorization] = authorization
       end
       Util.http_request(method, "#{@base_url}#{path}", options)
     end
 
     def authorize(login, password)
-      response = request(:post, "/user/authorization", :params => {:user => {:login => login, :password => password}})
+      response = request(:post, "/user/authorization", :params => {:user => {:login => login, :password => password}}, :skip_authorization => true)
       @username = response.fetch("username")
       @authorization = response.fetch("authorization")
     rescue RestClient::BadRequest
       raise Ubalo::Error, "Incorrect login or password"
     end
 
+    def refresh!
+      update_attributes(request(:get, "/users/#{username}"))
+    rescue RestClient::ResourceNotFound
+      raise Ubalo::Error, "Your credentials for #{username} are invalid"
+    end
+
     def pod_from_json(pod_json)
       Pod.create_with_json(self, pod_json)
     end
@@ -74,5 +80,10 @@ module Ubalo
     def ==(other)
       [base_url, username, authorization] == [base_url, other.username, other.authorization]
     end
+
+    private
+    def update_attributes(attributes)
+      @username = attributes['username']
+    end
   end
 end

data/lib/ubalo/pod.rb

@@ -6,7 +6,7 @@ module Ubalo
       new(account, json.fetch('user').fetch('username'), json.fetch('name'), json)
     end
 
-    attr_reader :username, :name, :state, :archive, :updated_at
+    attr_reader :username, :name, :state, :archive, :updated_at, :compilation_run
 
     def initialize(account, username, name, attributes)
       @account = account
@@ -45,6 +45,14 @@ module Ubalo
       @account.task_from_json(request(:post, "/tasks", :params => params))
     end
 
+    def latest_task
+      if task_json = request(:get, "/tasks").first
+        @account.task_from_json(task_json)
+      else
+        raise Ubalo::Error, "Could not find latest task for #{fullname.inspect}"
+      end
+    end
+
     def push_from(pod_dir)
       new_archive.activate_from(pod_dir)
       refresh!
@@ -69,6 +77,27 @@ module Ubalo
       !!@deleted
     end
 
+    def printable_result
+      s = ""
+      s << "  name: #{fullname}\n"
+      s << " state: #{state}\n"
+
+      if compilation_run
+        s << "status: #{compilation_run.fetch('exit_result')}\n"
+
+        if stdout = compilation_run.fetch('stdout') and stdout.length > 0
+          s << "stdout:\n"
+          s << Util.indent(stdout)
+        end
+
+        if stderr = compilation_run.fetch('stderr') and stderr.length > 0
+          s << "stderr:\n"
+          s << Util.indent(stderr)
+        end
+      end
+      s
+    end
+
     def inspect
       "#<Pod #{fullname.inspect} state=#{state.inspect}>"
     end
@@ -80,6 +109,7 @@ module Ubalo
     private
     def update_attributes(attributes)
       @state = attributes['state']
+      @compilation_run = attributes['compilation_run']
       if archive_attr = attributes['archive']
         @archive = @account.archive_from_json(archive_attr)
       end

data/lib/ubalo/pod_dir.rb

@@ -26,6 +26,30 @@ module Ubalo
       end
     end
 
+    def init(name, logger)
+      write_name(name)
+      in_path do
+        default_files.each do |filename,content|
+          if File.exist?(filename)
+            logger.puts "Using existing #{filename.inspect}"
+          else
+            logger.puts "Writing an example #{filename.inspect}"
+            File.open(filename, "w"){|f| f.write(content)}
+          end
+        end
+      end
+    end
+
+    def default_files
+      gem_root = File.expand_path("../../..", __FILE__)
+      files_root = File.join(gem_root, "resources/init_files")
+      files = {}
+      %w{.ubaloignore run.sh}.each do |filename|
+        files[filename] = File.read(File.join(files_root, filename))
+      end
+      files
+    end
+
     def manifest
       in_path do
         Dir.glob('{.**,**}').map do |path|

data/lib/ubalo/task.rb

@@ -1,6 +1,6 @@
 module Ubalo
   class Task
-    attr_reader :label, :state, :pod_name, :arg, :output, :submitted_at
+    attr_reader :label, :state, :pod_name, :arg, :output, :submitted_at, :elapsed_time
 
     def self.create_with_json(account, json)
       new(account, json.fetch('label'), json)
@@ -46,7 +46,11 @@ module Ubalo
 
       if container_process
         s << "status: #{container_process.fetch('exit_result')}\n"
+      end
+
+      s << "  time: #{'%.1f' % elapsed_time} s\n"
 
+      if container_process
         if stdout = container_process.fetch('stdout') and stdout.length > 0
           s << "stdout:\n"
           s << Util.indent(stdout)
@@ -74,6 +78,7 @@ module Ubalo
       @pod_name = attributes['pod_name']
       @container_process = attributes['container_process']
       @submitted_at = attributes['submitted_at']
+      @elapsed_time = attributes['elapsed_time']
 
       @arg = Util.decode_content(attributes['arg']) if attributes['arg']
       @output = Util.decode_content(attributes['outputs']) if attributes['outputs']

data/lib/ubalo/util.rb

@@ -86,7 +86,7 @@ module Ubalo
       def http_request(method, url, options)
         params = options.delete(:params) || {}
 
-        headers = {:accept => :json, 'X-Ubalo-Version' => Ubalo::VERSION}
+        headers = {:accept => :json, 'X-Ubalo-Version' => Ubalo.version}
 
         if authorization = options.delete(:authorization)
           headers.merge!(:authorization => authorization)
@@ -115,6 +115,12 @@ module Ubalo
         else
           JSON.load(response)
         end
+      rescue RestClient::BadRequest => e
+        if message = JSON.load(e.response.to_s)["upgrade_message"]
+          raise Ubalo::Error, message
+        else
+          raise e
+        end
       end
 
       def pluralize count, word

data/lib/ubalo/version.rb

@@ -1,5 +1,9 @@
 module Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.5"
+    VERSION = "0.6"
+  end
+
+  def self.version
+    ENV['UBALO_VERSION'] || VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70233084564080 !ruby/object:Gem::Requirement
+  requirement: &70257222461780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233084564080
+  version_requirements: *70257222461780
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70233084571080 !ruby/object:Gem::Requirement
+  requirement: &70257222459400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233084571080
+  version_requirements: *70257222459400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70233075286720 !ruby/object:Gem::Requirement
+  requirement: &70257222473120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233075286720
+  version_requirements: *70257222473120
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70233075285840 !ruby/object:Gem::Requirement
+  requirement: &70257222468340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70233075285840
+  version_requirements: *70257222468340
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70233075285220 !ruby/object:Gem::Requirement
+  requirement: &70257222746760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233075285220
+  version_requirements: *70257222746760
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -94,18 +94,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1754747755012050403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1754747755012050403
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -113,3 +107,4 @@ signing_key:
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
+has_rdoc: