capistrano-windows-server 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/capistrano-windows-server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-windows-server}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edward Anderson"]

data/lib/capistrano/ext/windows_server.rb

@@ -20,8 +20,20 @@ configuration.load do
   end
 
   # We can't run ruby commands directly, because the rake script searches for ruby based on windows paths that aren't valid in this environment
-  def ruby_cmd(gem, cmd=gem)
-    "PATH=\"#{File.dirname ruby_exe_path}:$PATH\" #{ruby_exe_path} -e \"require 'rubygems'; gem '#{gem}', '>= 0'; load Gem.bin_path('#{gem}', '#{cmd}', '>= 0')\""
+  def ruby_cmd(cmd, gem_name=cmd)
+    %Q(PATH="#{File.dirname ruby_exe_path}:$PATH" #{ruby_exe_path} -e "require 'rubygems'; gem '#{gem_name}', '>= 0'; load Gem.bin_path('#{gem_name}', '#{cmd}', '>= 0')")
+  end
+  
+  def run_ruby_cmd(cmd, args='', gem_name=cmd)
+    run "cd #{current_path} && #{ruby_cmd cmd, gem_name} #{args}"
+  end
+
+  def bundle_exec(cmd, args='', gem_name=cmd)
+    if gemfile_present?
+      run_ruby_cmd 'bundle', "exec #{cmd} #{args}", 'bundler'
+    else
+      run_ruby_cmd cmd, args, gem_name
+    end
   end
   
   def rubygems_cmd
@@ -31,6 +43,10 @@ configuration.load do
   def application_server
     app_server rescue :mongrel
   end
+  
+  def gemfile_present?
+    File.exists? "Gemfile"
+  end
 
   namespace :deploy do
     desc "Update the code on the server by doing a git reset --hard <ref> in the current/ directory"
@@ -73,7 +89,7 @@ configuration.load do
     end
 
     # Clear out tasks that are not appropriate on Windows
-    %w(finalize_update symlink cleanup).each do |removed_task|
+    %w(finalize_update create_symlink symlink cleanup).each do |removed_task|
       task removed_task do; end
     end
     namespace :rollback do
@@ -84,7 +100,7 @@ configuration.load do
 
     desc "Run pending migrations"
     task :migrate do
-      run "cd #{current_path} && #{ruby_cmd 'rake'} db:migrate RAILS_ENV=#{rails_env}"
+      bundle_exec 'rake', "db:migrate RAILS_ENV=#{rails_env}"
     end
 
     desc "Start mongrel"
@@ -118,7 +134,7 @@ configuration.load do
         return unless application_server == :mongrel
         mongrel_instances.each do |n|
           run "mkdir -p #{current_path}/{tmp,log}" # These are often not under version control, but their absence keeps mongrel from recognizing the rails app
-          run "cd #{current_path} && #{ruby_cmd 'mongrel', 'mongrel_rails'} service::install -e #{rails_env} -N #{mongrel_instance_prefix}#{n} -p #{base_port + n - mongrel_instances.first}; true"
+          bundle_exec 'mongrel_rails', "service::install -e #{rails_env} -N #{mongrel_instance_prefix}#{n} -p #{base_port + n - mongrel_instances.first}; true", 'mongrel'
           run %Q(sc.exe config "#{mongrel_instance_prefix}#{n}" start= auto type= interact type= own; true)
         end
       end
@@ -126,7 +142,7 @@ configuration.load do
       desc "Remove mongrel services"
       task :remove do
         mongrel_instances.each do |n|
-          run "#{ruby_cmd 'mongrel', 'mongrel_rails'} service::remove -N #{mongrel_instance_prefix}#{n}; true"
+          bundle_exec 'mongrel_rails', "service::remove -N #{mongrel_instance_prefix}#{n}; true", 'mongrel'
         end
       end
 
@@ -137,7 +153,7 @@ configuration.load do
   desc "Run a rake command in COMMAND"
   task :rake do
     raise "Specify the command with COMMAND='some:task with_arguments'" unless ENV['COMMAND']
-    run "cd #{current_path} && #{ruby_cmd 'rake'} #{ENV['COMMAND']} RAILS_ENV=#{rails_env}"
+    bundle_exec 'rake', "#{ENV['COMMAND']} RAILS_ENV=#{rails_env}"
   end
   
   desc "Run a rubygems (gem) command in COMMAND"
@@ -157,13 +173,16 @@ configuration.load do
   namespace :bundle do
     desc "Install gems with bundler"
     task :install do
-      run "cd #{current_path} && #{ruby_cmd 'bundler', 'bundle'} install --without test development --path #{strip_cygdrive deploy_to}/bundle"
+      raise "No Gemfile detected" unless gemfile_present?
+      run_ruby_cmd 'bundle', "install --without test development --path #{strip_cygdrive deploy_to}/bundle", 'bundler'
     end
 
     desc "Execute a COMMAND with bundle exec"
     task :execute do
+      raise "No Gemfile detected" unless gemfile_present?
       raise "Specify the command with COMMAND. eg: COMMAND='rake db:migrate'" unless ENV['COMMAND']
-      run "cd #{current_path} && #{ruby_cmd 'bundler', 'bundle'} exec #{ENV['COMMAND']}"
+      args = ENV['COMMAND'].split
+      bundle_exec args.shift, args.join(' ')
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-windows-server
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Edward Anderson