shelly 0.0.48.pre2 → 0.0.48.pre3

data/lib/shelly/app.rb

@@ -1,5 +1,4 @@
 require 'erb'
-require 'launchy'
 require "shelly/backup"
 
 module Shelly
@@ -168,11 +167,6 @@ module Shelly
       attributes["mail_server_ip"]
     end
 
-    def open_billing_page
-      url = "#{shelly.shellyapp_url}/login?api_key=#{current_user.token}&return_to=/apps/#{code_name}/edit_billing"
-      Launchy.open(url)
-    end
-
     def self.inside_git_repository?
       system("git status > /dev/null 2>&1")
     end

data/lib/shelly/cli/main.rb

@@ -82,7 +82,7 @@ module Shelly
         @app = Shelly::App.new
         @app.code_name = options["code-name"] || ask_for_code_name
         @app.databases = options["databases"] || ask_for_databases
-        @app.domains = options["domains"]
+        @app.domains = options["domains"] || ["#{@app.code_name}.shellyapp.com"]
         @app.create
 
         say "Adding remote production #{@app.git_url}", :green
@@ -90,9 +90,14 @@ module Shelly
 
         say "Creating Cloudfile", :green
         @app.create_cloudfile
-
-        say "Provide billing details. Opening browser...", :green
-        @app.open_billing_page
+        if @app.attributes["trial"]
+          say_new_line
+          say "Billing information", :green
+          say "Cloud created with 20 Euro credit."
+          say "Remember to provide billing details before trial ends."
+          url = "#{@app.shelly.shellyapp_url}/apps/#{@app.code_name}/edit_billing"
+          say url
+        end
 
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
@@ -101,7 +106,7 @@ module Shelly
         e.each_error { |error| say_error error, :with_exit => false }
         say_new_line
         say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
-        say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join} --domains=#{@app.code_name}.shellyapp.com"
+        say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join(',')} --domains=#{@app.domains.join(',')}"
       end
 
       desc "list", "List available clouds"

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.48.pre2"
+  VERSION = "0.0.48.pre3"
 end

data/shelly.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "wijet-launchy"
   s.add_runtime_dependency "progressbar"
 
   s.files         = `git ls-files`.split("\n")

data/spec/shelly/app_spec.rb

@@ -165,16 +165,6 @@ config
     end
   end
 
-  describe "#open_billing_page" do
-    it "should open browser window" do
-      user = mock(:token => "abc", :email => nil, :password => nil, :config_dir => "~/.shelly")
-      @app.stub(:current_user).and_return(user)
-      url = "#{@app.shelly.shellyapp_url}/login?api_key=abc&return_to=/apps/foo-staging/edit_billing"
-      Launchy.should_receive(:open).with(url)
-      @app.open_billing_page
-    end
-  end
-
   describe "#start & #stop" do
     it "should start cloud" do
       @client.should_receive(:start_cloud).with("foo-staging")
@@ -280,7 +270,7 @@ config
       end
     end
   end
-  
+
   describe "#redeploy" do
     it "should redeploy app via API" do
       @client.should_receive(:redeploy).with("foo-staging")

data/spec/shelly/cli/main_spec.rb

@@ -269,11 +269,11 @@ OUT
       @app.stub(:add_git_remote)
       @app.stub(:create)
       @app.stub(:generate_cloudfile).and_return("Example Cloudfile")
-      @app.stub(:open_billing_page)
       @app.stub(:git_url).and_return("git@git.shellycloud.com:foooo.git")
       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})
     end
 
     # This spec tests inside_git_repository? hook
@@ -311,7 +311,7 @@ OUT
 
         it "should exit if databases are not valid" do
           $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
-          @main.options = {"code-name" => "foo", :databases => ["not existing"], :domains => "foo.example.com"}
+          @main.options = {"code-name" => "foo", "databases" => ["not existing"], "domains" => ["foo.example.com"]}
           lambda {
             invoke(@main, :add)
           }.should raise_error(SystemExit)
@@ -386,6 +386,28 @@ OUT
       end
     end
 
+    it "should create the app on shelly cloud and show trial information" do
+      @app.stub(:attributes).and_return({"trial" => true})
+      @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("Remember to provide billing details before trial ends.")
+
+      fake_stdin(["", ""]) do
+        invoke(@main, :add)
+      end
+    end
+
+    it "should create the app on shelly cloud and shouldn't show trial information" do
+      @app.should_receive(:create)
+      $stdout.should_not_receive(:puts).with(green "Billing information")
+
+      fake_stdin(["", ""]) do
+        invoke(@main, :add)
+      end
+    end
+
     it "should display validation errors if they are any" do
       body = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
       exception = Shelly::Client::ValidationException.new(body)
@@ -400,6 +422,19 @@ OUT
       }.should raise_error(SystemExit)
     end
 
+    it "should display correct domains in error message" do
+      body = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
+      exception = Shelly::Client::ValidationException.new(body)
+      @app.should_receive(:create).and_raise(exception)
+      @main.options = {"code-name" => "foo-staging", "databases" => ["postgresql"], "domains" => ["test.example.com","test2.example.com"]}
+      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql --domains=test.example.com,test2.example.com\e[0m")
+      lambda {
+        fake_stdin(["", ""]) do
+          invoke(@main, :add)
+        end
+      }.should raise_error(SystemExit)
+    end
+
     it "should add git remote" do
       $stdout.should_receive(:puts).with("\e[32mAdding remote production git@git.shellycloud.com:foooo.git\e[0m")
       @app.should_receive(:add_git_remote)
@@ -416,14 +451,6 @@ OUT
       File.read("/projects/foo/Cloudfile").should == "Example Cloudfile"
     end
 
-    it "should browser window with link to edit billing information" do
-      $stdout.should_receive(:puts).with("\e[32mProvide billing details. Opening browser...\e[0m")
-      @app.should_receive(:open_billing_page)
-      fake_stdin(["foooo", ""]) do
-        invoke(@main, :add)
-      end
-    end
-
     it "should display info about adding Cloudfile to repository" do
       $stdout.should_receive(:puts).with("\e[32mProject is now configured for use with Shell Cloud:\e[0m")
       $stdout.should_receive(:puts).with("\e[32mYou can review changes using\e[0m")

metadata

@@ -1,178 +1,190 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.48.pre2
+version: !ruby/object:Gem::Version 
+  hash: 1923832111
   prerelease: 7
+  segments: 
+  - 0
+  - 0
+  - 48
+  - pre
+  - 3
+  version: 0.0.48.pre3
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70309508220820 !ruby/object:Gem::Requirement
+
+date: 2012-02-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "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: *70309508220820
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: &70309508219840 !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: *70309508219840
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard
-  requirement: &70309508218960 !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: *70309508218960
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard-rspec
-  requirement: &70309508218100 !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: *70309508218100
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70309508217260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70309508217260
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: &70309508216240 !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: *70309508216240
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70309508214920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70309508214920
-- !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70309508213740 !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: *70309508213740
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &70309508212980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70309508212980
-- !ruby/object:Gem::Dependency
-  name: wijet-thor
-  requirement: &70309508211840 !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: *70309508211840
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: rest-client
-  requirement: &70309508193840 !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: *70309508193840
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: json
-  requirement: &70309508192980 !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: *70309508192980
-- !ruby/object:Gem::Dependency
-  name: wijet-launchy
-  requirement: &70309508192020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *70309508192020
-- !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70309508190980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70309508190980
 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
@@ -224,43 +236,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
+  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: []
+