shelly 0.2.12 → 0.2.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODAyNzViYTA0NThiYmE0ZDliNDI4ZjE1YmY4MzRlN2EwZjc1NDkwZA==
+    YzAwOWRmMjEyZDA5OWNlOTg1NTJjYzkxNjY1MTFjODA5MzI0NDA5Yw==
   data.tar.gz: !binary |-
-    OTE1MjY5MTU2MThiNTJhYTk1MWFjOWU4M2FhNTFmM2U2MzMwYjFjZQ==
+    NDg0YjA5MTcxMDdkYTE2NDJiY2Q3NDRlNmM2NzJjODk1ZDM2NTIxMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGY4OTNjZTVkNzEwNmZkZDBkNGQzNzNlYjQzNzIwYTAyMjhhMjZlZTZkMTM2
-    NDYyZjg5MTc1MzQ5NWE0ZjEzZTkwNDJiYzMxNTQ0M2ZmYTBmMDkyZGYxOTM0
-    YmY2NjMwNDlhZDk4MGE5MjYzNDhjZjU5ZDA5ZTgxZTE5MzMwMWU=
+    NjRlYjYzMzUzOGFiMTljNmYxNzNhMWUzMjE5OWZiNmQ0MDFlZjNiMzI1OGIy
+    ZjVkNmQxNWMzMzllZDU1NDcxMmFmMGUyYjA0ZGYwYmY3NGI0ZTJiZjE5NzVj
+    NWU1NzNjZGRkZDc0NjUzYjZiZGE4MjQ2ZWY2ODY3YWE4NzhmODA=
   data.tar.gz: !binary |-
-    N2MyYjE2ZjNjNDRjYWRhY2IxYjg4NDc3ZjYwOWJhMzQxZmZhMjY1NWIwMmYw
-    MTQ4ZjBiY2FjMmIxMTY3ZGQ0ZjBlNzA2ZDFkZWViMmNjMTAzNmExY2E5NWQ3
-    MmEzMTNlNjU5N2YyOGQ1MzY2ZTA1MDQ5MzlhMmQ3MzA0NGRhYzM=
+    NzYwZGVlMWVlNWY5NTk3ODU0YTM0MzJmNGI2ZjljM2RhODU3MDk4NjMyOTJm
+    MTc1N2I0MWQyZTFiYWNlMmUwZDEzYWI0M2M2ODA2YzNlZWY4Y2JlN2YzZjcw
+    MWQzZjc5MTUwYTFkZmQyZTFiMjQxZmY1NjRiY2M5NzdjODYzNTY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.13 / 2013-03-28
+
+* [improvement] More verbose output for redeploy, start and stop
+
 ## 0.2.12 / 2013-03-25
 
 * [bug] shelly check recognizes puma as allowed web server

data/lib/shelly/app.rb

@@ -111,15 +111,20 @@ module Shelly
     end
 
     def start
-      shelly.start_cloud(code_name)
+      shelly.start_cloud(code_name)["deployment"]["id"]
     end
 
     def stop
-      shelly.stop_cloud(code_name)
+      shelly.stop_cloud(code_name)["deployment"]["id"]
     end
 
+    # returns the id of created deployment
     def redeploy
-      shelly.redeploy(code_name)
+      shelly.redeploy(code_name)["deployment"]["id"]
+    end
+
+    def deployment(deployment_id)
+      shelly.deployment(code_name, deployment_id)
     end
 
     def self.guess_code_name

data/lib/shelly/cli/main.rb

@@ -194,10 +194,9 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def start
         app = multiple_clouds(options[:cloud], "start")
-        app.start
+        deployment_id = app.start
         say "Starting cloud #{app}.", :green
-        say "This can take up to 10 minutes."
-        say "Check status with: `shelly list`"
+        deployment_progress(app, deployment_id, "Starting cloud")
       rescue Client::ConflictException => e
         case e[:state]
         when "running"
@@ -267,9 +266,9 @@ Wait until cloud is in 'turned off' state and try again.}
         app = multiple_clouds(options[:cloud], "stop")
         stop_question = "Are you sure you want to shut down '#{app}' cloud (yes/no):"
         if ask(stop_question) == "yes"
-          app.stop
+          deployment_id = app.stop
           say_new_line
-          say "Cloud '#{app}' stopped"
+          deployment_progress(app, deployment_id, "Stopping cloud")
         end
       rescue Client::ConflictException => e
         case e[:state]
@@ -368,8 +367,9 @@ Wait until cloud is in 'turned off' state and try again.}
         :desc => "Specify which cloud to redeploy application for"
       def redeploy
         app = multiple_clouds(options[:cloud], "redeploy")
-        app.redeploy
+        deployment_id = app.redeploy
         say "Redeploying your application for cloud '#{app}'", :green
+        deployment_progress(app, deployment_id, "Cloud redeploy")
       rescue Client::ConflictException => e
         case e[:state]
         when "deploying", "configuring"

data/lib/shelly/client.rb

@@ -202,6 +202,10 @@ module Shelly
       post("/apps/#{cloud}/deploys")
     end
 
+    def deployment(cloud, deployment_id)
+      get("/apps/#{cloud}/deploys/#{deployment_id}")
+    end
+
     def query(options = {})
       "?" + options.map { |k, v|
         URI.escape(k.to_s) + "=" + URI.escape(v.to_s) }.join("&")

data/lib/shelly/helpers.rb

@@ -140,5 +140,29 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
                   end
       say "  #{indicator} #{message}"
     end
+
+    def deployment_progress(app, deployment_id, action_name)
+      printed_messages = []
+      loop do
+        @deployment = app.deployment(deployment_id)
+        new_messages = @deployment["messages"] - printed_messages
+        new_messages.each do |message|
+          color = (message =~ /failed/) ? :red : :green
+          say message, color
+          printed_messages << message
+        end
+
+        break if @deployment["state"] != "running"
+        sleep 5
+      end
+
+      say_new_line
+
+      if @deployment["result"] == "success"
+        say "#{action_name} successful", :green
+      else
+        say "#{action_name} failed. See logs with `shelly deploy show last`", :red
+      end
+    end
   end
 end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/spec/shelly/app_spec.rb

@@ -196,13 +196,15 @@ describe Shelly::App do
 
   describe "#start & #stop" do
     it "should start cloud" do
-      @client.should_receive(:start_cloud).with("foo-staging")
-      @app.start
+      @client.should_receive(:start_cloud).with("foo-staging").
+        and_return("deployment" => {"id" => "DEPLOYMENT_ID"})
+      @app.start.should == "DEPLOYMENT_ID"
     end
 
     it "should stop cloud" do
-      @client.should_receive(:stop_cloud).with("foo-staging")
-      @app.stop
+      @client.should_receive(:stop_cloud).with("foo-staging").
+        and_return("deployment" => {"id" => "DEPLOYMENT_ID"})
+      @app.stop.should == "DEPLOYMENT_ID"
     end
   end
 
@@ -288,8 +290,9 @@ describe Shelly::App do
 
   describe "#redeploy" do
     it "should redeploy app via API" do
-      @client.should_receive(:redeploy).with("foo-staging")
-      @app.redeploy
+      @client.should_receive(:redeploy).with("foo-staging").
+        and_return("deployment" => {"id" => "DEPLOYMENT_ID"})
+      @app.redeploy.should == "DEPLOYMENT_ID"
     end
   end
 

data/spec/shelly/cli/main_spec.rb

@@ -679,6 +679,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       @client.stub(:apps).and_return([
         {"code_name" => "foo-production", "state" => "running"},
         {"code_name" => "foo-staging", "state" => "no_code"}])
+      @client.stub(:start_cloud => {"deployment" => {"id" => "DEPLOYMENT_ID"}})
+      @deployment =  {"messages" => ["message1"],
+        "result" => "success", "state" => "finished"}
+      @app.stub(:deployment => @deployment)
     end
 
     it "should ensure user has logged in" do
@@ -687,10 +691,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
     context "single cloud in Cloudfile" do
       it "should start the cloud" do
-        @client.stub(:start_cloud)
         $stdout.should_receive(:puts).with(green "Starting cloud foo-production.")
-        $stdout.should_receive(:puts).with("This can take up to 10 minutes.")
-        $stdout.should_receive(:puts).with("Check status with: `shelly list`")
+        $stdout.should_receive(:puts).with(green "message1")
+        $stdout.should_receive(:puts).with(green "Starting cloud successful")
         invoke(@main, :start)
       end
     end
@@ -699,7 +702,6 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     context "without Cloudfile" do
       it "should use cloud from params" do
         Dir.chdir("/projects")
-        @client.stub(:start_cloud)
         $stdout.should_receive(:puts).with(green "Starting cloud foo-production.")
         @main.options = {:cloud => "foo-production"}
         invoke(@main, :start)
@@ -707,7 +709,6 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
       it "should ask user to specify cloud, list all clouds and exit" do
         Dir.chdir("/projects")
-        @client.stub(:start_cloud)
         $stdout.should_receive(:puts).with(red "You have to specify cloud.")
         $stdout.should_receive(:puts).with("Select cloud using `shelly start --cloud CLOUD_NAME`")
         $stdout.should_receive(:puts).with(green "You have following clouds available:")
@@ -736,8 +737,11 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
       it "should fetch from command line which cloud to start" do
         @client.should_receive(:start_cloud).with("foo-staging")
+        @client.should_receive(:deployment).
+          with("foo-staging", "DEPLOYMENT_ID").and_return(@deployment)
         $stdout.should_receive(:puts).with(green "Starting cloud foo-staging.")
-        $stdout.should_receive(:puts).with("Check status with: `shelly list`")
+        $stdout.should_receive(:puts).with(green "message1")
+        $stdout.should_receive(:puts).with(green "Starting cloud successful")
         @main.options = {:cloud => "foo-staging"}
         invoke(@main, :start)
       end
@@ -827,6 +831,9 @@ Wait until cloud is in 'turned off' state and try again.")
       @client.stub(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
       @app = Shelly::App.new("foo-production")
       Shelly::App.stub(:new).and_return(@app)
+      @client.stub(:stop_cloud => {"deployment" => {"id" => "DEPLOYMENT_ID"}})
+      @app.stub(:deployment => {"messages" => ["message1"],
+        "result" => "success", "state" => "finished"})
     end
 
     it "should ensure user has logged in" do
@@ -835,7 +842,6 @@ Wait until cloud is in 'turned off' state and try again.")
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.stub(:stop_cloud)
       @main.should_receive(:multiple_clouds).and_return(@app)
       fake_stdin(["yes"]) do
         invoke(@main, :stop)
@@ -853,10 +859,10 @@ Wait until cloud is in 'turned off' state and try again.")
     end
 
     it "should stop the cloud" do
-      @client.stub(:stop_cloud)
       $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")
+      $stdout.should_receive(:puts).with(green "message1")
+      $stdout.should_receive(:puts).with(green "Stopping cloud successful")
       fake_stdin(["yes"]) do
         invoke(@main, :stop)
       end
@@ -1303,11 +1309,13 @@ Wait until cloud is in 'turned off' state and try again.")
   describe "#redeploy" do
     before do
       setup_project
+      @client.stub(:redeploy => {"deployment" => {"id" => "DEPLOYMENT_ID"}})
+      @app.stub(:deployment => {"messages" => ["message1"],
+        "result" => "success", "state" => "finished"})
     end
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.stub(:redeploy)
       @main.should_receive(:multiple_clouds).and_return(@app)
       invoke(@main, :redeploy)
     end
@@ -1318,6 +1326,12 @@ Wait until cloud is in 'turned off' state and try again.")
       invoke(@main, :redeploy)
     end
 
+    it "should print deployment messages" do
+      $stdout.should_receive(:puts).with(green "message1")
+      $stdout.should_receive(:puts).with(green "Cloud redeploy successful")
+      invoke(@main, :redeploy)
+    end
+
     context "on redeploy failure" do
       %w(deploying configuring).each do |state|
         context "when application is in #{state} state" do

metadata

@@ -1,183 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
+  prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: guard
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: guard-rspec
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: simplecov
 - !ruby/object:Gem::Dependency
-  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  name: ruby_gntp
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: rb-fsevent
 - !ruby/object:Gem::Dependency
-  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  name: fakefs
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: fakeweb
 - !ruby/object:Gem::Dependency
-  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
+  type: :runtime
+  prerelease: false
+  name: wijet-thor
 - !ruby/object:Gem::Dependency
-  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  name: rest-client
 - !ruby/object:Gem::Dependency
-  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  name: json
 - !ruby/object:Gem::Dependency
-  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  name: progressbar
 - !ruby/object:Gem::Dependency
-  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  name: launchy
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -265,8 +293,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool
-test_files: []
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/organization_spec.rb
+- spec/shelly/cli/runner_spec.rb
+- spec/shelly/cli/user_spec.rb
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/organization_spec.rb
+- spec/shelly/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb