shelly 0.0.50 → 0.0.51.pre

data/lib/shelly/app.rb

@@ -13,12 +13,16 @@ module Shelly
     end
 
     def add_git_remote
-      system("git remote rm production > /dev/null 2>&1")
-      system("git remote add production #{git_url}")
+      system("git remote rm #{code_name} > /dev/null 2>&1")
+      system("git remote add #{code_name} #{git_url}")
+    end
+
+    def git_remote_exist?
+      IO.popen("git remote").read.include?(code_name)
     end
 
     def remove_git_remote
-      system("git remote rm production > /dev/null 2>&1")
+      system("git remote rm #{code_name} > /dev/null 2>&1")
     end
 
     def generate_cloudfile
@@ -102,7 +106,19 @@ module Shelly
     end
 
     def self.guess_code_name
-      File.basename(Dir.pwd)
+      guessed = nil
+      if Cloudfile.present?
+        clouds = Cloudfile.new.clouds
+        if clouds.grep(/staging/).present?
+          guessed = "production"
+          production_clouds = clouds.grep(/production/)
+          production_clouds.sort.each do  |cloud|
+            cloud =~ /production(\d*)/
+            guessed = "production#{$1.to_i+1}"
+          end
+        end
+      end
+      "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}"
     end
 
     def collaborations

data/lib/shelly/cli/main.rb

@@ -62,7 +62,7 @@ module Shelly
       rescue Client::UnauthorizedException => e
         say_error "Wrong email or password", :with_exit => false
         say_error "You can reset password by using link:", :with_exit => false
-        say_error "#{e[:url]}"
+        say_error e[:url]
       rescue Errno::ENOENT => e
         say_error e, :with_exit => false
         say_error "Use ssh-keygen to generate ssh key pair"
@@ -85,8 +85,14 @@ module Shelly
         @app.domains = options["domains"] || ["#{@app.code_name}.shellyapp.com"]
         @app.create
 
-        say "Adding remote production #{@app.git_url}", :green
-        @app.add_git_remote
+        git_remote = @app.git_remote_exist?
+        if !git_remote or (git_remote and yes?("Git remote #{@app} exists, overwrite (yes/no): "))
+          say "Adding remote #{@app} #{@app.git_url}", :green
+          @app.add_git_remote
+        else
+          say "You have to manually add git remote:"
+          say "`git remote add NAME #{@app.git_url}`"
+        end
 
         say "Creating Cloudfile", :green
         @app.create_cloudfile
@@ -100,7 +106,7 @@ module Shelly
         end
 
         info_adding_cloudfile_to_repository
-        info_deploying_to_shellycloud
+        info_deploying_to_shellycloud(@app)
 
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
@@ -147,8 +153,8 @@ module Shelly
       def start
         multiple_clouds(options[:cloud], "start")
         @app.start
-        say "Starting cloud #{@app}. Check status with:", :green
-        say "  shelly list"
+        say "Starting cloud #{@app}.", :green
+        say "Check status with: `shelly list`"
       rescue Client::ConflictException => e
         case e[:state]
         when "running"
@@ -164,11 +170,14 @@ module Shelly
           say_error "Support has been notified", :with_exit => false
           say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure"
         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"
+          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"
           url = "#{@app.shelly.shellyapp_url}/apps/#{@app.code_name}/edit_billing"
           say_error "Please fill in billing details to start foo-production.", :with_exit => false
           say_error "Visit: #{url}", :with_exit => false
+        when "payment_declined"
+          say_error "Not starting. Invoice for cloud '#{@app}' was declined."
         end
         exit 1
       rescue Client::NotFoundException => e
@@ -239,7 +248,10 @@ module Shelly
 
       desc "execute CODE", "Run code on one of application servers"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
-      long_desc "Run code given in parameter on one of application servers. If a file name is given, run contents of that file."
+      long_desc %{
+        Run code given in parameter on one of application servers.
+        If a file name is given, run contents of that file."
+      }
       def execute(file_name_or_code)
         cloud = options[:cloud]
         multiple_clouds(cloud, "execute")
@@ -344,8 +356,8 @@ module Shelly
         end
 
         def ask_for_code_name
