shelly 0.0.54 → 0.0.55.pre

data/lib/shelly/cli/main.rb

@@ -154,25 +154,26 @@ module Shelly
       rescue Client::ConflictException => e
         case e[:state]
         when "running"
-          say_error "Not starting: cloud '#{@app}' is already running"
+          say_error "Not starting: cloud '#{@app}' is already running", :with_exit => false
         when "deploying", "configuring"
-          say_error "Not starting: cloud '#{@app}' is currently deploying"
+          say_error "Not starting: cloud '#{@app}' is currently deploying", :with_exit => false
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
           say_error "Push source code using:", :with_exit => false
-          say       "  git push production master"
+          say_error "  git push production master", :with_exit => false
         when "deploy_failed", "configuration_failed"
           say_error "Not starting: deployment failed", :with_exit => false
           say_error "Support has been notified", :with_exit => false
-          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure"
+          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure", :with_exit => false
         when "not_enough_resources"
           say_error %{Sorry, There are no resources for your servers.
-We have been notified about it. We will be adding new resources shortly}
-        when "no_billing"
-          say_error "Please fill in billing details to start #{@app}.", :with_exit => false
-          say_error "Visit: #{@app.edit_billing_url}", :with_exit => false
-        when "payment_declined"
-          say_error "Not starting. Invoice for cloud '#{@app}' was declined."
+We have been notified about it. We will be adding new resources shortly}, :with_exit => false
+        end
+        if !e[:can_be_started] and e[:state] == "turned_off"
+          url = "#{@app.shelly.shellyapp_url}/apps/#{@app.code_name}/billing"
+          say_error "Not starting.", :with_exit => false
+          say_error "For more details please visit:", :with_exit => false
+          say_error url
         end
         exit 1
       rescue Client::NotFoundException => e
@@ -285,7 +286,7 @@ We have been notified about it. We will be adding new resources shortly}
         case e[:state]
         when "deploying", "configuring"
           say_error "Your application is being redeployed at the moment"
-        when "no_code", "no_billing", "turned_off"
+        when "no_code", "turned_off"
           say_error "Cloud #{@app} is not running", :with_exit => false
           say "Start your cloud with `shelly start --cloud #{@app}`"
           exit 1

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.54"
+  VERSION = "0.0.55.pre"
 end

data/spec/shelly/cli/main_spec.rb

@@ -613,7 +613,7 @@ OUT
         raise_conflict("state" => "no_code")
         $stdout.should_receive(:puts).with(red "Not starting: no source code provided")
         $stdout.should_receive(:puts).with(red "Push source code using:")
-        $stdout.should_receive(:puts).with("  git push production master")
+        $stdout.should_receive(:puts).with(red "  git push production master")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
@@ -635,23 +635,17 @@ We have been notified about it. We will be adding new resources shortly")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
-      it "should show messages about billing" do
-        raise_conflict("state" => "no_billing")
-        @app.stub(:edit_billing_url).and_return("http://example.com/billing/edit")
-        $stdout.should_receive(:puts).with(red "Please fill in billing details to start foo-production.")
-        $stdout.should_receive(:puts).with(red "Visit: http://example.com/billing/edit")
+      it "should show link to billing" do
         @client.stub(:shellyapp_url).and_return("http://example.com")
-        lambda { invoke(@main, :start) }.should raise_error(SystemExit)
-      end
-
-      it "should show messge about payment declined" do
-        raise_conflict("state" => "payment_declined")
-        $stdout.should_receive(:puts).with(red "Not starting. Invoice for cloud 'foo-production' was declined.")
+        raise_conflict("state" => "turned_off", "can_be_started" => false)
+        $stdout.should_receive(:puts).with(red "Not starting.")
+        $stdout.should_receive(:puts).with(red "For more details please visit:")
+        $stdout.should_receive(:puts).with(red "http://example.com/apps/foo-production/billing")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
       def raise_conflict(options = {})
-        body = {"state" => "no_code"}.merge(options)
+        body = {"state" => "no_code", "can_be_started" => true}.merge(options)
         exception = Shelly::Client::ConflictException.new(body)
         @client.stub(:start_cloud).and_raise(exception)
       end
@@ -1178,7 +1172,7 @@ We have been notified about it. We will be adding new resources shortly")
         end
       end
 
-      %w(no_code no_billing turned_off).each do |state|
+      %w(no_code turned_off).each do |state|
         context "when application is in #{state} state" do
           it "should display error that cloud is not running" do
             exception = Shelly::Client::ConflictException.new("state" => state)

metadata

@@ -1,167 +1,191 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.54
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 961916056
+  prerelease: 7
+  segments: 
+  - 0
+  - 0
+  - 55
+  - pre
+  version: 0.0.55.pre
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70184900694820 !ruby/object:Gem::Requirement
+
+date: 2012-03-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
+  requirement: *id001
+  prerelease: false
   type: :development
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
   prerelease: false
-  version_requirements: *70184900694820
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: &70184900694340 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   prerelease: false
-  version_requirements: *70184900694340
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard
-  requirement: &70184900693880 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   prerelease: false
-  version_requirements: *70184900693880
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard-rspec
-  requirement: &70184900693460 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
   prerelease: false
-  version_requirements: *70184900693460
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70184900693040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70184900693040
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: &70184900692580 !ruby/object:Gem::Requirement
+  name: simplecov
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   prerelease: false
-  version_requirements: *70184900692580
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70184900692100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70184900692100
-- !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70184900691620 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
   prerelease: false
-  version_requirements: *70184900691620
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &70184900691080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70184900691080
-- !ruby/object:Gem::Dependency
-  name: wijet-thor
-  requirement: &70184900690380 !ruby/object:Gem::Requirement
+  name: fakeweb
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 14
+        - 7
         version: 0.14.7
+  requirement: *id008
+  prerelease: false
   type: :runtime
+  name: wijet-thor
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
   prerelease: false
-  version_requirements: *70184900690380
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: rest-client
-  requirement: &70184900689600 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
   prerelease: false
-  version_requirements: *70184900689600
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: json
-  requirement: &70184900689140 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
   prerelease: false
-  version_requirements: *70184900689140
-- !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: &70184900688700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *70184900688700
+  name: progressbar
 description: Tool for managing applications and clouds at shellycloud.com
-email:
+email: 
 - support@shellycloud.com
-executables:
+executables: 
 - shelly
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -213,43 +237,38 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 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/deploys_spec.rb
-- spec/shelly/cli/main_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/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []
+