capistrano 2.14.1 → 2.14.2

data/Gemfile

@@ -8,5 +8,5 @@ gemspec
 # are merged here.
 #
 group :development do
-  gem 'rake', '0.8.7'
+  gem "rake"
 end

data/capistrano.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.extra_rdoc_files = [
-    "README.mdown"
+    "README.md"
   ]
 
   if s.respond_to? :specification_version then

data/lib/capistrano/processable.rb

@@ -23,6 +23,8 @@ module Capistrano
 
       if readers.any? || writers.any?
         readers, writers, = IO.select(readers, writers, nil, wait)
+      else
+        return false
       end
 
       if readers
@@ -50,4 +52,4 @@ module Capistrano
       sessions
     end
   end
-end
+end

data/lib/capistrano/recipes/deploy/assets.rb

@@ -45,7 +45,7 @@ namespace :deploy do
     task :precompile, :roles => assets_role, :except => { :no_release => true } do
       run <<-CMD.compact
         cd -- #{latest_release.shellescape} &&
-        #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile &&
+        #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile &&
         cp -- #{shared_path.shellescape}/assets/manifest.yml #{current_release.shellescape}/assets_manifest.yml
       CMD
     end
@@ -110,9 +110,7 @@ namespace :deploy do
         current_assets = Set.new
         manifests.each do |yaml|
           manifest = YAML.load(yaml)
-          current_assets += manifest.to_a.flatten.flat_map do |file|
-            [file, "#{file}.gz"]
-          end
+          current_assets += manifest.to_a.flatten.map {|f| [f, "#{f}.gz"] }.flatten
         end
         current_assets += %w(manifest.yml sources_manifest.yml)
 
@@ -154,7 +152,7 @@ namespace :deploy do
         run <<-CMD.compact
           cd -- #{previous_release.shellescape} &&
           cp -f -- #{previous_manifest.shellescape} #{shared_path.shellescape}/assets/manifest.yml &&
-          #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile:nondigest
+          #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile:nondigest
         CMD
       end
     end

data/lib/capistrano/shell.rb

@@ -199,11 +199,13 @@ HELP
       # thread and generally gets things ready for the REPL.
       def setup
         configuration.logger.level = Capistrano::Logger::INFO
+        wait_for = 0.1
 
         @mutex = Mutex.new
         @bgthread = Thread.new do
           loop do
-            @mutex.synchronize { process_iteration(0.1) }
+            ret = @mutex.synchronize { process_iteration(wait_for) }
+            sleep wait_for if !ret
           end
         end
       end

data/lib/capistrano/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Version
     MAJOR = 2
     MINOR = 14
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.14.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -118,13 +118,13 @@ executables:
 - capify
 extensions: []
 extra_rdoc_files:
-- README.mdown
+- README.md
 files:
 - .gitignore
 - .travis.yml
 - CHANGELOG
 - Gemfile
-- README.mdown
+- README.md
 - Rakefile
 - bin/cap
 - bin/capify
@@ -257,54 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
-test_files:
-- test/cli/execute_test.rb
-- test/cli/help_test.rb
-- test/cli/options_test.rb
-- test/cli/ui_test.rb
-- test/cli_test.rb
-- test/command_test.rb
-- test/configuration/actions/file_transfer_test.rb
-- test/configuration/actions/inspect_test.rb
-- test/configuration/actions/invocation_test.rb
-- test/configuration/alias_task_test.rb
-- test/configuration/callbacks_test.rb
-- test/configuration/connections_test.rb
-- test/configuration/execution_test.rb
-- test/configuration/loading_test.rb
-- test/configuration/namespace_dsl_test.rb
-- test/configuration/roles_test.rb
-- test/configuration/servers_test.rb
-- test/configuration/variables_test.rb
-- test/configuration_test.rb
-- test/deploy/local_dependency_test.rb
-- test/deploy/remote_dependency_test.rb
-- test/deploy/scm/accurev_test.rb
-- test/deploy/scm/base_test.rb
-- test/deploy/scm/bzr_test.rb
-- test/deploy/scm/darcs_test.rb
-- test/deploy/scm/git_test.rb
-- test/deploy/scm/mercurial_test.rb
-- test/deploy/scm/none_test.rb
-- test/deploy/scm/perforce_test.rb
-- test/deploy/scm/subversion_test.rb
-- test/deploy/strategy/copy_test.rb
-- test/extensions_test.rb
-- test/fixtures/cli_integration.rb
-- test/fixtures/config.rb
-- test/fixtures/custom.rb
-- test/logger_formatting_test.rb
-- test/logger_test.rb
-- test/recipes_test.rb
-- test/role_test.rb
-- test/server_definition_test.rb
-- test/shell_test.rb
-- test/ssh_test.rb
-- test/task_definition_test.rb
-- test/transfer_test.rb
-- test/utils.rb
-has_rdoc: 
+test_files: []