strobe 0.3.4 → 0.3.5

data/lib/strobe/cli/deploys.rb

@@ -1,10 +1,11 @@
 module Strobe
+  class NoDeploy < StrobeError; end
+
   class CLI::Deploys < CLI
 
     method_option "application-id", :type => :numeric, :banner => "Use application with given id"
     action "list", "list deploys" do
-      id = options['application-id'] || config[:application_id]
-      app = Application.get!(id)
+      app = get_application(options)
       deploys = app.deploys.all
 
       deploys_table deploys
@@ -16,10 +17,11 @@ module Strobe
     action "show", "show the last deploy" do |*args|
       sha = args.first
 
-      id = options['application-id'] || config[:application_id]
-      app = Application.get!(id)
+      app = get_application(options)
+
+      deploy = sha ? app.deploys.where(:id => sha) : Deploy.where(:limit => 1, :application_id => app.id).first
 
-      deploy = sha ? app.deploys.where(:id => sha) : Deploy.where(:limit => 1, :application_id => id).first
+      raise NoDeploy.new("No deploys to show") unless deploy
 
       puts "deploy #{deploy[:id]}"
 

data/lib/strobe/cli/main.rb

@@ -203,7 +203,15 @@ module Strobe
                                 :pre_deploy  => config["pre_deploy_hook"],
                                 :post_deploy => config["post_deploy_hook"]
 
-        say "The application has successfully been deployed and is available at #{host}"
+        if host
+          say "The application has successfully been deployed and is available at #{host}"
+        else
+          unless resource.errors.empty?
+            say "[ERROR] Deployment failed with errors:\n    #{resource.errors.full_messages.join("\n    ")}"
+          else
+            say "[ERROR] Deployment failed with an unknown error."
+          end
+        end
       rescue Strobe::DeployInterrupted => e
         say "[ERROR] #{e.message}"
       end
@@ -390,16 +398,14 @@ module Strobe
           m.choice(:login)  { invoke :login  }
           m.choice(:signup) { invoke :signup }
         end
-      end
-    end
 
-    def get_application(opts = {})
-      unless application_dir? && (id = opts.delete(:application_id) || config[:application_id])
-        error "No application found. Are you currently in the correct directory?"
-        exit 1
+        # HAXTREME!
+        # There is a bug related to this where we have two simultaneous
+        # Settings instances. When one persists it overwrites the other
+        # since nothing should have been set in the settings yet, force
+        # a new one that will reload from the file - PW
+        @settings = nil
       end
-
-      Application.get!(id, opts)
     end
 
     def git_repo?
@@ -438,8 +444,14 @@ module Strobe
 
     def git(cmd)
       Dir.chdir path do
-        retval = `git #{cmd}`
-        retval.chomp if $? == 0
+        cmd = "git #{cmd}"
+
+        # Hide stderr output for *nix and Windows
+        null_out = %w(/dev/null NUL).find{|n| File.exist?(n)}
+        cmd += " 2>#{null_out}" if null_out
+
+        retval = `#{cmd}`
+        retval.chomp if $?.success?
       end
     end
   end

data/lib/strobe/cli.rb

@@ -46,6 +46,13 @@ module Strobe
       abort
     rescue Interrupt
       abort  "\nQuitting..."
+    rescue SystemExit => e
+      exit e.status
+    rescue Exception => e
+      warn "Unfortunately, a fatal error has occurred. " +
+        "Please report this error to Strobe Support at " +
+        "http://support.strobeapp.com/home so that we can fix it. Thanks!"
+      raise e
     end
 
     def self.action(name, *args, &blk)
@@ -78,6 +85,10 @@ module Strobe
       method_option :path, :type => :string, :banner => "Path to your application"
     end
 
+    def self.handle_argument_error(task, error) #:nodoc:
+      raise InvocationError, "#{task.name.sub('__hax__','').inspect} was called incorrectly. Call as #{self.banner(task).inspect}."
+    end
+
     def initialize(*)
       super
 
@@ -93,6 +104,15 @@ module Strobe
 
   private
 
+    def get_application(opts = {})
+      unless application_dir? && (id = opts[:application_id] || config[:application_id])
+        error "No application found. Are you currently in the correct directory?"
+        exit 1
+      end
+
+      Application.get!(id, opts)
+    end
+
     def path
       options[:path] || Dir.pwd
     end

data/lib/strobe/connection.rb

@@ -90,7 +90,7 @@ module Strobe
         when 412
           raise OutdatedStrobeVersionError, msg
         when 500...600
-          raise ServerError.new("The server puked :(", :response => to_hash, :request => @request.to_hash)
+          raise ServerError.new("The server encountered an error", :response => to_hash, :request => @request.to_hash)
         end
 
         self
@@ -155,10 +155,8 @@ module Strobe
         http.read_timeout = 900 # For deploys
         http.open_timeout = 10
         if port == 443
-          pem               = File.read(File.expand_path("../cert.pem", __FILE__))
           http.use_ssl      = true
-          http.cert         = OpenSSL::X509::Certificate.new(pem)
-          http.key          = http.cert.public_key
+          http.ca_file      = File.expand_path("../certs/cacert.pem", __FILE__)
           http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
           http.verify_depth = 5
         end

data/lib/strobe/resources/application.rb

@@ -20,6 +20,10 @@ module Strobe
 
       validates "account", "name", :presence => true
 
+      def id
+        self[:id]
+      end
+
       def web_install
         # TODO: eventually it will be better to us name for identifying web platform
         install = self.platform_installs.detect { |p| p.web? }

data/lib/strobe/version.rb

@@ -1,3 +1,3 @@
 module Strobe
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strobe
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156152220 !ruby/object:Gem::Requirement
+  requirement: &2156401120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156152220
+  version_requirements: *2156401120
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2156151340 !ruby/object:Gem::Requirement
+  requirement: &2156400360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156151340
+  version_requirements: *2156400360
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156143460 !ruby/object:Gem::Requirement
+  requirement: &2156399500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156143460
+  version_requirements: *2156399500
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2156141520 !ruby/object:Gem::Requirement
+  requirement: &2156398360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156141520
+  version_requirements: *2156398360
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2156140060 !ruby/object:Gem::Requirement
+  requirement: &2156397400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *2156140060
+  version_requirements: *2156397400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156138260 !ruby/object:Gem::Requirement
+  requirement: &2156389880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156138260
+  version_requirements: *2156389880
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &2156136060 !ruby/object:Gem::Requirement
+  requirement: &2156388480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2156136060
+  version_requirements: *2156388480
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2156132400 !ruby/object:Gem::Requirement
+  requirement: &2156386900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156132400
+  version_requirements: *2156386900
 description: The client library for deploying applications to Strobe's HTML5 deployment
   platform
 email:
@@ -152,7 +152,7 @@ files:
 - lib/strobe.rb
 - CHANGELOG.md
 - README.md
-- lib/strobe/cert.pem
+- lib/strobe/certs/cacert.pem
 - bin/strobe
 homepage: http://rubygems.org/gems/strobe
 licenses: []

data/lib/strobe/cert.pem

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFjzCCBHegAwIBAgIQbApvs79PZIagOHNx2QR8EzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
-MDYxNDAwMDAwMFoXDTEzMDYxMzIzNTk1OVowgbAxCzAJBgNVBAYTAlVTMQ4wDAYD
-VQQREwU5NDEwNzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
-HTAbBgNVBAkUFDMwMCBCcmFubmFuIFN0LiAjMjAxMRQwEgYDVQQKEwtTdHJvYmUs
-IEluYzEdMBsGA1UECxMUUGxhdGludW1TU0wgV2lsZGNhcmQxGDAWBgNVBAMUDyou
-c3Ryb2JlYXBwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9a
-ORP8qYD8r+922BqClraAka5KJdw1nKmkYUIzHptOifYxNibzyO/fpE41q72pBBg8
-HToYMa1WpKLVCRF4bg58cNOtdC8+E/hbeZ2KZCYq6ToChN55RrXyEvYtietXoYgk
-VvNbR8dCCeBSjIBWUpKo/ebZ3Iq5ilQBb5MxikplFJ03ZptPPCBk1ECEYou6VmpG
-d4P+vs/rsnwFEuYF6nZ+D+Xy8H726fd06GGKpXIaA9G0SUP/z+LTV37kCHKRLWhm
-bBvdOZkRN2FczuL2DnsH38Q5lNy5t7BhaQqxzqqlyzMgLnFWljNLVTeE0jZOgF25
-VgZvlG9JS6WteYoxE3sCAwEAAaOCAcgwggHEMB8GA1UdIwQYMBaAFD/VtdDWRHlQ
-Shejm4xK3LiwImRrMB0GA1UdDgQWBBQNN3tJ7xv3qudyfFuq7UAySluRCjAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcC
-ARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwTwYDVR0fBEgwRjBEoEKg
-QIY+aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFuY2VT
-ZWN1cmVTZXJ2ZXJDQS5jcmwwgYAGCCsGAQUFBwEBBHQwcjBKBggrBgEFBQcwAoY+
-aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFuY2VTZWN1
-cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2Nh
-LmNvbTApBgNVHREEIjAggg8qLnN0cm9iZWFwcC5jb22CDXN0cm9iZWFwcC5jb20w
-DQYJKoZIhvcNAQEFBQADggEBABGXoHCF+a0ZNwJM6vwT0oYzdNy48Fi/QDOTuaxF
-/UInV2tDqZf0VpnynSJAMBiLY6Yzf/H7ueWny8wWgw/3JUMoW0M9a4+lqfQQMGOl
-fleR/H84kdQrUrKHJkjrIC3t1+aZIt8QxfKte5AL8O03SKw2dYDc7XHGJZfSdk0V
-CWZFTlbwss+KZyTXGxx4PnVcSPaM6fkvLQB/SwLtRN7KcJDBmXKf04uFWDOvLhl/
-a4CGypRd4OkFDt2lfNFLw7i5XAWYHZdCa/w58rFxM/5RW1idJ4FcoW3VnqoskEM/
-Xci61KFZ9iR4xoFlnnC31ROuu+/2OGsFeZSdz4eBEQZ9icQ=
------END CERTIFICATE-----