shelly 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3 / 2013-02-12
+
+* [improvement] Handle stopping clouds in different states
+
 ## 0.2.2 / 2013-02-01
 
 * Changes reflecting improved API

data/lib/shelly/app.rb

@@ -207,7 +207,7 @@ module Shelly
     end
 
     def edit_billing_url
-      "#{shelly.shellyapp_url}/organizations/#{organization}/edit"
+      "#{shelly.shellyapp_url}/organizations/#{organization || code_name}/edit"
     end
 
     def open

data/lib/shelly/cli/main.rb

@@ -258,10 +258,24 @@ Wait until cloud is in 'turned off' state and try again.}
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def stop
         app = multiple_clouds(options[:cloud], "stop")
-        ask_to_stop_application
-        app.stop
-        say_new_line
-        say "Cloud '#{app}' stopped"
+        stop_question = "Are you sure you want to shut down '#{app}' cloud (yes/no):"
+        if ask(stop_question) == "yes"
+          app.stop
+          say_new_line
+          say "Cloud '#{app}' stopped"
+        end
+      rescue Client::ConflictException => e
+        case e[:state]
+        when "deploying"
+          say_error "Your cloud is currently being deployed and it can not be stopped."
+        when "no_code"
+          say_error "You need to deploy your cloud first.", :with_exit => false
+          say       "More information can be found at:"
+          say       "#{app.shelly.shellyapp_url}/documentation/deployment"
+          exit 1
+        when "turning_off"
+          say_error "Your cloud is turning off."
+        end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
         say_error "You have no access to '#{app}' cloud defined in Cloudfile"

data/lib/shelly/helpers.rb

@@ -54,12 +54,6 @@ module Shelly
       end
     end
 
-    def ask_to_stop_application
-      stop_question = "Are you sure you want to shut down your application (yes/no):"
-      stop_application = ask(stop_question)
-      exit 1 unless stop_application == "yes"
-    end
-
     def inside_git_repository?
       unless App.inside_git_repository?
         say_error %q{Current directory is not a git repository.

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/shelly/cli/main_spec.rb

@@ -836,7 +836,7 @@ Wait until cloud is in 'turned off' state and try again.")
 
     it "should stop the cloud" do
       @client.stub(:stop_cloud)
-      $stdout.should_receive(:print).with("Are you sure you want to shut down your application (yes/no): ")
+      $stdout.should_receive(:print).with("Are you sure you want to shut down 'foo-production' cloud (yes/no): ")
       $stdout.should_receive(:puts).with("\n")
       $stdout.should_receive(:puts).with("Cloud 'foo-production' stopped")
       fake_stdin(["yes"]) do
@@ -844,6 +844,44 @@ Wait until cloud is in 'turned off' state and try again.")
       end
     end
 
+    it "should show messages about app being deployed" do
+      raise_conflict("state" => "deploying")
+      $stdout.should_receive(:puts).with(red "Your cloud is currently being deployed and it can not be stopped.")
+      lambda do
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
+      end.should raise_error(SystemExit)
+    end
+
+    it "should show messge about app's no_code" do
+      raise_conflict("state" => "no_code")
+      @client.stub(:shellyapp_url).and_return("https://example.com")
+      $stdout.should_receive(:puts).with(red "You need to deploy your cloud first.")
+      $stdout.should_receive(:puts).with('More information can be found at:')
+      $stdout.should_receive(:puts).with('https://example.com/documentation/deployment')
+      lambda do
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
+      end.should raise_error(SystemExit)
+    end
+
+    it "should show messge about app turning off" do
+      raise_conflict("state" => "turning_off")
+      $stdout.should_receive(:puts).with(red "Your cloud is turning off.")
+      lambda do
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
+      end.should raise_error(SystemExit)
+    end
+
+    def raise_conflict(options = {})
+      body = {"state" => "no_code"}.merge(options)
+      exception = Shelly::Client::ConflictException.new(body)
+      @client.stub(:stop_cloud).and_raise(exception)
+    end
   end
 
   describe "#info" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3756892082399267901
+      hash: -2582762142314582273
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3756892082399267901
+      hash: -2582762142314582273
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.25