ubalo 0.8 → 0.9

data/bin/ubalo

@@ -41,7 +41,7 @@ end
 
 def pod
   unless @pod
-    @pod = account.pod_or_create_by_name!(pod_dir.name)
+    @pod = account.pod_by_name(pod_dir.name)
   end
   @pod
 end
@@ -154,7 +154,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 = account.pod_by_name(name)
     pod_dir.init(pod.fullname, logger)
     logger.puts "Success! Next, run ubalo push."
   end
@@ -176,6 +176,7 @@ end
 desc 'Show information about a pod'
 command :pod do |c|
   c.action do |global_options,options,args|
+    pod.refresh!
     puts pod.printable_result
   end
 end
@@ -204,6 +205,26 @@ command :task do |c|
   end
 end
 
+desc 'Stop a task'
+arg_name '<task label>'
+command 'task:stop' 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
+
+    task.stop!
+
+    logger.poll_on("Stopping task #{task.label.inspect}...") do
+      task.refresh!
+      task.complete?
+    end
+    puts task.printable_result
+  end
+end
+
 desc 'Push files to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
@@ -231,7 +252,7 @@ pre do |global,command,options,args|
   end
 
   if pod_name = global['pod']
-    @pod = account.pod_or_create_by_name!(pod_name)
+    @pod = account.pod_by_name(pod_name)
   end
 
   @pod_dir = Ubalo::PodDir.new(global['pod-dir'] || ".")

data/lib/ubalo/account.rb

@@ -50,16 +50,14 @@ module Ubalo
       end
     end
 
-    def pod_by_name!(name)
+    def pod_by_name(name)
       pod_username, pod_name = Util.normalize_pod_name(username, name)
-      pod = Pod.new(self, pod_username, pod_name, {})
-      pod.refresh!
+      Pod.new(self, pod_username, pod_name, {})
     end
 
-    def pod_or_create_by_name!(name)
-      pod_username, pod_name = Util.normalize_pod_name(username, name)
-      pod = Pod.new(self, pod_username, pod_name, {})
-      pod.update!
+    def pod_by_name!(name)
+      pod = pod_by_name(name)
+      pod.refresh!
     end
 
     def task_by_label!(label)

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, :compilation_run
+    attr_reader :username, :name, :state, :archive, :updated_at, :compilation_process
 
     def initialize(account, username, name, attributes)
       @account = account
@@ -43,6 +43,8 @@ module Ubalo
         :arg => UbaloJSON.dump(arg)
       }
       @account.task_from_json(request(:post, "/tasks", :params => params))
+    rescue RestClient::Conflict
+      raise Ubalo::Error, "Cannot run pod while compiling"
     end
 
     def latest_task
@@ -54,6 +56,7 @@ module Ubalo
     end
 
     def push_from(pod_dir)
+      update!
       new_archive.activate_from(pod_dir)
       refresh!
     end
@@ -82,15 +85,15 @@ module Ubalo
       s << "  name: #{fullname}\n"
       s << " state: #{state}\n"
 
-      if compilation_run
-        s << "status: #{compilation_run.fetch('exit_result')}\n"
+      if compilation_process
+        s << "status: #{compilation_process.fetch('exit_result')}\n"
 
-        if stdout = compilation_run.fetch('stdout') and stdout.length > 0
+        if stdout = compilation_process.fetch('stdout') and stdout.length > 0
           s << "stdout:\n"
           s << Util.indent(stdout)
         end
 
-        if stderr = compilation_run.fetch('stderr') and stderr.length > 0
+        if stderr = compilation_process.fetch('stderr') and stderr.length > 0
           s << "stderr:\n"
           s << Util.indent(stderr)
         end
@@ -109,7 +112,7 @@ module Ubalo
     private
     def update_attributes(attributes)
       @state = attributes['state']
-      @compilation_run = attributes['compilation_run']
+      @compilation_process = attributes['compilation_process']
       if archive_attr = attributes['archive']
         @archive = @account.archive_from_json(archive_attr)
       end

data/lib/ubalo/pod_archive.rb

@@ -16,10 +16,16 @@ module Ubalo
       with_temp_archive do |archive_name|
         pod_dir.make_archive(archive_name)
         Util.put_targz(put_url, archive_name)
-        request(:put, "/activate")
+        activate
       end
     end
 
+    def activate
+      request(:put, "/activate")
+    rescue RestClient::Conflict
+      raise Ubalo::Error, "Pod is already compiling"
+    end
+
     def extract_to(pod_dir)
       with_temp_archive do |archive_name|
         Util.get_targz(get_url, archive_name)

data/lib/ubalo/task.rb

@@ -26,6 +26,11 @@ module Ubalo
       state == 'exited'
     end
 
+    def stop!
+      request(:put, "/stop")
+      refresh!
+    end
+
     def inspect
       "#<Task #{label.inspect} state=#{state.inspect}>"
     end

data/lib/ubalo/util.rb

@@ -110,7 +110,9 @@ module Ubalo
           raise "don't understand request method #{method.inspect}"
         end
 
-        if options.delete(:parse) == false
+        if response.code == 204
+          nil
+        elsif options.delete(:parse) == false
           response
         else
           JSON.load(response)

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70170534374580 !ruby/object:Gem::Requirement
+  requirement: &70214700595780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170534374580
+  version_requirements: *70214700595780
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70170534373220 !ruby/object:Gem::Requirement
+  requirement: &70214700594160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170534373220
+  version_requirements: *70214700594160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70170534371160 !ruby/object:Gem::Requirement
+  requirement: &70214700592680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170534371160
+  version_requirements: *70214700592680
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70170534390100 !ruby/object:Gem::Requirement
+  requirement: &70214700591800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70170534390100
+  version_requirements: *70214700591800
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70170534389520 !ruby/object:Gem::Requirement
+  requirement: &70214700591020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170534389520
+  version_requirements: *70214700591020
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2627822707844365386
+      hash: -2863097484302400668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,10 +107,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2627822707844365386
+      hash: -2863097484302400668
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo