capistrano-windows-server 0.4.6 → 0.5.0

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.9.0)
+    capistrano (2.11.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     git (1.2.5)
-    highline (1.6.9)
+    highline (1.6.11)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)

data/README.md

@@ -99,12 +99,12 @@ There are a few configuration values that need to be set in your deploy.rb, in a
 
     set :rails_env, 'production'
     set :user, 'git'
-    set :deploy_to, "/cygdrive/c/rails_apps/#{application}" # Deploy to C:\rails_apps\#{application}
-    set :mongrel_instances, (1..3)                          # Create 3 mongrel instances
-    set :mongrel_instance_prefix, 'mongrel_'                # named mongrel_{1..3}
-    set :base_port, 8000                                    # on ports 8000, 8001, 8002
-    
-    set :ruby_exe_path, '/cygdrive/c/ruby/bin/ruby'         # This should be set to the location where Ruby is installed.
+    set :deploy_to, "/cygdrive/c/rails_apps/#{application}"                 # Deploy to C:\rails_apps\#{application}
+    set :mongrel_instances, (1..3)                                          # Create 3 mongrel instances
+    set :mongrel_instance_prefix, 'mongrel_'                                #  named mongrel_{1..3}
+    set :base_port, 8000                                                    #  on ports 8000, 8001, 8002
+    set :bundler_git_command, '/cygdrive/c/RailsInstaller/Git/bin/git.exe'  # Specify the remote location of a Windows installation of git
+                                                                            #  Required only when your Gemfile pulls gems from a git repository
 
 Your final config/deploy.rb might look something like this:
 

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.5.0

data/capistrano-windows-server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-windows-server}
-  s.version = "0.4.6"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edward Anderson"]
-  s.date = %q{2012-02-20}
+  s.date = %q{2012-02-24}
   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.}
@@ -27,6 +27,7 @@ See the github page for instruction on how to set up Windows to get it ready for
     "Rakefile",
     "VERSION",
     "capistrano-windows-server.gemspec",
