capistrano-windows-server 0.4.1 → 0.4.2

data/README.md

@@ -17,10 +17,9 @@ but some things you might expect from a normal capistrano deploy are not possibl
 Windows filesystems do not support symlinks, and files cannot be moved or deleted while they are in use (the server is running).
 
 * Your app will deploy directly to #{deploy_to}/current and update in-place.
-  When you deploy, capistrano is essentially doing a git pull.
+  When you deploy, capistrano is essentially doing a git reset --hard <deploy commit>.
 * There is no releases/ directory, and only one copy of your app will be on the server at any time.
   This means that you cannot roll back.
-* Git submodules are not yet supported by WindowsGit. Instructions for dealing with that are below.
 
 ### Server stack
 
@@ -168,18 +167,6 @@ Once it's ready, you can deploy your app for the first time:
 
     cap deploy:cold
 
-### Submodules
-
-Unfortunately, WindowsGit [does not currently support submodules](https://github.com/SciMed/capistrano-windows-server/issues/1).
-
-If your project uses submodules, there are a few ways you can deal with this.
-
-* Do it by hand - manually clone each submodule after your initial deploy
-* Install another git distribution (msysgit, PortableGit), and run git submodule init/update in your project directory
-* Pull the missing files out of another git distribution (msysgit, PortableGit) and copy them to C:\Program Files\ICW\bin .
-  If you go this route, please document the process on [this issue](https://github.com/SciMed/capistrano-windows-server/issues/1),
-  so we can update this documentation.
-
 
 Which cap tasks are available?
 ------------------------------
@@ -204,6 +191,8 @@ The following new tasks were added:
 * `cap deploy:mongrel:setup` - Create mongrel services
 * `cap deploy:mongrel:remove` - Remove mongrel services
 * `cap rake` - Run a rake task, specified by COMMAND. eg: cap rake COMMAND="gems:install"
+* `cap rubygems` - Run a gem command, specified by COMMAND. eg: cap rubygems COMMAND="install rails"
+* `cap git` - Run a git command, specified by COMMAND. eg: cap rake COMMAND="status"
 
 The following tasks will later be fixed:
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/capistrano-windows-server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-windows-server}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edward Anderson"]
-  s.date = %q{2011-08-19}
+  s.date = %q{2011-08-22}
   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

@@ -6,24 +6,22 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
 configuration.load do
   set :scm, :git
   set :deploy_via, :remote_cache
-  #set :git_enable_submodules, false # Git submodules not supported on windows
   set :shared_dir, "."
   set :repository_cache, "current"
   set :scm_verbose, true
   set :use_sudo, false
 
-  # We can't run rake directly, because the rake script searches for ruby based on windows paths that aren't valid in this environment
-  def rake_cmd
-    "#{ruby_exe_path} -e \"require 'rubygems'; gem 'rake', '>= 0'; load 'rake'\""
+  # 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}'\""
   end
   
-  # We can't run mongrel directly, because the mongrel script searches for ruby based on windows paths that aren't valid in this environment
-  def mongrel_cmd
-    "#{ruby_exe_path} -e \"require 'rubygems'; gem 'mongrel', '>= 0'; load 'mongrel_rails'\""
+  def rubygems_cmd
+    "PATH=\"#{File.dirname ruby_exe_path}:$PATH\" #{ruby_exe_path} -e \"require 'rubygems';require 'rubygems/gem_runner';require 'rubygems/exceptions';Gem::GemRunner.new.run ARGV.clone\""
   end
 
   namespace :deploy do
-    desc "Update the code on the server by doing a git pull in the current/ directory"
+    desc "Update the code on the server by doing a git reset --hard <ref> in the current/ directory"
     task :update do
       # update_repository_cache will attempt to clean out the repository; we must prevent that.
       # /bin/git below is where www.windowsgit.com's windows git/ssh installation puts the git executable.
@@ -78,7 +76,7 @@ configuration.load do
 
     desc "Run pending migrations"
     task :migrate do
-      run "cd #{current_path} && #{rake_cmd} db:migrate RAILS_ENV=#{rails_env}"
+      run "cd #{current_path} && #{ruby_cmd 'rake'} db:migrate RAILS_ENV=#{rails_env}"
     end
 
     desc "Start mongrel"
@@ -108,15 +106,15 @@ 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} && #{mongrel_cmd} service::install -e #{rails_env} -N #{mongrel_instance_prefix}#{n} -p #{base_port + n - mongrel_instances.first}"
-          run %Q(sc.exe config "#{mongrel_instance_prefix}#{n}" start= auto)
+          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 %Q(sc.exe config "#{mongrel_instance_prefix}#{n}" start= auto; true)
         end
       end
 
       desc "Remove mongrel services"
       task :remove do
         mongrel_instances.each do |n|
-          run "#{mongrel_cmd} service::remove -N #{mongrel_instance_prefix}#{n}"
+          run "#{ruby_cmd 'mongrel'} service::remove -N #{mongrel_instance_prefix}#{n}; true"
         end
       end
 
@@ -127,13 +125,21 @@ 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} && #{rake_cmd} #{ENV['COMMAND']} RAILS_ENV=#{rails_env}"
+    run "cd #{current_path} && #{ruby_cmd 'rake'} #{ENV['COMMAND']} RAILS_ENV=#{rails_env}"
   end
   
-  desc "Run a git command in COMMAND"
-  task :git do
-    raise "Specify the command with COMMAND. eg: COMMAND='diff HEAD^^'" unless ENV['COMMAND']
-    run "cd #{current_path} && git #{ENV['COMMAND']}"
+  desc "Run a rubygems (gem) command in COMMAND"
+  task :rubygems do
+    raise "Specify the command with COMMAND='install rails'" unless ENV['COMMAND']
+    run "cd #{current_path} && #{rubygems_cmd} #{ENV['COMMAND']}"
+  end
+  
+  namespace :git do
+    desc "Run a git command in COMMAND"
+    task :execute do
+      raise "Specify the command with COMMAND. eg: COMMAND='diff HEAD^^'" unless ENV['COMMAND']
+      run "cd #{current_path} && git #{ENV['COMMAND']}"
+    end
   end
 
   after 'deploy:setup', 'deploy:update_code'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-windows-server
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Edward Anderson
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 -04:00
+date: 2011-08-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: capistrano
   type: :runtime
+  name: capistrano
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,9 +33,9 @@ dependencies:
         version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
   type: :development
+  name: jeweler
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: