refactoring

lib/inploy/deploy.rb

@@ -38,13 +38,7 @@ def remote_install(opts)
     end
 
     def remote_setup
-      if branch.eql? "master"
-        checkout = ""
-      else
-        checkout = "&& $(git branch | grep -vq #{branch}) && git checkout -f -b #{branch} origin/#{branch}"
-      end
-      bundle_cmd = " && bundle install ~/.bundle" if file_exists?("Gemfile")
-      remote_run "cd #{path} && #{@sudo}git clone --depth 1 #{repository} #{application} && cd #{application} #{checkout}#{bundle_cmd} && #{@sudo}rake inploy:local:setup environment=#{environment}#{skip_steps_cmd}"
+      remote_run "cd #{path} && #{@sudo}git clone --depth 1 #{repository} #{application} && cd #{application} #{checkout}#{bundle} && #{@sudo}rake inploy:local:setup environment=#{environment}#{skip_steps_cmd}"
     end
 
     def local_setup
@@ -78,6 +72,14 @@ def update_code
 
     private
 
+    def checkout
+      branch.eql?("master") ? "" : "&& $(git branch | grep -vq #{branch}) && git checkout -f -b #{branch} origin/#{branch}"
+    end
+
+    def bundle
+      " && #{bundle_cmd}" if using_bundler?
+    end
+
     def after_update_code
       run "git submodule update --init"
       copy_sample_files

lib/inploy/dsl.rb

@@ -33,6 +33,10 @@ def sudo_if_should
       @sudo ? 'sudo ' : ''
     end
 
+    def using_bundler?
+      file_exists?("Gemfile")
+    end
+
     def run(command, disable_sudo = false)
       log command
 

lib/inploy/helper.rb

@@ -52,9 +52,17 @@ def tasks
       `rake -T`
     end
 
+    def bundle_cmd
+      "bundle install ~/.bundle"
+    end
+
+    def bundle_install
+      run bundle_cmd
+    end
+
     def install_gems
-      if file_exists?("Gemfile")
-        run "bundle install ~/.bundle"
+      if using_bundler?
+        bundle_install
       else
         rake "gems:install RAILS_ENV=#{environment}" unless skip_step?('install_gems')
       end

lib/inploy/templates/rails3.rb

@@ -1,23 +1,8 @@
 module Inploy
   module Templates
     module Rails3
-      def remote_setup
-        if branch.eql? "master"
-          checkout = ""
-        else
-          checkout = "&& $(git branch | grep -vq #{branch}) && git checkout -f -b #{branch} origin/#{branch}"
-        end
-        remote_run "cd #{path} && #{@sudo}git clone --depth 1 #{repository} #{application} && cd #{application} #{checkout} && bundle install ~/.bundle && #{@sudo}rake inploy:local:setup environment=#{environment}"
-      end
-
-      def install_gems
-        run bundle
-      end
-
-      private
-
-      def bundle
-        "bundle install ~/.bundle"
+      def using_bundler?
+        true
       end
     end
   end

spec/rails3_spec.rb

@@ -35,7 +35,7 @@ def expect_setup_with(branch, environment = 'production')
 
     context "on local update" do
       it "should not restart server if bundle fails" do
-        expect_command(subject.send(:bundle)).and_return(false)
+        expect_command("bundle install ~/.bundle").and_return(false)
         dont_accept_command "touch tmp/restart.txt"
         subject.local_update
       end