webbynode 0.2.2 → 0.2.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '0.2.2') do |p|  
+Echoe.new('webbynode', '0.2.3') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"

data/lib/webbynode/commands/init.rb

@@ -64,6 +64,12 @@ module Webbynode::Commands
         git.commit "Initial commit"
       end
       
+      if git.remote_exists?('webbynode')
+        if ask('Webbynode already initialized. Do you want to overwrite the current settings (y/n)?').downcase == 'y'
+          git.delete_remote('webbynode')
+        end
+      end
+      
       io.log "Adding webbynode as git remote...", :action
       git.add_remote "webbynode", webby_ip, app_name
       

data/lib/webbynode/git.rb

@@ -3,6 +3,7 @@ module Webbynode
   class GitNotRepoError < StandardError; end
   class GitRemoteDoesNotExistError < StandardError; end
   class GitRemoteAlreadyExistsError < StandardError; end
+  class GitRemoteCouldNotRemoveError < StandardError; end
 
   class Git
     attr_accessor :config, :remote_ip
@@ -50,6 +51,16 @@ module Webbynode
       end
     end
     
+    def delete_remote(name)
+      exec("git remote rm #{name}") do |output|
+        # raise an exception if cannot remove
+        raise GitRemoteCouldNotRemoveError, output if output =~ /Could not remove config section/
+        
+        # success if output is empty
+        output.nil? or output.empty?
+      end
+    end
+    
     def commit(comments)
       comments.gsub! /"/, '\"'
       exec("git commit -m \"#{comments}\"") do |output|
@@ -85,6 +96,15 @@ module Webbynode
       @remote_ip  ||= ($2 if @config["remote"]["webbynode"]["url"] =~ /^(\w+)@(.+):(.+)$/) if @config
     end
     
+    def remote_exists?(remote)
+      config = parse_config
+      config['remote'].key?(remote)
+    rescue Webbynode::GitNotRepoError
+      return false
+    rescue Webbynode::GitRemoteDoesNotExistError
+      return false
+    end
+    
     def remote_webbynode?
       return true if io.exec('git remote') =~ /webbynode/
       false 

data/spec/webbynode/commands/init_spec.rb

@@ -14,12 +14,40 @@ describe Webbynode::Commands::Init do
   before(:each) do
     FakeWeb.clean_registry
     create_init
+    git_handler.stub!(:remote_exists?).and_return(false)
+  end
+  
+  context "when already initialized" do
+    it "keep the same remotes when answer is no to overwriting" do
+      command = Webbynode::Commands::Init.new("10.0.1.1")
+      command.should_receive(:git).any_number_of_times.and_return(git_handler) 
+      command.should_receive(:ask).with("Webbynode already initialized. Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("n")
+
+      git_handler.should_receive(:present?).and_return(true)
+      git_handler.should_receive(:remote_exists?).with("webbynode").and_return(true)
+      git_handler.should_receive(:delete_remote).with("webbynode").never
+      
+      command.run
+    end
+
+    it "delete webbynode remote when answer is yes to overwriting" do
+      command = Webbynode::Commands::Init.new("10.0.1.1")
+      command.should_receive(:git).any_number_of_times.and_return(git_handler) 
+      command.should_receive(:ask).with("Webbynode already initialized. Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("y")
+
+      git_handler.should_receive(:present?).and_return(true)
+      git_handler.should_receive(:remote_exists?).with("webbynode").and_return(true)
+      git_handler.should_receive(:delete_remote).with("webbynode")
+      
+      command.run
+    end
   end
   
   context "selecting an engine" do
     it "should create the .webbynode/engine file" do
       command = Webbynode::Commands::Init.new("10.0.1.1", "--engine=php")
       command.option(:engine).should == 'php'
+      command.should_receive(:git).any_number_of_times.and_return(git_handler) 
       command.should_receive(:io).any_number_of_times.and_return(io_handler)
 
       io_handler.should_receive(:add_setting).with("engine", "php")

data/spec/webbynode/git_spec.rb

@@ -30,6 +30,42 @@ describe Webbynode::Git do
     Webbynode::Git.new.io.class.should == Webbynode::Io
   end
   
+  describe "#delete_remote" do
+    it "executes remote rm command for the specificed remote" do
+      git = Webbynode::Git.new
+      git.should_receive(:exec).with("git remote rm webbynode")
+      git.delete_remote("webbynode")
+    end
+    
+    it "should raise an error if the specified remote doesn't exist'" do
+      git = Webbynode::Git.new
+      git.should_receive(:exec).with("git remote rm webbynode").and_yield("error: Could not remove config section 'remote.other'")
+      lambda { git.delete_remote("webbynode") }.should raise_error(Webbynode::GitRemoteCouldNotRemoveError, "error: Could not remove config section 'remote.other'")
+    end
+  end
+  
+  describe "#remote_exists?" do
+    it "returns false when git is not present" do
+      git = Webbynode::Git.new
+      git.should_receive(:present?).any_number_of_times.and_return(false)
+      git.remote_exists?("anything").should be_false
+    end
+    
+    it "returns false if no matching remote found" do
+      git = Webbynode::Git.new
+      git.should_receive(:present?).any_number_of_times.and_return(true)
+      git.should_receive(:parse_config).and_return({'remote'=>{"webbynode"=>"something"}})
+      git.remote_exists?("anything").should be_false
+    end
+    
+    it "returns true if a matching remote found" do
+      git = Webbynode::Git.new
+      git.should_receive(:present?).any_number_of_times.and_return(true)
+      git.should_receive(:parse_config).and_return({'remote'=>{"webbynode"=>"something"}})
+      git.remote_exists?("webbynode").should be_true
+    end
+  end
+  
   describe "#present?" do
     it "should be true if folder .git exists" do
       io_handler = mock("io")

data/webbynode.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webbynode}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-03-28}
   s.description = %q{Webbynode Deployment Gem}
   s.email = %q{felipe@webbynode.com}
   s.executables = ["webbynode", "wn"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Felipe Coury
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -03:00
+date: 2010-03-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency