shelly 0.2.19 → 0.2.20

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.20 / 2013-05-09
+
+* [improvement] `shelly info`, `shelly list` and `shelly organization list` now use the new state_description attribute returned by Shelly API
+
 ## 0.2.19 / 2013-05-06
 
 * [improvement] warn user that his public SSH key will be uploaded on login and register.

data/lib/shelly/app.rb

@@ -17,6 +17,16 @@ module Shelly
       self.content = content
     end
 
+    def self.from_attributes(attributes)
+      new(attributes["code_name"]).tap do |app|
+        app.attributes = attributes
+      end
+    end
+
+    def attributes=(attributes)
+      @attributes = attributes
+    end
+
     def thin
       size == "small" ? 2 : 4
     end
@@ -210,6 +220,10 @@ module Shelly
       attributes["state"]
     end
 
+    def state_description
+      attributes["state_description"]
+    end
+
     def credit
       attributes["organization"]["credit"].to_f
     end

data/lib/shelly/cli/main.rb

@@ -153,14 +153,7 @@ module Shelly
         apps = user.apps
         unless apps.empty?
           say "You have following clouds available:", :green
-          apps_table = apps.map do |app|
-            state = app["state"]
-            msg = if state == "deploy_failed" || state == "configuration_failed"
-              " (deployment log: `shelly deploys show last -c #{app["code_name"]}`)"
-            end
-            [app["code_name"], "|  #{state.humanize}#{msg}"]
-          end
-          print_table(apps_table, :ident => 2)
+          print_table(apps_table(apps), :ident => 2)
         else
           say "You have no clouds yet", :green
         end
@@ -175,7 +168,7 @@ module Shelly
           " (deployment log: `shelly deploys show last -c #{app}`)"
         end
         say "Cloud #{app}:", msg.present? ? :red : :green
-        print_wrapped "State: #{app.state}#{msg}", :ident => 2
+        print_wrapped "State: #{app.state_description}#{msg}", :ident => 2
         say_new_line
         print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :ident => 2
         print_wrapped "Deployed commit message: #{app.git_info["deployed_commit_message"]}", :ident => 2

data/lib/shelly/cli/organization.rb

@@ -17,14 +17,7 @@ module Shelly
         organizations.each do |organization|
           say organization.name, :green
           if organization.apps.present?
-            apps_table = organization.apps.map do |app|
-              state = app.state
-              msg = if state == "deploy_failed" || state == "configuration_failed"
-                " (deployment log: `shelly deploys show last -c #{app["code_name"]}`)"
-              end
-              [app.to_s, "|  #{state.humanize}#{msg}"]
-            end
-            print_table(apps_table, :ident => 2, :colwidth => 35)
+            print_table(apps_table(organization.apps), :ident => 2, :colwidth => 35)
           else
             print_wrapped "No clouds", :ident => 2
           end

data/lib/shelly/helpers.rb

@@ -164,5 +164,14 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
         say "#{action_name} failed. See logs with `shelly deploy show last --cloud #{app}`", :red
       end
     end
+
+    def apps_table(apps)
+      apps.map do |app|
+        msg = if app.state == "deploy_failed" || app.state == "configuration_failed"
+          " (deployment log: `shelly deploys show last -c #{app.code_name}`)"
+        end
+        [app.code_name, "|  #{app.state_description}#{msg}"]
+      end
+    end
   end
 end

data/lib/shelly/user.rb

@@ -10,7 +10,9 @@ module Shelly
     end
 
     def apps
-      shelly.apps
+      shelly.apps.map do |attributes|
+        Shelly::App.from_attributes(attributes)
+      end
     end
 
     def organizations

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/spec/shelly/cli/main_spec.rb

@@ -207,8 +207,11 @@ describe Shelly::CLI::Main do
       File.open("~/.ssh/id_rsa.pub", "w") { |f| f << "ssh-key AAbbcc" }
       @user.stub(:upload_ssh_key)
       @client.stub(:token).and_return("abc")
-      @client.stub(:apps).and_return([{"code_name" => "abc", "state" => "running"},
-        {"code_name" => "fooo", "state" => "no_code"},])
+      @client.stub(:apps).and_return([
+          {"code_name" => "abc", "state" => "running",
+            "state_description" => "running"},
+          {"code_name" => "fooo", "state" => "no_code",
+            "state_description" => "turned off (no code pushed)"},])
       Shelly::User.stub(:new).and_return(@user)
     end
 
