shelly 0.0.9 → 0.0.10

data/lib/shelly/app.rb

@@ -10,10 +10,15 @@ module Shelly
       @ruby_version = "MRI-1.9.2"
     end
 
-    def add_git_remote
+    def add_git_remote(force = false)
+      system("git remote rm #{purpose}") if force
       system("git remote add #{purpose} #{git_url}")
     end
 
+    def remote_exists?
+      IO.popen("git remote").read.split("\n").include?(purpose)
+    end
+
     def git_url
       "git@git.shellycloud.com:#{code_name}.git"
     end
@@ -58,5 +63,9 @@ module Shelly
       url = "#{shelly.api_url}/apps/#{code_name}/edit_billing?api_key=#{current_user.token}"
       Launchy.open(url)
     end
+
+    def self.inside_git_repository?
+      system("git status &> /dev/null")
+    end
   end
 end

data/lib/shelly/cli/apps.rb

@@ -8,17 +8,30 @@ module Shelly
 
       desc "add", "Adds new application to Shelly Cloud"
       def add
+        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+
         @app = Shelly::App.new
         @app.purpose = ask_for_purpose
         @app.code_name = ask_for_code_name
         @app.databases = ask_for_databases
         @app.create
-        say "Adding remote #{@app.purpose} #{@app.git_url}", :green
-        @app.add_git_remote
+
+        unless @app.remote_exists?
+          say "Adding remote #{@app.purpose} #{@app.git_url}", :green
+          @app.add_git_remote
+        else
+          say "Remote #{@app.purpose} already exists"
+          if yes?("Would you like to overwrite remote #{@app.purpose} with #{@app.git_url} (Y/N)?:")
+            @app.add_git_remote(true)
+          end
+        end
+
         say "Creating Cloudfile", :green
         @app.create_cloudfile
+
         say "Provide billing details. Opening browser...", :green
         @app.open_billing_page
+
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
       rescue Client::APIError => e

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/shelly/app_spec.rb

@@ -19,10 +19,16 @@ describe Shelly::App do
   end
 
   describe "#add_git_remote" do
+    before { @app.stub(:system) }
     it "should add git remote with proper name and git repository" do
       @app.should_receive(:system).with("git remote add staging git@git.shellycloud.com:foo-staging.git")
       @app.add_git_remote
     end
+
+    it "should remove existing git remote first if invoked with true as first argument" do
+      @app.should_receive(:system).with("git remote rm staging")
+      @app.add_git_remote(true)
+    end
   end
 
   describe "#generate_cloudfile" do
@@ -112,4 +118,22 @@ config
       @app.create
     end
   end
+
+  describe "#remote_exists?" do
+    context "remote with purpose as name exists" do
+      it "should return true" do
+        @app.purpose = "shelly-prod"
+        IO.stub_chain(:popen, :read => "origin\nshelly-prod\ntest")
+        @app.should be_remote_exists
+      end
+    end
+
+    context "remote with purpose as name doesn't exist" do
+      it "should return false" do
+        @app.purpose = "shelly"
+        IO.stub_chain(:popen, :read => "origin\nshelly-prod\ntest")
+        @app.should_not be_remote_exists
+      end
+    end
+  end
 end

data/spec/shelly/cli/apps_spec.rb

@@ -17,9 +17,21 @@ describe Shelly::CLI::Apps do
       @app.stub(:create)
       @app.stub(:generate_cloudfile).and_return("Example Cloudfile")
       @app.stub(:open_billing_page)
+      @app.stub(:remote_exists?).and_return(false)
+      Shelly::App.stub(:inside_git_repository?).and_return(true)
       Shelly::App.stub(:new).and_return(@app)
     end
 
+    it "should exit with message if command run outside git repository" do
+      Shelly::App.stub(:inside_git_repository?).and_return(false)
+      $stdout.should_receive(:puts).with("Must be run inside your project git repository")
+      lambda {
+        fake_stdin(["staging", "", ""]) do
+          @apps.add
+        end
+      }.should raise_error(SystemExit)
+    end
+
     it "should ask user how he will use application" do
       $stdout.should_receive(:print).with("How will you use this system (production - default,staging): ")
       @app.should_receive(:purpose=).with("staging")
@@ -101,10 +113,41 @@ describe Shelly::CLI::Apps do
       }.should raise_error(SystemExit)
     end
 
-    it "should add git remote" do
-      @app.should_receive(:add_git_remote)
-      fake_stdin(["staging", "foooo", ""]) do
-        @apps.add
+    context "git remote doesn't exist" do
+      it "should add git remote" do
+        $stdout.should_receive(:puts).with("\e[32mAdding remote staging git@git.shellycloud.com:foooo.git\e[0m")
+        @app.should_receive(:add_git_remote)
+        fake_stdin(["staging", "foooo", ""]) do
+          @apps.add
+        end
+      end
+    end
+
+    context "git remote exist" do
+      before do
+        @app.stub(:remote_exists?).and_return(true)
+      end
+
+      it "should ask user if he wants to overwrite existing git remote" do
+        $stdout.should_receive(:puts).with("Remote staging already exists")
+        $stdout.should_receive(:print).with("Would you like to overwrite remote staging with git@git.shellycloud.com:foooo.git (Y/N)?: ")
+        fake_stdin(["staging", "foooo", "", "y"]) do
+          @apps.add
+        end
+      end
+
+      it "should overwrite existing git remote on 'yes' from user" do
+        @app.should_receive(:add_git_remote).with(true)
+        fake_stdin(["staging", "foooo", "", "y"]) do
+          @apps.add
+        end
+      end
+
+      it "should not overwrite existing git remote on 'no' from user" do
+        @app.should_not_receive(:add_git_remote).with(true)
+        fake_stdin(["staging", "foooo", "", "n"]) do
+          @apps.add
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency