shelly 0.2.17 → 0.2.18

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a07cc071938f6bb5c849911f4ce586696defdb0a
+  data.tar.gz: dd4978354e6889f603d27fd9e281904dcc0c2ba9
+SHA512:
+  metadata.gz: 6e0848e3a498550f2ac9d5a6d5785cc7b1d0de377d3a45841b493e72a064a8606cc733db493452cc9ececaea70061c0fc1c768622c8be42a85e7c1127f55a54e
+  data.tar.gz: 59ba72b5979aa81a3a406c51c2987f2eba428f59d416b9bd2cd421ac557474ee18c87af107328c1c914f91c08bfc9f978bd2c70e6ccc0032cf9446830899cfce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.18 / 2013-04-25
+
+* [bug] `shelly add` doesn't prompt the user to provide billing details when adding to existing organization.
+
 ## 0.2.17 / 2013-04-12
 
 * [feature] Added '--cloud code_name' to command given in output after failed `shelly redeploy` and `shelly stop`.

data/lib/shelly/app.rb

@@ -214,6 +214,10 @@ module Shelly
       attributes["organization"]["credit"].to_f
     end
 
+    def organization_details_present?
+      attributes["organization"]["details_present"]
+    end
+
     def self.inside_git_repository?
       system("git status > /dev/null 2>&1")
     end

data/lib/shelly/cli/main.rb

@@ -116,12 +116,16 @@ module Shelly
 
         say "Creating Cloudfile", :green
         app.create_cloudfile
-        if app.credit > 0
+        if app.credit > 0 || !app.organization_details_present?
           say_new_line
           say "Billing information", :green
-          say "Cloud created with #{app.credit.to_i} Euro credit."
-          say "Remember to provide billing details before trial ends."
-          say app.edit_billing_url
+          if app.credit > 0
+            say "#{app.credit.to_i} Euro credit remaining."
+          end
+          if !app.organization_details_present?
+            say "Remember to provide billing details before trial ends."
+            say app.edit_billing_url
+          end
         end
 
         info_adding_cloudfile_to_repository
@@ -201,7 +205,7 @@ module Shelly
         case e[:state]
         when "running"
           say_error "Not starting: cloud '#{app}' is already running"
-        when "deploying", "configuring"
+        when "deploying"
           say_error "Not starting: cloud '#{app}' is currently deploying"
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
@@ -372,7 +376,7 @@ Wait until cloud is in 'turned off' state and try again.}
         deployment_progress(app, deployment_id, "Cloud redeploy")
       rescue Client::ConflictException => e
         case e[:state]
-        when "deploying", "configuring"
+        when "deploying"
           say_error "Your application is being redeployed at the moment"
         when "no_code", "no_billing", "turned_off"
           say_error "Cloud #{app} is not running", :with_exit => false

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -134,7 +134,8 @@ describe Shelly::App do
       @response = {"web_server_ip" => "192.0.2.1",
                    "state" => "running",
                    "organization" => {
-                     "credit" => 23.0
+                     "credit" => 23.0,
+                     "details_present" => true
                    },
                    "git_info" => {
                      "deployed_commit_message" => "Commit message",
@@ -145,11 +146,17 @@ describe Shelly::App do
     end
 
     describe "#credit" do
-      it "should return freecredit that app has" do
+      it "should return free credit that app has" do
         @app.credit.should == 23.0
       end
     end
 
+    describe "#organization_details_present?" do
+      it "should return app's organization's details_present?" do
+        @app.organization_details_present?.should == true
+      end
+    end
+
     it "should fetch app attributes from API and cache them" do
       @client.should_receive(:app).with("foo-staging").exactly(:once).and_return(@response)
       2.times { @app.attributes }

data/spec/shelly/cli/main_spec.rb

@@ -9,6 +9,7 @@ describe Shelly::CLI::Main do
     Shelly::CLI::Main.stub(:new).and_return(@main)
     @client = mock
     @client.stub(:token).and_return("abc")
+    @client.stub(:shellyapp_url).and_return("https://example.com")
     Shelly::Client.stub(:new).and_return(@client)
     Shelly::User.stub(:guess_email).and_return("")
     $stdout.stub(:puts)
@@ -291,7 +292,8 @@ describe Shelly::CLI::Main do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       Shelly::App.stub(:new).and_return(@app)
       @client.stub(:token).and_return("abc")
-      @app.stub(:attributes).and_return({"organization" => {"credit" => 0}})
+      @app.stub(:attributes).and_return(
+        {"organization" => {"credit" => 0, "details_present" => true}})
       @app.stub(:git_remote_exist?).and_return(false)
       @main.stub(:check => true)
       @main.stub(:ask_for_organization)
@@ -418,14 +420,14 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should create the app on shelly cloud and show credit information" do
-      @app.stub(:attributes).and_return("organization" => {"credit" => "40"})
+      @app.stub(:attributes).and_return(
+        "organization" => {"credit" => "40", "details_present" => false})
       @app.stub(:organization).and_return("example")
-      @client.stub(:shellyapp_url).and_return("http://example.com")
       @app.should_receive(:create)
       $stdout.should_receive(:puts).with(green "Billing information")
-      $stdout.should_receive(:puts).with("Cloud created with 40 Euro credit.")
+      $stdout.should_receive(:puts).with("40 Euro credit remaining.")
       $stdout.should_receive(:puts).with("Remember to provide billing details before trial ends.")
-      $stdout.should_receive(:puts).with("http://example.com/organizations/example/edit")
+      $stdout.should_receive(:puts).with("https://example.com/organizations/example/edit")
 
       fake_stdin(["", ""]) do
         invoke(@main, :add)
@@ -754,12 +756,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         lambda { invoke(@main, :start)  }.should raise_error(SystemExit)
       end
 
-      %w{deploying configuring}.each do |state|
-        it "should show information that cloud is #{state}" do
-          raise_conflict("state" => state)
-          $stdout.should_receive(:puts).with(red "Not starting: cloud 'foo-production' is currently deploying")
-          lambda { invoke(@main, :start) }.should raise_error(SystemExit)
-        end
+      it "should show information that cloud is deploying" do
+        raise_conflict("state" => "deploying")
+        $stdout.should_receive(:puts).with(red "Not starting: cloud 'foo-production' is currently deploying")
+        lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
       it "should show information that cloud has no code" do
@@ -793,7 +793,6 @@ We have been notified about it. We will be adding new resources shortly")
         @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")
-        @client.stub(:shellyapp_url).and_return("http://example.com")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
@@ -895,7 +894,6 @@ Wait until cloud is in 'turned off' state and try again.")
 
       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')
@@ -1360,16 +1358,14 @@ Wait until cloud is in 'turned off' state and try again.")
         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
-            exception = Shelly::Client::ConflictException.new("state" => state)
-            @client.should_receive(:redeploy).with("foo-production").and_raise(exception)
-            $stdout.should_receive(:puts).with(red "Your application is being redeployed at the moment")
-            lambda {
-              invoke(@main, :redeploy)
-            }.should raise_error(SystemExit)
-          end
+      context "when application is in deploying state" do
+        it "should display error that deploy is in progress" do
+          exception = Shelly::Client::ConflictException.new("state" => "deploying")
+          @client.should_receive(:redeploy).with("foo-production").and_raise(exception)
+          $stdout.should_receive(:puts).with(red "Your application is being redeployed at the moment")
+          lambda {
+            invoke(@main, :redeploy)
+          }.should raise_error(SystemExit)
         end
       end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.17
-  prerelease: 
+  version: 0.2.18
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,103 +27,118 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  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'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  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'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,65 +153,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -273,26 +276,46 @@ 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: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+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