-          default_code_name = "#{Shelly::App.guess_code_name}-production"
-          code_name = ask("Cloud code name (#{default_code_name} - default):")
+          default_code_name = Shelly::App.guess_code_name
+          code_name = ask("Cloud code name (#{Shelly::App.guess_code_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 
@@ -369,15 +381,15 @@ module Shelly
           say "  git status"
         end
 
-        def info_deploying_to_shellycloud
+        def info_deploying_to_shellycloud(remote)
           say_new_line
           say "When you make sure all settings are correct please issue following commands:", :green
           say "  git add ."
           say '  git commit -m "Application added to Shelly Cloud"'
           say "  git push"
           say_new_line
-          say "Deploy to production using:", :green
-          say "  git push production master"
+          say "Deploy to your cloud using:", :green
+          say "  git push #{remote} master"
           say_new_line
         end
       end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.50"
+  VERSION = "0.0.51.pre"
 end

data/spec/shelly/app_spec.rb

@@ -12,8 +12,27 @@ describe Shelly::App do
   end
 
   describe ".guess_code_name" do
-    it "should return name of current working directory" do
-      Shelly::App.guess_code_name.should == "foo"
+    context "no Cloudfile" do
+      it "should return name of current working directory" do
+        Shelly::App.guess_code_name.should == "foo-staging"
+      end
+    end
+
+    context "with Cloudfile" do
+      it "should return production" do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+        Shelly::App.guess_code_name.should == "foo-production"
+      end
+
+      it "should return production" do
+        File.open("Cloudfile", 'w') {|f| f.write("winnie-test:\n") }
+        Shelly::App.guess_code_name.should == "foo-staging"
+      end
+
+      it "should return productionNUMBER" do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+        Shelly::App.guess_code_name.should == "foo-production1"
+      end
     end
   end
 
@@ -31,16 +50,24 @@ describe Shelly::App do
     end
 
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git remote rm production > /dev/null 2>&1")
+      @app.should_receive(:system).with("git remote rm foo-staging > /dev/null 2>&1")
       @app.add_git_remote
     end
 
     it "should add git remote with proper name and git repository" do
-      @app.should_receive(:system).with("git remote add production git@git.shellycloud.com:foo-staging.git")
+      @app.should_receive(:system).with("git remote add foo-staging git@git.shellycloud.com:foo-staging.git")
       @app.add_git_remote
     end
   end
 
+  describe "git_remote_exist" do
+    it "should return true if git remote exist" do
+      io = mock(:read => "origin\nfoo-staging")
+      IO.should_receive(:popen).with("git remote").and_return(io)
+      @app.git_remote_exist?.should be_true
+    end
+  end
+
   describe "#configs" do
     it "should get configs from client" do
       @client.should_receive(:app_configs).with("foo-staging").and_return(config_response)

data/spec/shelly/cli/main_spec.rb

@@ -274,6 +274,7 @@ OUT
       Shelly::App.stub(:new).and_return(@app)
       @client.stub(:token).and_return("abc")
       @app.stub(:attributes).and_return({"trial" => false})
+      @app.stub(:git_remote_exist?).and_return(false)
     end
 
     # This spec tests inside_git_repository? hook
@@ -328,7 +329,7 @@ OUT
     end
 
     it "should use code name provided by user" do
-      $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
+      $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
       @app.should_receive(:code_name=).with("mycodename")
       fake_stdin(["mycodename", ""]) do
         invoke(@main, :add)
@@ -337,8 +338,8 @@ OUT
 
     context "when user provided empty code name" do
       it "should use 'current_dirname-purpose' as default" do
-        $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
-        @app.should_receive(:code_name=).with("foo-production")
+        $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
+        @app.should_receive(:code_name=).with("foo-staging")
         fake_stdin(["", ""]) do
           invoke(@main, :add)
         end
@@ -393,7 +394,7 @@ OUT
       $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.")
-      $stdout.should_receive(:puts).with("http://example.com/apps/foo-production/billing/edit")
+      $stdout.should_receive(:puts).with("http://example.com/apps/foo-staging/billing/edit")
 
       fake_stdin(["", ""]) do
         invoke(@main, :add)
@@ -415,7 +416,7 @@ OUT
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with("\e[31mCode name has been already taken\e[0m")
       $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your cloud\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-production --databases=postgresql --domains=foo-production.shellyapp.com\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql --domains=foo-staging.shellyapp.com\e[0m")
       lambda {
         fake_stdin(["", ""]) do
           invoke(@main, :add)
@@ -436,11 +437,39 @@ OUT
       }.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)
-      fake_stdin(["foooo", ""]) do
-        invoke(@main, :add)
+    context "git remote" do
+      it "should add one if it doesn't exist" do
+        $stdout.should_receive(:puts).with("\e[32mAdding remote foooo git@git.shellycloud.com:foooo.git\e[0m")
+        @app.should_receive(:add_git_remote)
+        fake_stdin(["foooo", ""]) do
+          invoke(@main, :add)
+        end
+      end
+
+      context "does exist" do
+        before do
+          @app.stub(:git_remote_exist?).and_return(true)
+        end
+
+        it "should ask if one exist and overwrite" do
+          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
+          $stdout.should_receive(:puts).with(green "Adding remote foooo git@git.shellycloud.com:foooo.git")
+          @app.should_receive(:add_git_remote)
+          fake_stdin(["foooo", "", "yes"]) do
+            invoke(@main, :add)
+          end
+        end
+
+        it "should ask if one exist and not overwrite" do
+          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
+          $stdout.should_receive(:puts).with("You have to manually add git remote:")
+          $stdout.should_receive(:puts).with("`git remote add NAME git@git.shellycloud.com:foooo.git`")
+          @app.should_not_receive(:add_git_remote)
+          fake_stdin(["foooo", "", "no"]) do
+            invoke(@main, :add)
+          end
+        end
+
       end
     end
 
@@ -466,8 +495,8 @@ OUT
       $stdout.should_receive(:puts).with("  git add .")
       $stdout.should_receive(:puts).with('  git commit -m "Application added to Shelly Cloud"')
       $stdout.should_receive(:puts).with("  git push")
-      $stdout.should_receive(:puts).with("\e[32mDeploy to production using:\e[0m")
-      $stdout.should_receive(:puts).with("  git push production master")
+      $stdout.should_receive(:puts).with("\e[32mDeploy to your cloud using:\e[0m")
+      $stdout.should_receive(:puts).with("  git push foooo master")
       fake_stdin(["foooo", "none"]) do
         invoke(@main, :add)
       end
@@ -549,8 +578,8 @@ OUT
     context "single cloud in Cloudfile" do
       it "should start the cloud" do
         @client.stub(:start_cloud)
-        $stdout.should_receive(:puts).with(green "Starting cloud foo-production. Check status with:")
-        $stdout.should_receive(:puts).with("  shelly list")
+        $stdout.should_receive(:puts).with(green "Starting cloud foo-production.")
+        $stdout.should_receive(:puts).with("Check status with: `shelly list`")
         invoke(@main, :start)
       end
     end
@@ -571,8 +600,8 @@ OUT
 
       it "should fetch from command line which cloud to start" do
         @client.should_receive(:start_cloud).with("foo-staging")
-        $stdout.should_receive(:puts).with(green "Starting cloud foo-staging. Check status with:")
-        $stdout.should_receive(:puts).with("  shelly list")
+        $stdout.should_receive(:puts).with(green "Starting cloud foo-staging.")
+        $stdout.should_receive(:puts).with("Check status with: `shelly list`")
         @main.options = {:cloud => "foo-staging"}
         invoke(@main, :start)
       end
@@ -614,7 +643,8 @@ OUT
 
       it "should show that winnie is out of resources" do
         raise_conflict("state" => "not_enough_resources")
-        $stdout.should_receive(:puts).with(red "Sorry, There are no resources for your servers. We have been notified about it. We will be adding new resources shortly")
+        $stdout.should_receive(:puts).with(red "Sorry, There are no resources for your servers.
+We have been notified about it. We will be adding new resources shortly")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
@@ -625,6 +655,12 @@ OUT
         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.")
+        lambda { invoke(@main, :start) }.should raise_error(SystemExit)
+      end
+
       def raise_conflict(options = {})
         body = {"state" => "no_code"}.merge(options)
         exception = Shelly::Client::ConflictException.new(body)

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.50
-  prerelease: 
+  version: 0.0.51.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70296043444020 !ruby/object:Gem::Requirement
+  requirement: &70327754642840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70296043444020
+  version_requirements: *70327754642840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70296043443600 !ruby/object:Gem::Requirement
+  requirement: &70327754642400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043443600
+  version_requirements: *70327754642400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70296043443140 !ruby/object:Gem::Requirement
+  requirement: &70327754641780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043443140
+  version_requirements: *70327754641780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70296043442720 !ruby/object:Gem::Requirement
+  requirement: &70327754641280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043442720
+  version_requirements: *70327754641280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70296043442300 !ruby/object:Gem::Requirement
+  requirement: &70327754640620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043442300
+  version_requirements: *70327754640620
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70296043441840 !ruby/object:Gem::Requirement
+  requirement: &70327754639900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043441840
+  version_requirements: *70327754639900
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70296043441420 !ruby/object:Gem::Requirement
+  requirement: &70327754639480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043441420
+  version_requirements: *70327754639480
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70296043441000 !ruby/object:Gem::Requirement
+  requirement: &70327754639020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043441000
+  version_requirements: *70327754639020
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70296043440580 !ruby/object:Gem::Requirement
+  requirement: &70327754638500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296043440580
+  version_requirements: *70327754638500
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70296043440080 !ruby/object:Gem::Requirement
+  requirement: &70327754637860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70296043440080
+  version_requirements: *70327754637860
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70296043439660 !ruby/object:Gem::Requirement
+  requirement: &70327754636900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296043439660
+  version_requirements: *70327754636900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70296043439200 !ruby/object:Gem::Requirement
+  requirement: &70327754636400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296043439200
+  version_requirements: *70327754636400
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70296043438780 !ruby/object:Gem::Requirement
+  requirement: &70327754635980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296043438780
+  version_requirements: *70327754635980
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -226,12 +226,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool