inploy 1.6.6 → 1.6.7

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "inploy"
-GEM_VERSION = "1.6.6"
+GEM_VERSION = "1.6.7"
 SUMMARY = "Rails deployment made easy"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"

data/lib/inploy/deploy.rb

@@ -38,12 +38,7 @@ module Inploy
     end
 
     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} && #{@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
@@ -77,6 +72,14 @@ module Inploy
 
     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

data/lib/inploy/dsl.rb

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

data/lib/inploy/helper.rb

@@ -52,8 +52,20 @@ module Inploy
       `rake -T`
     end
 
+    def bundle_cmd
+      "bundle install ~/.bundle --without development test"
+    end
+
+    def bundle_install
+      run bundle_cmd
+    end
+
     def install_gems
-      rake "gems:install RAILS_ENV=#{environment}" unless skip_step?('install_gems')
+      if using_bundler?
+        bundle_install
+      else
+        rake "gems:install RAILS_ENV=#{environment}" unless skip_step?('install_gems')
+      end
     end
 
     def update_crontab

data/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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 6
-  version: 1.6.6
+  - 7
+  version: 1.6.7
 platform: ruby
 authors: 
 - Diego Carrion