+    "lib/capistrano-windows-server.rb",
     "lib/capistrano/ext/windows_server.rb"
   ]
   s.homepage = %q{http://github.com/nilbus/capistrano-windows-server}

data/lib/capistrano/ext/windows_server.rb

@@ -10,6 +10,7 @@ configuration.load do
   set :repository_cache, "current"
   set :scm_verbose, true
   set :use_sudo, false
+  set :default_shell, false
 
   def strip_cygdrive(path)
     path.sub /\/cygdrive\/([c-z])\//, '\1:/'
@@ -18,28 +19,31 @@ configuration.load do
   def latest_release
     strip_cygdrive current_path
   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(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')")
+  
+  def system_path
+    return @system_path if @system_path
+    run 'echo "/bin:/usr/bin:$PATH"' do |channel, stream, data|
+      return @system_path = data.strip # Probably not compatible with multiple run targets with different PATHs
+    end
   end
   
-  def run_ruby_cmd(cmd, args='', gem_name=cmd)
-    run "cd #{current_path} && #{ruby_cmd cmd, gem_name} #{args}"
+  task :path do
+    puts system_path.inspect
   end
-
-  def bundle_exec(cmd, args='', gem_name=cmd)
+  
+  def run_ruby_cmd(cmd)
+    bundler_git_path = "#{File.dirname(bundler_git_command)}:" rescue nil
+    run "cd #{current_path} && PATH='#{bundler_git_path}#{system_path}' ruby -S #{cmd}"
+  end
+  
+  def bundle_exec(cmd)
     if gemfile_present?
-      run_ruby_cmd 'bundle', "exec #{cmd} #{args}", 'bundler'
+      run_ruby_cmd "bundle exec #{cmd}"
     else
-      run_ruby_cmd cmd, args, gem_name
+      run_ruby_cmd cmd
     end
   end
   
-  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
-  
   def application_server
     app_server rescue :mongrel
   end
@@ -53,17 +57,31 @@ configuration.load do
     task :update_code 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.
-      # This creates a git proxy that goes in $PATH before /bin, which will filter out any `git clean` commands.
-      run "mkdir -p '#{shared_path}/bin'"
+      # This creates a git wrapper that goes in $PATH before /bin, which will filter out any `git clean` commands.
+      run "/bin/mkdir -p '#{shared_path}/bin'"
       run <<-RUN
         echo 'if [ "$1" != "clean" ]; then /bin/git $*; fi' > "#{shared_path}/bin/git.exe"
       RUN
       alter_path_cmd = "export PATH=#{shared_path}/bin:$PATH # Required for capistrano-windows-server"
       run <<-RUN
-        if ! grep '#{alter_path_cmd}' ~/.bashrc > /dev/null; then echo '#{alter_path_cmd}' >> ~/.bashrc; fi
+        if ! /bin/grep '#{alter_path_cmd}' ~/.bashrc > /dev/null; then echo '#{alter_path_cmd}' >> ~/.bashrc; fi
       RUN
 
-      strategy.send 'update_repository_cache'
+      continue = true
+      while continue
+        begin
+          strategy.send 'update_repository_cache'
+          continue = false
+        rescue
+          puts "Failed to check out git. If the error was 'fatal: The remote end hung up unexpectedly', this is due to a cygwin ssh bug."
+          puts "It often works to just try again repeatedly (a lot! 30+ times for an initial clone - it's like playing the lottery :-)"
+          @try_again_response ||= Capistrano::CLI.ui.ask("Keep trying? [Y/n]: ").to_s.chomp
+          unless @try_again_response.empty? || @try_again_response.downcase == 'y'
+            continue = false
+            raise $!
+          end
+        end
+      end
       finalize_update
     end
 
@@ -81,10 +99,10 @@ configuration.load do
     DESC
     task :setup do
       dirs = [deploy_to]
-      run "mkdir -p #{dirs.join(' ')} && chmod g+w #{dirs.join(' ')}"
+      run "/bin/mkdir -p #{dirs.join(' ')} && /bin/chmod g+w #{dirs.join(' ')}"
 
       if exists?(:repository_host_key)
-        run "if ! grep '#{repository_host_key}' ~/.ssh/known_hosts > /dev/null; then echo '#{repository_host_key}' >> ~/.ssh/known_hosts; fi"
+        run "if ! /bin/grep '#{repository_host_key}' ~/.ssh/known_hosts > /dev/null; then echo '#{repository_host_key}' >> ~/.ssh/known_hosts; fi"
       end
     end
 
@@ -98,9 +116,9 @@ configuration.load do
       end
     end
 
-    desc "Run pending migrations"
+    desc "Run pending migrations. Override the default rails environment with RAILS_ENV"
     task :migrate do
-      bundle_exec 'rake', "db:migrate RAILS_ENV=#{rails_env}"
+      bundle_exec "rake db:migrate RAILS_ENV=#{ENV['RAILS_ENV'] || rails_env}"
     end
 
     desc "Start mongrel"
@@ -133,8 +151,8 @@ configuration.load do
       task :setup 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
-          bundle_exec 'mongrel_rails', "service::install -e #{rails_env} -N #{mongrel_instance_prefix}#{n} -p #{base_port + n - mongrel_instances.first}; true", 'mongrel'
+          run "/bin/mkdir -p #{current_path}/{tmp,log}" # These are often not under version control, but their absence keeps mongrel from recognizing the rails app
+          bundle_exec "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 type= interact type= own; true)
         end
       end
@@ -142,47 +160,42 @@ configuration.load do
       desc "Remove mongrel services"
       task :remove do
         mongrel_instances.each do |n|
-          bundle_exec 'mongrel_rails', "service::remove -N #{mongrel_instance_prefix}#{n}; true", 'mongrel'
+          bundle_exec "mongrel_rails service::remove -N #{mongrel_instance_prefix}#{n}; true"
         end
       end
-
     end
-
   end
 
-  desc "Run a rake command in COMMAND"
+  desc "Run a rake command in COMMAND. RAILS_ENV for the configured environment will be included; it can be overridden by setting RAILS_ENV"
   task :rake do
     raise "Specify the command with COMMAND='some:task with_arguments'" unless ENV['COMMAND']
-    bundle_exec 'rake', "#{ENV['COMMAND']} RAILS_ENV=#{rails_env}"
+    bundle_exec "rake #{ENV['COMMAND']} RAILS_ENV=#{ENV['RAILS_ENV'] || rails_env}"
   end
   
   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']}"
+    bundle_exec "gem #{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
+  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} && /bin/git #{ENV['COMMAND']}"
   end
 
   namespace :bundle do
-    desc "Install gems with bundler"
-    task :install do
+    desc "Execute a COMMAND with bundle exec"
+    task :default do
       raise "No Gemfile detected" unless gemfile_present?
-      run_ruby_cmd 'bundle', "install --without test development --path #{strip_cygdrive deploy_to}/bundle", 'bundler'
+      raise "Specify the command with COMMAND. eg: COMMAND='rake db:migrate'" unless ENV['COMMAND']
+      bundle_exec ENV['COMMAND']
     end
 
-    desc "Execute a COMMAND with bundle exec"
-    task :execute do
+    desc "Install gems with bundler"
+    task :install do
       raise "No Gemfile detected" unless gemfile_present?
-      raise "Specify the command with COMMAND. eg: COMMAND='rake db:migrate'" unless ENV['COMMAND']
-      args = ENV['COMMAND'].split
-      bundle_exec args.shift, args.join(' ')
+      run_ruby_cmd "bundle install --without test development --path ../bundle"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-windows-server
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 6
-  version: 0.4.6
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Edward Anderson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 -05:00
+date: 2012-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - Rakefile
 - VERSION
 - capistrano-windows-server.gemspec
+- lib/capistrano-windows-server.rb
 - lib/capistrano/ext/windows_server.rb
 has_rdoc: true
 homepage: http://github.com/nilbus/capistrano-windows-server