shelly 0.4.36 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38bef5b682a08b32dc16b8c9f53bfa315c7519b9
-  data.tar.gz: c237d97ce913a8fa7a257a476f47c1b4b370cc2d
+  metadata.gz: a8cae11e143cf0b16eed1f5fb61648b887b0f549
+  data.tar.gz: 8f652dc1ed1c0dc2b7e94294e3cc4dd4c8155eac
 SHA512:
-  metadata.gz: d5ae8c903c04f1eea25044b9bd75061f8992487734fc8718fea4f63835a66e0e12d6e5ffb4ea77500714b2a8cb03ec59f9ca7f9177547e50ab284b0fecf3bd42
-  data.tar.gz: 538eb932812a5f9c9bda35ce94b95966aacd8ee65bed9c5614134f3c3bfe9baba5f5976432fb586b2dab8a117dcc4fdbaae9e347c7a0bbb4af3c71b7f070e8e8
+  metadata.gz: d9d71e7c7ffa22775081bbece8f2322d4fd7c831fb3dae334763b68367a4fe4278328fea24546c8a01f53dddd7c6bea496e02e13870c39ff03ba1bf76f6d16da
+  data.tar.gz: f6b3271721e16360b342e123cdcf01bf6c5f015c8064c7338b744a725e48371caa7130b134847ffaa81937c7b0655b7a62d8ba6158e2b1735294ff536b200ab8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.37 / 2014-09-01
+
+* [bugfix] print user-friendly message if user tries to finish maintenance, but
+  there is no maintenance events for given cloud
+
 ## 0.4.36 / 2014-08-26
 
 * [improvement] show custom processes in deployment logs

data/lib/shelly/cli/maintenance.rb

@@ -46,6 +46,8 @@ module Shelly
         say "Maintenance has been started", :green
       rescue Client::ValidationException => exception
         exception.each_error { |error| say_error error, :with_exit => false }
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
 
       desc 'finish', 'Finish last maintenance'
@@ -55,6 +57,8 @@ module Shelly
         say "Maintenance has been finished", :green
       rescue Client::ValidationException => exception
         exception.each_error { |error| say_error error, :with_exit => false }
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
     end
   end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.36"
+  VERSION = "0.4.37"
 end

data/spec/shelly/cli/maintenance_spec.rb

@@ -109,17 +109,19 @@ describe Shelly::CLI::Maintenance do
       context 'because there is another maintenance in progress' do
         before do
           body = {
-            'message' => 'Validation Failed',
-            'errors' => [['base', 'Maintenance already in progress']]
+            'message' => 'Maintenance is already in progress'
           }
-          exception = Shelly::Client::ValidationException.new(body)
+          exception = Shelly::Client::ConflictException.new(body)
           client.stub(:start_maintenance).and_raise(exception)
         end
 
         it 'should print error message' do
           $stdout.should_receive(:puts).
-            with(red 'Maintenance already in progress')
-          invoke(cli, :start)
+            with(red 'Maintenance is already in progress')
+
+          lambda {
+            invoke(cli, :start)
+          }.should raise_error(SystemExit)
         end
       end
     end
@@ -141,17 +143,19 @@ describe Shelly::CLI::Maintenance do
       context 'because there is no maintenances in progress' do
         before do
           body = {
-            'message' => 'Validation Failed',
-            'errors' => [['base', 'There is no maintenances in progress']]
+            'message' => 'There is no maintenance events in progress'
           }
-          exception = Shelly::Client::ValidationException.new(body)
+          exception = Shelly::Client::ConflictException.new(body)
           client.stub(:finish_maintenance).and_raise(exception)
         end
 
         it 'should print error message' do
           $stdout.should_receive(:puts).
-            with(red 'There is no maintenances in progress')
-          invoke(cli, :finish)
+            with(red 'There is no maintenance events in progress')
+
+          lambda {
+            invoke(cli, :finish)
+          }.should raise_error(SystemExit)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.4.37
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec