ubalo 0.15 → 0.16

data/bin/ubalo

@@ -259,9 +259,13 @@ end
 
 desc 'Push files to Ubalo'
 command :push do |c|
+  c.switch :detached
+
   c.action do |global_options,options,args|
     pod.push_from(pod_dir)
-    pod.tail_process
+    unless options.detached
+      pod.tail_process
+    end
     puts pod.printable_result
   end
 end
@@ -282,6 +286,15 @@ command 'push-run' do |c|
   end
 end
 
+desc 'Cancel a pod compilation'
+command 'push:cancel' do |c|
+  c.action do |global_options,options,args|
+    pod.cancel_push!
+    pod.tail_process
+    puts pod.printable_result
+  end
+end
+
 pre do |global,command,options,args|
   @connect_url = ENV['UBALO_CONNECT_URL'] || "https://ubalo.com"
 

data/lib/ubalo/account.rb

@@ -12,10 +12,50 @@ module Ubalo
     end
 
     def request method, path = nil, options = {}
+      url = url_for(path)
+      headers = ubalo_headers.merge({:accept => :json})
+
       if authorization and !options[:skip_authorization]
-        options[:authorization] = authorization
+        headers[:authorization] = authorization
+      end
+
+      params = options.delete(:params) || {}
+
+      if Util.debug_mode?
+        $stderr.puts "request method=#{method.inspect} url=#{url.inspect} options=#{options.inspect} headers=#{headers.inspect} params=#{params.inspect}"
+      end
+
+      resource = RestClient::Resource.new url, :timeout => 60
+      case method
+      when :get
+        response = resource.get headers.merge(:params => params)
+      when :post
+        response = resource.post params, headers
+      when :put
+        response = resource.put params, headers
+      when :delete
+        response = resource.delete headers
+      else
+        raise "don't understand request method #{method.inspect}"
       end
-      Util.http_request(method, url_for(path), options)
+
+      if response.code == 204
+        nil
+      elsif options.delete(:parse) == false
+        response
+      else
+        JSON.load(response)
+      end
+    rescue RestClient::Request::Unauthorized
+      raise Ubalo::Error, "Your credentials are invalid. #{Util.login_suggestion}"
+    rescue RestClient::BadRequest => e
+      if message = JSON.load(e.response.to_s)["upgrade_message"]
+        raise Ubalo::Error, message
+      else
+        raise e
+      end
+    rescue RestClient::BadGateway, RestClient::ServiceUnavailable => e
+      raise Ubalo::Error, "Ubalo is unable to handle your request at this time"
     end
 
     def url_for(path)
@@ -87,5 +127,14 @@ module Ubalo
     def update_attributes(attributes)
       @username = attributes['username']
     end
+
+    def ubalo_headers
+      {
+        'X-Ubalo-Version' => Ubalo.version,
+        'User-Agent' => "ubalo-cli/#{Ubalo.version}",
+        'X-Ruby-Version' => RUBY_VERSION,
+        'X-Ruby-Platform' => RUBY_PLATFORM,
+      }
+    end
   end
 end

data/lib/ubalo/pod.rb

@@ -84,6 +84,11 @@ module Ubalo
       logger.puts " done."
     end
 
+    def cancel_push!
+      request(:put, "/stop")
+      refresh!
+    end
+
     def clone_to(pod_dir)
       refresh!
       archive.extract_to(pod_dir)

data/lib/ubalo/tailer.rb

@@ -18,7 +18,7 @@ module Ubalo
     def update(output)
       @lines.times do
         @logger.print "\e[A"
-        @logger.print " " * ENV.fetch("COLUMNS", 80)
+        @logger.print " " * Integer(ENV.fetch("COLUMNS", 80))
         @logger.print "\r"
       end
 

data/lib/ubalo/util.rb

@@ -91,59 +91,6 @@ module Ubalo
         end
       end
 
-      def ubalo_headers
-        {
-          'X-Ubalo-Version' => Ubalo.version,
-          'User-Agent' => "ubalo-cli/#{Ubalo.version}",
-          'X-Ruby-Version' => RUBY_VERSION,
-          'X-Ruby-Platform' => RUBY_PLATFORM,
-        }
-      end
-
-      def http_request(method, url, options)
-        params = options.delete(:params) || {}
-
-        headers = ubalo_headers.merge({:accept => :json})
-
-        if authorization = options.delete(:authorization)
-          headers.merge!(:authorization => authorization)
-        end
-
-        if debug_mode?
-          $stderr.puts "about to #{method.inspect} to #{url.inspect} with #{options.inspect}"
-        end
-
-        resource = RestClient::Resource.new url, :timeout => 60
-        case method
-        when :get
-          response = resource.get headers.merge(:params => params)
-        when :post
-          response = resource.post params, headers
-        when :put
-          response = resource.put params, headers
-        when :delete
-          response = resource.delete headers
-        else
-          raise "don't understand request method #{method.inspect}"
-        end
-
-        if response.code == 204
-          nil
-        elsif options.delete(:parse) == false
-          response
-        else
-          JSON.load(response)
-        end
-      rescue RestClient::Request::Unauthorized
-        raise Ubalo::Error, "Your credentials are invalid. #{login_suggestion}"
-      rescue RestClient::BadRequest => e
-        if message = JSON.load(e.response.to_s)["upgrade_message"]
-          raise Ubalo::Error, message
-        else
-          raise e
-        end
-      end
-
       def login_suggestion
         "Please run ubalo login."
       end
@@ -211,11 +158,9 @@ module Ubalo
         end
       end
 
-      private
       def debug_mode?
         ENV['UBALO_DEBUG'] == 'true'
       end
-
     end
   end
 end

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70318706609560 !ruby/object:Gem::Requirement
+  requirement: &70197562743800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318706609560
+  version_requirements: *70197562743800
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70318706608600 !ruby/object:Gem::Requirement
+  requirement: &70197562711140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318706608600
+  version_requirements: *70197562711140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70318706607400 !ruby/object:Gem::Requirement
+  requirement: &70197562707560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318706607400
+  version_requirements: *70197562707560
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70318706606660 !ruby/object:Gem::Requirement
+  requirement: &70197562706240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70318706606660
+  version_requirements: *70197562706240
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70318706605940 !ruby/object:Gem::Requirement
+  requirement: &70197562705480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318706605940
+  version_requirements: *70197562705480
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70318706604880 !ruby/object:Gem::Requirement
+  requirement: &70197562704740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318706604880
+  version_requirements: *70197562704740
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: