bitballoon 0.0.9 → 0.0.10

data/bin/bitballoon

@@ -10,6 +10,9 @@ opts = Slop.parse do
   end
 
   command 'deploy' do
+    on :a=, :'access-token=', 'API Access Token'
+    on :s=, :'site-id=', 'BitBalloon site id'
+
     run do |opts, args|
       path = args.first ? File.expand_path(args.first) : Dir.getwd
       zip = path.match(/\.zip$/)
@@ -17,11 +20,14 @@ opts = Slop.parse do
       raise "File or dir doesn't exist: #{path}" unless File.exist?(path)
       raise "Can't deploy a single file" if File.file?(path) && !zip
 
-      credentials_path = File.expand_path(".bitballoon")
+      credentials_path = opts[:a] ? nil : File.expand_path(".bitballoon")
 
-      if File.exist?(credentials_path)
+      if credentials_path && File.exist?(credentials_path)
         credentials = JSON.parse(File.read(credentials_path))
         client = BitBalloon::Client.new(:access_token => credentials['access_token'])
+      elsif opts[:a]
+        credentials = {'access_token' => opts[:a]}
+        client = BitBalloon::Client.new(:access_token => credentials['access_token'])
       else
         puts "Please enter your BitBalloon API Credentials (if you don't have any, you can create your credentials at https://www.bitballoon.com/applications)"
         client_id = ask("Client ID:")
@@ -31,6 +37,8 @@ opts = Slop.parse do
         credentials = {'access_token' => client.access_token}
       end
 
+      credentials['site_id'] = opts[:s] if opts[:s]
+
       attributes = zip ? {:zip => path} : {:dir => path}
 
       if credentials['site_id']
@@ -48,7 +56,7 @@ opts = Slop.parse do
 
       File.open(credentials_path, "w") do |file|
         file.write(JSON.generate(credentials))
-      end
+      end if credentials_path
 
       puts "Site deployed: #{site.url}"
     end

data/lib/bitballoon/client.rb

@@ -4,6 +4,7 @@ module BitBalloon
   class Client
     ENDPOINT    = ENV['OAUTH_CLIENT_API_URL'] || 'https://www.bitballoon.com'
     API_VERSION = "v1"
+    RETRIES     = 3
 
     class BitBalloonError < StandardError; end
     class NotFoundError < BitBalloonError; end
@@ -51,25 +52,43 @@ module BitBalloon
     end
 
     def request(verb, path, opts={}, &block)
-      raise AuthenticationError, "Authorize with BitBalloon before making requests" unless oauth_token
+      retries = 0
+      begin
+        raise AuthenticationError, "Authorize with BitBalloon before making requests" unless oauth_token
 
-      oauth_token.request(verb, ::File.join("/api", API_VERSION, path), opts, &block)
-    rescue OAuth2::Error => e
-      case e.response.status
-      when 401
-        raise AuthenticationError, message_for(e, "Authentication Error")
-      when 404
-        raise NotFoundError, message_for(e, "Not Found")
-      when 500
-        raise InternalServerError, message_for(e, "Internal Server Error")
-      else
-        raise BitBalloonError, message_for(e, "OAuth2 Error")
+        oauth_token.request(verb, ::File.join("/api", API_VERSION, path), opts, &block)
+      rescue OAuth2::Error => e
+        case e.response.status
+        when 401
+          raise AuthenticationError, message_for(e, "Authentication Error")
+        when 404
+          raise NotFoundError, message_for(e, "Not Found")
+        when 500
+          if retry_request?(verb, e.response.status, retries)
+            retries += 1
+            retry
+          else
+            raise InternalServerError, message_for(e, "Internal Server Error")
+          end
+        else
+          raise BitBalloonError, message_for(e, "OAuth2 Error")
+        end
+      rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError => e
+        if retry_request?(verb, e.response && e.response.status, retries)
+          retries += 1
+          retry
+        else
+          raise ConnectionError, message_for(e, "Connection Error")
+        end
       end
-    rescue Faraday::Error::ConnectionFailed => e
-      raise ConnectionError, message_for(e, "Connection Error")
     end
 
     private
+    def retry_request?(http_verb, status_code, retries)
+      return false unless [:get, :put, :delete, :head].include?(http_verb.to_s.downcase.to_sym)
+      return retries < 3 unless status_code && status_code == 422
+    end
+
     def oauth_token
       @oauth_token ||= access_token && OAuth2::AccessToken.new(oauth, access_token)
     end

data/lib/bitballoon/site.rb

@@ -19,6 +19,7 @@ module BitBalloon
       end
 
       (required || []).each do |sha|
+        puts "Uploading #{shas[sha]}"
         client.request(:put, ::File.join(path, "files", URI.encode(shas[sha])), :body => ::File.read(::File.join(dir, shas[sha])), :headers => {"Content-Type" => "application/octet-stream"})
       end
 

data/lib/bitballoon/version.rb

@@ -1,3 +1,3 @@
 module BitBalloon
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitballoon
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2