shelly 0.1.16 → 0.1.17

data/lib/shelly/app.rb

@@ -9,7 +9,8 @@ module Shelly
     SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :mail_server_ip, :size, :thin
+      :git_url, :domains, :web_server_ip, :mail_server_ip, :size, :thin,
+      :redeem_code
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -41,7 +42,7 @@ module Shelly
     end
 
     def create
-      attributes = {:code_name => code_name}
+      attributes = {:code_name => code_name, :redeem_code => redeem_code}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
       self.domains = response["domains"]
@@ -197,6 +198,14 @@ module Shelly
       attributes["state"]
     end
 
+    def trial?
+      !!attributes["trial"]
+    end
+
+    def credit
+      attributes["credit"]
+    end
+
     def self.inside_git_repository?
       system("git status > /dev/null 2>&1")
     end

data/lib/shelly/cli/main.rb

@@ -79,6 +79,8 @@ module Shelly
         :desc => "List of databases of your choice"
       method_option :size, :type => :string, :aliases => "-s",
         :desc => "Server size [large, small]"
+      method_option "redeem-code", :type => :string, :aliases => "-r",
+        :desc => "Redeem code for free credits"
       desc "add", "Add a new cloud"
       def add
         check_options(options)
@@ -87,6 +89,7 @@ module Shelly
         app.code_name = options["code-name"] || ask_for_code_name
         app.databases = options["databases"] || ask_for_databases
         app.size = options["size"] || "large"
+        app.redeem_code = options["redeem-code"]
         app.create
 
         if overwrite_remote?(app)
@@ -99,10 +102,10 @@ module Shelly
 
         say "Creating Cloudfile", :green
         app.create_cloudfile
-        if app.attributes["trial"]
+        if app.trial?
           say_new_line
           say "Billing information", :green
-          say "Cloud created with 20 Euro credit."
+          say "Cloud created with #{app.credit} 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.1.16"
+  VERSION = "0.1.17"
 end

data/spec/shelly/app_spec.rb

@@ -142,6 +142,8 @@ describe Shelly::App do
       @response = {"web_server_ip" => "192.0.2.1",
                    "mail_server_ip" => "192.0.2.3",
                    "state" => "running",
+                   "trial" => true,
+                   "credit" => 23.0,
                    "git_info" => {
                      "deployed_commit_message" => "Commit message",
                      "deployed_commit_sha" => "52e65ed2d085eaae560cdb81b2b56a7d76",
@@ -150,6 +152,23 @@ 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
+      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 }
@@ -261,8 +280,10 @@ describe Shelly::App do
   describe "#create" do
     it "should create the app on shelly cloud via API client" do
       @app.code_name = "fooo"
+      @app.redeem_code = "foo123"
       attributes = {
-        :code_name => "fooo"
+        :code_name => "fooo",
+        :redeem_code => "foo123"
       }
       @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
         "domains" => %w(fooo.shellyapp.com))
@@ -362,5 +383,5 @@ describe Shelly::App do
       Shelly::Cloudfile.should_receive(:new).and_return(cloudfile)
       @app.create_cloudfile
     end
-  end
+  end  
 end

data/spec/shelly/cli/main_spec.rb

@@ -402,11 +402,11 @@ OUT
     end
 
     it "should create the app on shelly cloud and show trial information" do
-      @app.stub(:attributes).and_return({"trial" => true})
+      @app.stub(:attributes).and_return({"trial" => true, "credit" => 40})
       @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 20 Euro credit.")
+      $stdout.should_receive(:puts).with("Cloud created with 40 Euro credit.")
       $stdout.should_receive(:puts).with("Remember to provide billing details before trial ends.")
       $stdout.should_receive(:puts).with("http://example.com/apps/foo-staging/billing/edit")
 
@@ -470,7 +470,6 @@ OUT
             invoke(@main, :add)
           end
         end
-
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec