shelly 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2 / 2013-02-01
+
+* Changes reflecting improved API
+
 ## 0.2.1 / 2013-01-17
 
 * [improvement] Show redeploy authors in `shelly deploys list`

data/lib/shelly/app.rb

@@ -194,12 +194,8 @@ module Shelly
       attributes["state"]
     end
 
-    def trial?
-      !!attributes["trial"]
-    end
-
     def credit
-      attributes["credit"]
+      attributes["organization"]["credit"].to_f
     end
 
     def self.inside_git_repository?
@@ -211,7 +207,7 @@ module Shelly
     end
 
     def edit_billing_url
-      "#{shelly.shellyapp_url}/organizations/#{attributes["organization_name"]}/edit"
+      "#{shelly.shellyapp_url}/organizations/#{organization}/edit"
     end
 
     def open

data/lib/shelly/cli/main.rb

@@ -109,10 +109,10 @@ module Shelly
 
         say "Creating Cloudfile", :green
         app.create_cloudfile
-        if app.trial?
+        if app.credit > 0
           say_new_line
           say "Billing information", :green
-          say "Cloud created with #{app.credit} Euro credit."
+          say "Cloud created with #{app.credit.to_i} Euro credit."
           say "Remember to provide billing details before trial ends."
           say app.edit_billing_url
         end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/shelly/app_spec.rb

@@ -133,8 +133,9 @@ describe Shelly::App do
     before do
       @response = {"web_server_ip" => "192.0.2.1",
                    "state" => "running",
-                   "trial" => true,
-                   "credit" => 23.0,
+                   "organization" => {
+                     "credit" => 23.0
+                   },
                    "git_info" => {
                      "deployed_commit_message" => "Commit message",
                      "deployed_commit_sha" => "52e65ed2d085eaae560cdb81b2b56a7d76",
@@ -143,17 +144,6 @@ describe Shelly::App do
       @client.stub(:app).and_return(@response)
     end
 
-    describe "#trial?" do
-      it "should return true if app is trial" do
-        @app.should be_trial
-      end
-
-      it "should return false if app is not trial" do
-        @client.stub(:app).and_return("trial" => false)
-        @app.should_not be_trial
-      end
-    end
-
     describe "#credit" do
       it "should return freecredit that app has" do
         @app.credit.should == 23.0
@@ -328,7 +318,7 @@ describe Shelly::App do
 
   describe "#edit_billing_url" do
     it "should return link to edit billing page for app" do
-      @app.stub(:attributes).and_return({"organization_name" => "example"})
+      @app.stub(:organization).and_return("example")
       @app.edit_billing_url.should == "http://shellyapp.example.com/organizations/example/edit"
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -291,7 +291,7 @@ 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({"trial" => false})
+      @app.stub(:attributes).and_return({"organization" => {"credit" => 0}})
       @app.stub(:git_remote_exist?).and_return(false)
       @main.stub(:check => true)
       @main.stub(:ask_for_organization)
@@ -409,8 +409,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       end
     end
 
-    it "should create the app on shelly cloud and show trial information" do
-      @app.stub(:attributes).and_return({"trial" => true, "credit" => 40, "organization_name" => "example"})
+    it "should create the app on shelly cloud and show credit information" do
+      @app.stub(:attributes).and_return("organization" => {"credit" => "40"})
+      @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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2251539392438831574
+      hash: -3756892082399267901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,10 +326,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2251539392438831574
+      hash: -3756892082399267901
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool