capistrano-windows-server 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/capistrano-windows-server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-windows-server}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edward Anderson"]
-  s.date = %q{2011-08-22}
+  s.date = %q{2011-09-07}
   s.description = %q{This gem modifies capistrano recipes to allow deploys to windows machines.
 Several nuances such as the lack of symlinks make the deploy a little different, but it's better than doing it by hand.
 See the github page for instruction on how to set up Windows to get it ready for a deploy.}

data/lib/capistrano/ext/windows_server.rb

@@ -12,8 +12,8 @@ configuration.load do
   set :use_sudo, false
 
   # 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(cmd)
-    "PATH=\"#{File.dirname ruby_exe_path}:$PATH\" #{ruby_exe_path} -e \"require 'rubygems'; gem '#{cmd}', '>= 0'; load '#{cmd}'\""
+  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')\""
   end
   
   def rubygems_cmd
@@ -106,7 +106,7 @@ configuration.load do
       task :setup do
         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'} service::install -e #{rails_env} -N #{mongrel_instance_prefix}#{n} -p #{base_port + n - mongrel_instances.first}; true"
+          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"
           run %Q(sc.exe config "#{mongrel_instance_prefix}#{n}" start= auto; true)
         end
       end
@@ -114,7 +114,7 @@ configuration.load do
       desc "Remove mongrel services"
       task :remove do
         mongrel_instances.each do |n|
-          run "#{ruby_cmd 'mongrel'} service::remove -N #{mongrel_instance_prefix}#{n}; true"
+          run "#{ruby_cmd 'mongrel', 'mongrel_rails'} service::remove -N #{mongrel_instance_prefix}#{n}; true"
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-windows-server
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Edward Anderson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -04:00
+date: 2011-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency