slotbox 0.0.2 → 0.0.3

data/bin/slotbox

@@ -57,7 +57,7 @@ slotbox_host = ENV["SLOTBOX_HOST"] || "slotbox.es"
 
 system <<-EOF
 
-export HEROKU_HOST=${HEROKU_HOST:-http://#{slotbox_host}:5000/}
+export HEROKU_HOST=${HEROKU_HOST:-https://#{slotbox_host}:5000/}
 export HEROKU_STATUS_HOST=${HEROKU_STATUS_HOST:-"#{slotbox_host}"}
 export HEROKU_SSL_VERIFY=${HEROKU_SSL_VERIFY:-"disable"}
 

data/lib/slotbox.rb

@@ -1,4 +1,4 @@
 module Slotbox
   UNSUPPORTED_COMMANDS = %w[addons certs db drains keys labs pg pgbackups ssl stack update version]
-  PLUGIN_DIR = "~/.heroku/plugins/slotbox"
+  PLUGIN_DIR = ENV['HOME'] + "/.heroku/plugins/slotbox"
 end

data/plugin/init.rb

@@ -1,4 +1,4 @@
-if ENV['HEROKU_HOST'] =~ /slotbox/
+if ENV['HEROKU_HOST'] =~ /slotbox|localhost/
 
   require 'slotbox'
 

data/plugin/lib/slotbox/api/deploying.rb

@@ -12,4 +12,4 @@ module Heroku
     end
 
   end
-end
+end

data/plugin/lib/slotbox/command/base.rb

@@ -76,4 +76,66 @@ class Heroku::Command::Base
       end
     end
 
+end
+
+module Heroku
+  module Command
+    def self.run(cmd, arguments=[])
+      begin
+        object, method = prepare_run(cmd, arguments.dup)
+        object.send(method)
+      rescue Interrupt, StandardError, SystemExit => error
+        # load likely error classes, as they may not be loaded yet due to defered loads
+        require 'heroku-api'
+        require 'rest_client'
+        raise(error)
+      end
+    rescue Heroku::API::Errors::Unauthorized, RestClient::Unauthorized
+      puts "Authentication failure"
+      unless ENV['HEROKU_API_KEY']
+        run "login"
+        retry
+      end
+    rescue Heroku::API::Errors::VerificationRequired, RestClient::PaymentRequired => e
+      retry if Heroku::Helpers.confirm_billing
+    rescue Heroku::API::Errors::NotFound => e
+      error extract_error(e.response.body) {
+        e.response.body =~ /^([\w\s]+ not found).?$/ ? $1 : "Resource not found"
+      }
+    rescue RestClient::ResourceNotFound => e
+      error extract_error(e.http_body) {
+        e.http_body =~ /^([\w\s]+ not found).?$/ ? $1 : "Resource not found"
+      }
+    rescue Heroku::API::Errors::Locked => e
+      app = e.response.headers[:x_confirmation_required]
+      if confirm_command(app, extract_error(e.response.body))
+        arguments << '--confirm' << app
+        retry
+      end
+    rescue RestClient::Locked => e
+      app = e.response.headers[:x_confirmation_required]
+      if confirm_command(app, extract_error(e.http_body))
+        arguments << '--confirm' << app
+        retry
+      end
+    rescue Heroku::API::Errors::Timeout, RestClient::RequestTimeout
+      error "API request timed out. Please try again, or contact support@heroku.com if this issue persists."
+    rescue Heroku::API::Errors::ErrorWithResponse => e
+      error extract_error(e.response.body)
+    rescue RestClient::RequestFailed => e
+      error extract_error(e.http_body)
+    rescue CommandFailed => e
+      error e.message
+    rescue OptionParser::ParseError
+      commands[cmd] ? run("help", [cmd]) : run("help")
+    rescue Excon::Errors::SocketError => e
+      if e.message == 'getaddrinfo: nodename nor servname provided, or not known (SocketError)'
+        error("Unable to connect to Heroku API, please check internet connectivity and try again.")
+      else
+        raise(e)
+      end
+    ensure
+      display_warnings
+    end
+  end
 end

data/plugin/lib/slotbox/command/deploy.rb

@@ -17,11 +17,6 @@ module Heroku::Command
       path = Addressable::URI.parse(remote).path.split('/')
       remote = "https://github.com/#{path[-2]}/#{path[-1]}"
 
-      app = git "config --get slotbox.app"
-      if app.nil?
-        raise(CommandFailed, "Cannot find Slotbox app name from git config")
-      end
-
       process_data = action("Starting deploy", :success => "connected") do
         process_data = api.put_app_deploy(app, remote).body
         status(process_data["process"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slotbox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies: []
 description: Command-line tool to deploy and manage apps on Slotbox.
 email: tom@tombh.co.uk