shelly 0.2.16 → 0.2.17

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.17 / 2013-04-12
+
+* [feature] Added '--cloud code_name' to command given in output after failed `shelly redeploy` and `shelly stop`.
+
 ## 0.2.16 / 2013-04-04
 
 * [bug] `shelly add` now properly sets puma as web server when run under JRuby

data/lib/shelly/cli/main.rb

@@ -619,7 +619,7 @@ Wait until cloud is in 'turned off' state and try again.}
 
         def info_adding_cloudfile_to_repository
           say_new_line
-          say "Project is now configured for use with Shell Cloud:", :green
+          say "Project is now configured for use with Shelly Cloud:", :green
           say "You can review changes using", :green
           say "  git status"
         end

data/lib/shelly/helpers.rb

@@ -161,7 +161,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
       if @deployment["result"] == "success"
         say "#{action_name} successful", :green
       else
-        say "#{action_name} failed. See logs with `shelly deploy show last`", :red
+        say "#{action_name} failed. See logs with `shelly deploy show last --cloud #{app}`", :red
       end
     end
   end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/spec/shelly/cli/main_spec.rb

@@ -496,7 +496,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should display info about adding Cloudfile to repository" do
-      $stdout.should_receive(:puts).with("\e[32mProject is now configured for use with Shell Cloud:\e[0m")
+      $stdout.should_receive(:puts).with("\e[32mProject is now configured for use with Shelly Cloud:\e[0m")
       $stdout.should_receive(:puts).with("\e[32mYou can review changes using\e[0m")
       $stdout.should_receive(:puts).with("  git status")
       fake_stdin(["foooo", "none"]) do
@@ -848,16 +848,6 @@ Wait until cloud is in 'turned off' state and try again.")
       end
     end
 
-    it "should exit if user doesn't have access to clouds in Cloudfile" do
-      @client.stub(:stop_cloud).and_raise(Shelly::Client::NotFoundException.new("resource" => "cloud"))
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda {
-        fake_stdin(["yes"]) do
-          invoke(@main, :stop)
-        end
-      }.should raise_error(SystemExit)
-    end
-
     it "should stop the cloud" do
       $stdout.should_receive(:print).with("Are you sure you want to shut down 'foo-production' cloud (yes/no): ")
       $stdout.should_receive(:puts).with("\n")
@@ -868,43 +858,69 @@ 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
+    context "on failure" do
+      context "when application is in deploy_failed state" do
+        it "should display error and `shelly deploy show last --cloud foo-production` command" do
+          @app.stub(:deployment => {"messages" => ["message1"],
+            "result" => "failure", "state" => "deploy_failed"})
 
-    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)
+          $stdout.should_receive(:puts).with(green "message1")
+          $stdout.should_receive(:puts).
+            with(red "Stopping cloud failed. See logs with `shelly deploy show last --cloud foo-production`")
+          fake_stdin(["yes"]) do
+            invoke(@main, :stop)
+          end
         end
-      end.should raise_error(SystemExit)
-    end
+      end
+
+      it "should exit if user doesn't have access to clouds in Cloudfile" do
+        @client.stub(:stop_cloud).and_raise(Shelly::Client::NotFoundException.new("resource" => "cloud"))
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
+        lambda {
+          fake_stdin(["yes"]) do
+            invoke(@main, :stop)
+          end
+        }.should raise_error(SystemExit)
+      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)
+      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
   end
 
@@ -1333,6 +1349,17 @@ Wait until cloud is in 'turned off' state and try again.")
     end
 
     context "on redeploy failure" do
+      context "when application is in deploy_failed state" do
+        it "should display error and `shelly deploy show last --cloud foo-production` command" do
+          @app.stub(:deployment => {"messages" => ["message1"],
+            "result" => "failure", "state" => "deploy_failed"})
+          $stdout.should_receive(:puts).with(green "message1")
+          $stdout.should_receive(:puts).
+            with(red "Cloud redeploy failed. See logs with `shelly deploy show last --cloud foo-production`")
+          invoke(@main, :redeploy)
+        end
+      end
+
       %w(deploying configuring).each do |state|
         context "when application is in #{state} state" do
           it "should display error that deploy is in progress" do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
+  prerelease: 
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -248,25 +273,26 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.0.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Shelly Cloud command line tool
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2U0NDkwODVjMjg1NGE3MGI1Y2QwYzc2MGVjMzFmYTQzMWYyMzkwYQ==
-  data.tar.gz: !binary |-
-    NDY3ZWEyNWNiMDVkNWViMjIxZDA3NTI0MjA2MjU2ZTU1OGRhOTdmYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzY5ZGRkNDcyMzdhNzk5OTcxNWU4ZmNlNjUxMWFhODQ4NzBlZjU4MWUyZWYw
-    NGI1NmFkYTI4MzU0ZTc1YTQ2Njc0NTBhZmZmYTc5MjkzNjZiZDA5ZWI2NzY3
-    ZmI3NzM1OTJkYWIyMWEzYzYyZjExNGI4MjEzNTQwZjhmOWM3ZDg=
-  data.tar.gz: !binary |-
-    Y2FlNjgyMDRhMWI1Mzk5Njg2MDZmZjA2YmE5M2U2M2VhZWVmYmUxNzdiMjkz
-    MTczNjZiZDUzNTM4OWUyOTI4NTBhNTU0MjBlY2ZiMWNhNzcyMTVhY2FkOTY0
-    NGFiNzZjNmVmMzQ4ZTdlYTI5M2ExZTA2MTk3OTczYTFhNGU4YjA=