@@ -244,7 +247,7 @@ describe Shelly::CLI::Main do
       it "should display list of applications to which user has access" do
         $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
         $stdout.should_receive(:puts).with(/  abc\s+\|  running/)
-        $stdout.should_receive(:puts).with(/  fooo\s+\|  no code/)
+        $stdout.should_receive(:puts).with(/  fooo\s+\|  turned off \(no code pushed\)/)
         fake_stdin(["megan@example.com", "secret"]) do
           invoke(@main, :login)
         end
@@ -638,9 +641,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     before do
       @client.stub(:token).and_return("abc")
       @client.stub(:apps).and_return([
-        {"code_name" => "abc", "state" => "running"},
-        {"code_name" => "fooo", "state" => "deploy_failed"},
-        {"code_name" => "bar", "state" => "configuration_failed"}
+        {"code_name" => "abc", "state" => "running", "state_description" => "running"},
+        {"code_name" => "fooo", "state" => "deploy_failed", "state_description" => "running (last deployment failed)"},
+        {"code_name" => "bar", "state" => "configuration_failed", "state_description" => "not running (last deployment failed)"}
       ])
     end
 
@@ -651,8 +654,8 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     it "should display user's clouds" do
       $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
       $stdout.should_receive(:puts).with(/abc\s+\|  running/)
-      $stdout.should_receive(:puts).with(/fooo\s+\|  deploy failed \(deployment log: `shelly deploys show last -c fooo`\)/)
-      $stdout.should_receive(:puts).with(/bar\s+\|  configuration failed \(deployment log: `shelly deploys show last -c bar`\)/)
+      $stdout.should_receive(:puts).with(/fooo\s+\|  running \(last deployment failed\) \(deployment log: `shelly deploys show last -c fooo`\)/)
+      $stdout.should_receive(:puts).with(/bar\s+\|  not running \(last deployment failed\) \(deployment log: `shelly deploys show last -c bar`\)/)
       invoke(@main, :list)
     end
 
@@ -679,8 +682,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     before do
       setup_project
       @client.stub(:apps).and_return([
-        {"code_name" => "foo-production", "state" => "running"},
-        {"code_name" => "foo-staging", "state" => "no_code"}])
+          {"code_name" => "foo-production", "state" => "running",
+            "state_description" => "running"},
+          {"code_name" => "foo-staging", "state" => "no_code",
+            "state_description" => "turned off (no code pushed)"}])
       @client.stub(:start_cloud => {"deployment" => {"id" => "DEPLOYMENT_ID"}})
       @deployment =  {"messages" => ["message1"],
         "result" => "success", "state" => "finished"}
@@ -710,12 +715,13 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       end
 
       it "should ask user to specify cloud, list all clouds and exit" do
+        Shelly::App.unstub(:new) # makes Shelly::User#apps work
         Dir.chdir("/projects")
         $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:")
         $stdout.should_receive(:puts).with("  foo-production  |  running")
-        $stdout.should_receive(:puts).with("  foo-staging     |  no code")
+        $stdout.should_receive(:puts).with("  foo-staging     |  turned off (no code pushed)")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
     end
@@ -965,10 +971,10 @@ Wait until cloud is in 'turned off' state and try again.")
 
       context "when deploy failed or configuration failed" do
         it "should display basic information about information and command to last log" do
-          @app.stub(:attributes).and_return(response({"state" => "deploy_failed"}))
+          @app.stub(:attributes).and_return(response({"state" => "deploy_failed", "state_description" => "running (last deployment failed)"}))
           @main.should_receive(:multiple_clouds).and_return(@app)
           $stdout.should_receive(:puts).with(red "Cloud foo-production:")
-          $stdout.should_receive(:puts).with("  State: deploy_failed (deployment log: `shelly deploys show last -c foo-production`)")
+          $stdout.should_receive(:puts).with("  State: running (last deployment failed) (deployment log: `shelly deploys show last -c foo-production`)")
           $stdout.should_receive(:puts).with("  Deployed commit sha: 52e65ed2d085eaae560cdb81b2b56a7d76")
           $stdout.should_receive(:puts).with("  Deployed commit message: Commit message")
           $stdout.should_receive(:puts).with("  Deployed by: megan@example.com")
@@ -982,10 +988,10 @@ Wait until cloud is in 'turned off' state and try again.")
         end
 
         it "should display basic information about information and command to last log" do
-          @app.stub(:attributes).and_return(response({"state" => "configuration_failed"}))
+          @app.stub(:attributes).and_return(response({"state" => "configuration_failed", "state_description" => "running (last deployment failed)"}))
           @main.should_receive(:multiple_clouds).and_return(@app)
           $stdout.should_receive(:puts).with(red "Cloud foo-production:")
-          $stdout.should_receive(:puts).with("  State: configuration_failed (deployment log: `shelly deploys show last -c foo-production`)")
+          $stdout.should_receive(:puts).with("  State: running (last deployment failed) (deployment log: `shelly deploys show last -c foo-production`)")
           $stdout.should_receive(:puts).with("  Deployed commit sha: 52e65ed2d085eaae560cdb81b2b56a7d76")
           $stdout.should_receive(:puts).with("  Deployed commit message: Commit message")
           $stdout.should_receive(:puts).with("  Deployed by: megan@example.com")
@@ -999,7 +1005,7 @@ Wait until cloud is in 'turned off' state and try again.")
         end
 
         it "should not display statistics when statistics are empty" do
-          @app.stub(:attributes).and_return(response({"state" => "turned_off"}))
+          @app.stub(:attributes).and_return(response({"state" => "turned_off", "state_description" => "turned off"}))
           @main.should_receive(:multiple_clouds).and_return(@app)
           @app.stub(:statistics).and_return([])
           $stdout.should_not_receive(:puts).with("Statistics:")
@@ -1021,6 +1027,7 @@ Wait until cloud is in 'turned off' state and try again.")
     def response(options = {})
       { "code_name" => "foo-production",
         "state" => "running",
+        "state_description" => "running",
         "git_info" =>
         {
           "deployed_commit_message" => "Commit message",

data/spec/shelly/user_spec.rb

@@ -177,7 +177,7 @@ describe Shelly::User do
 
   describe "#apps" do
     it "should fetch list of apps via API client" do
-      @client.should_receive(:apps)
+      @client.should_receive(:apps).and_return([])
       @user.apps
     end
   end

metadata

@@ -1,211 +1,208 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  prerelease: 
+  version: 0.2.20
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  name: rspec
 - !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
+  type: :development
   name: rake
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: guard
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: guard-rspec
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: simplecov
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: ruby_gntp
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: fakefs
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: rb-fsevent
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: fakeweb
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: fakefs
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: wijet-thor
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  name: fakeweb
-- !ruby/object:Gem::Dependency
+        version: 0.14.9
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: rest-client
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.9
-  type: :runtime
-  prerelease: false
-  name: wijet-thor
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: rest-client
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: progressbar
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: json
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: launchy
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: progressbar
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  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
@@ -276,46 +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.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Shelly Cloud command line tool
-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
+test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjVhNjA5NmQzZjQyMWZmMWVmNTZmODQ1NDc0N2VmZWQ1MWMwNTNhMQ==
-  data.tar.gz: !binary |-
-    NmJkYTdlZDcyZThkOWE1NDAwMTNjYWUwNzVlZmFjOTNkYjc0NTRmNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWNmYWU5ODY3YmU2OTg3MGUyZGIwZWI0ZmY3M2YxZjRiMWVlYmRhZTU5MTc1
-    ZWM1YTU3YjYyOWJhOTc5NWM3M2M0ZDNhNWE4MjcyZmYwZjhmYTgxYzUyZDEx
-    M2FmN2NiM2VjMmFiOWUzM2E5NTAyODM2YThmYjFhYmNlZDcyYjE=
-  data.tar.gz: !binary |-
-    YmZhOTBjMmY3MDA0NTkwMzJkOTQyYTNlOWY1NmVjOWRkNjM5MzgyNzM0NWQ5
-    NTBjY2YwOTM5ZmQ1YmI0NDQ2ZDY0OWFjNWNkZDYwNDc4YWUyYjc3Mjk5MWRh
-    Yzc3NGYyODgyOGJiOTIwMjE5ZGQ2YjY5YTZhNDdiMWFjNmQ0NTA=