shelly 0.1.32 → 0.1.33

data/README.md

@@ -1,4 +1,4 @@
-# Shelly Cloud command line tool [![Build Status](https://secure.travis-ci.org/Ragnarson/shelly.png?branch=master)](http://travis-ci.org/Ragnarson/shelly)
+# Shelly Cloud command line tool [![Build Status](https://secure.travis-ci.org/shellycloud/shelly.png?branch=master)](http://travis-ci.org/Ragnarson/shelly)
 
 ## Installation
 

data/lib/shelly/cli/main.rb

@@ -204,6 +204,10 @@ We have been notified about it. We will be adding new resources shortly}
           say_error "Not starting. Invoice for cloud '#{app}' was declined."
         end
         exit 1
+      rescue Client::LockedException => e
+        say_error "Deployment is currently blocked:", :with_exit => false
+        say_error e[:message]
+        exit 1
       end
 
       desc "setup", "Set up git remotes for deployment on Shelly Cloud"
@@ -345,6 +349,10 @@ We have been notified about it. We will be adding new resources shortly}
           exit 1
         else raise
         end
+      rescue Client::LockedException => e
+        say_error "Deployment is currently blocked:", :with_exit => false
+        say_error e[:message]
+        exit 1
       end
 
       desc "open", "Open application page in browser"

data/lib/shelly/client.rb

@@ -22,6 +22,7 @@ module Shelly
     class ConflictException < APIException; end
     class GemVersionException < APIException; end
     class GatewayTimeoutException < APIException; end
+    class LockedException < APIException; end
     class ValidationException < APIException
       def errors
         self[:errors]
@@ -247,6 +248,7 @@ module Shelly
         when 409; ConflictException
         when 412; GemVersionException
         when 422; ValidationException
+        when 423; LockedException
         when 504; GatewayTimeoutException
         else; APIException
         end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.32"
+  VERSION = "0.1.33"
 end

data/spec/shelly/cli/main_spec.rb

@@ -702,6 +702,14 @@ We have been notified about it. We will be adding new resources shortly")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
+      it "should show message about blocked deploy" do
+        exception = Shelly::Client::LockedException.new("message" => "reason of block")
+        @client.should_receive(:start_cloud).with("foo-production").and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Deployment is currently blocked:")
+        $stdout.should_receive(:puts).with(red "reason of block")
+        lambda { invoke(@main, :start) }.should raise_error(SystemExit)
+      end
+
       def raise_conflict(options = {})
         body = {"state" => "no_code"}.merge(options)
         exception = Shelly::Client::ConflictException.new(body)
@@ -1202,6 +1210,18 @@ We have been notified about it. We will be adding new resources shortly")
         end
       end
 
+      context "when deployment is blocked" do
+        it "should display reason of the block" do
+          exception = Shelly::Client::LockedException.new("message" => "reason of block")
+          @client.should_receive(:redeploy).with("foo-production").and_raise(exception)
+          $stdout.should_receive(:puts).with(red "Deployment is currently blocked:")
+          $stdout.should_receive(:puts).with(red "reason of block")
+          lambda {
+            invoke(@main, :redeploy)
+          }.should raise_error(SystemExit)
+        end
+      end
+
       it "should re-raise exception on unknown state" do
         exception = Shelly::Client::ConflictException.new("state" => "doing_something")
         @client.should_receive(:redeploy).with("foo-production").and_raise(exception)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -345,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2175481956434327682
+      hash: 3939130509060040795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2175481956434327682
+      hash: 3939130509060040795
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24