shelly 0.0.52 → 0.0.53

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
@@ -33,7 +37,7 @@ module Shelly
     end
 
     def create
-      attributes = {:code_name => code_name, :domains => domains}
+      attributes = {:code_name => code_name}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
       self.domains = response["domains"]
@@ -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

@@ -73,20 +73,22 @@ module Shelly
       method_option :databases, :type => :array, :aliases => "-d",
         :banner => Shelly::App::DATABASE_KINDS.join(', '),
         :desc => "List of databases of your choice"
-      method_option :domains, :type => :array,
-        :banner => "CODE-NAME.shellyapp.com, YOUR-DOMAIN.com",
-        :desc => "List of your domains"
       desc "add", "Add a new cloud"
       def add
         check_options(options)
         @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.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,13 +102,13 @@ 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 }
         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.domains.join(',')}"
+        say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join(',')}"
       end
 
       desc "list", "List available clouds"
@@ -315,7 +317,7 @@ We have been notified about it. We will be adding new resources shortly}
 
         def check_options(options)
           unless options.empty?
-            unless ["code-name", "databases", "domains"].all? do |option|
+            unless ["code-name", "databases"].all? do |option|
               options.include?(option.to_s) && options[option.to_s] != option.to_s
             end && valid_databases?(options["databases"])
             # FIXME: ' to `
@@ -349,8 +351,8 @@ We have been notified about it. We will be adding new resources shortly}
         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
 
@@ -374,15 +376,15 @@ We have been notified about it. We will be adding new resources shortly}
           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/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby_version: 1.9.2 # 1.9.2 or ree
+  ruby_version: 1.9.2 # 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: <%= @email %>
   domains:

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.52"
+  VERSION = "0.0.53"
 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)
@@ -116,7 +143,7 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby_version: 1.9.2 # 1.9.2 or ree
+  ruby_version: 1.9.2 # 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:
@@ -224,48 +251,24 @@ config
   end
 
   describe "#create" do
-    context "without providing domain" do
-      it "should create the app on shelly cloud via API client" do
-        @app.code_name = "fooo"
-        attributes = {
-          :code_name => "fooo",
-          :domains => nil
-        }
-        @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domains" => %w(fooo.shellyapp.com))
-        @app.create
-      end
-
-      it "should assign returned git_url, domains, ruby_version and environment" do
-        @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
-        @app.create
-        @app.git_url.should == "git@git.example.com:fooo.git"
-        @app.domains.should == ["fooo.shellyapp.com"]
-        @app.ruby_version.should == "1.9.2"
-        @app.environment.should == "production"
-      end
-    end
-
-    context "with providing domain" do
-      it "should create the app on shelly cloud via API client" do
-        @app.code_name = "boo"
-        @app.domains = ["boo.shellyapp.com", "boo.example.com"]
-        attributes = {
-          :code_name => "boo",
-          :domains => %w(boo.shellyapp.com boo.example.com)
-        }
-        @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domains" => %w(boo.shellyapp.com boo.example.com))
-        @app.create
-      end
-
-      it "should assign returned git_url and domain" do
-        @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domains" => %w(boo.shellyapp.com boo.example.com))
-        @app.create
-        @app.domains.should == %w(boo.shellyapp.com boo.example.com)
-      end
+    it "should create the app on shelly cloud via API client" do
+      @app.code_name = "fooo"
+      attributes = {
+        :code_name => "fooo"
+      }
+      @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
+        "domains" => %w(fooo.shellyapp.com))
+      @app.create
+    end
+
+    it "should assign returned git_url, domains, ruby_version and environment" do
+      @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
+        "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
+      @app.create
+      @app.git_url.should == "git@git.example.com:fooo.git"
+      @app.domains.should == ["fooo.shellyapp.com"]
+      @app.ruby_version.should == "1.9.2"
+      @app.environment.should == "production"
     end
   end
 

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
@@ -311,7 +312,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"]}
           lambda {
             invoke(@main, :add)
           }.should raise_error(SystemExit)
@@ -321,14 +322,14 @@ OUT
       context "valid params" do
         it "should create app on shelly cloud" do
           @app.should_receive(:create)
-          @main.options = {"code-name" => "foo", "databases" => ["postgresql"], "domains" => ["foo.example.com"]}
+          @main.options = {"code-name" => "foo", "databases" => ["postgresql"]}
           invoke(@main, :add)
         end
       end
     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\e[0m")
       lambda {
         fake_stdin(["", ""]) do
           invoke(@main, :add)
@@ -423,24 +424,39 @@ 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
+    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
-      }.should raise_error(SystemExit)
-    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
 
-    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)
       end
     end
 
@@ -466,8 +482,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.53
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095124642900 !ruby/object:Gem::Requirement
+  requirement: &70355552495420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70095124642900
+  version_requirements: *70355552495420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095124642480 !ruby/object:Gem::Requirement
+  requirement: &70355552495000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124642480
+  version_requirements: *70355552495000
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70095124642020 !ruby/object:Gem::Requirement
+  requirement: &70355552494540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124642020
+  version_requirements: *70355552494540
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70095124641600 !ruby/object:Gem::Requirement
+  requirement: &70355552494120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124641600
+  version_requirements: *70355552494120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70095124641180 !ruby/object:Gem::Requirement
+  requirement: &70355552493700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124641180
+  version_requirements: *70355552493700
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70095124640720 !ruby/object:Gem::Requirement
+  requirement: &70355552509600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124640720
+  version_requirements: *70355552509600
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70095124640300 !ruby/object:Gem::Requirement
+  requirement: &70355552509180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124640300
+  version_requirements: *70355552509180
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70095124639880 !ruby/object:Gem::Requirement
+  requirement: &70355552508760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124639880
+  version_requirements: *70355552508760
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70095124639460 !ruby/object:Gem::Requirement
+  requirement: &70355552508340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095124639460
+  version_requirements: *70355552508340
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70095124638960 !ruby/object:Gem::Requirement
+  requirement: &70355552507840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70095124638960
+  version_requirements: *70355552507840
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70095124638540 !ruby/object:Gem::Requirement
+  requirement: &70355552507420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095124638540
+  version_requirements: *70355552507420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70095124638080 !ruby/object:Gem::Requirement
+  requirement: &70355552506960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095124638080
+  version_requirements: *70355552506960
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70095124637660 !ruby/object:Gem::Requirement
+  requirement: &70355552506540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095124637660
+  version_requirements: *70355552506540
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -223,18 +223,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4124757266592650249
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4124757266592650249
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.17