capistrano 2.14.1 → 2.14.2

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -8,5 +8,5 @@ gemspec
8
8
  # are merged here.
9
9
  #
10
10
  group :development do
11
- gem 'rake', '0.8.7'
11
+ gem "rake"
12
12
  end
File without changes
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
17
17
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
18
18
  s.require_paths = ["lib"]
19
19
  s.extra_rdoc_files = [
20
- "README.mdown"
20
+ "README.md"
21
21
  ]
22
22
 
23
23
  if s.respond_to? :specification_version then
@@ -23,6 +23,8 @@ module Capistrano
23
23
 
24
24
  if readers.any? || writers.any?
25
25
  readers, writers, = IO.select(readers, writers, nil, wait)
26
+ else
27
+ return false
26
28
  end
27
29
 
28
30
  if readers
@@ -50,4 +52,4 @@ module Capistrano
50
52
  sessions
51
53
  end
52
54
  end
53
- end
55
+ end
@@ -45,7 +45,7 @@ namespace :deploy do
45
45
  task :precompile, :roles => assets_role, :except => { :no_release => true } do
46
46
  run <<-CMD.compact
47
47
  cd -- #{latest_release.shellescape} &&
48
- #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile &&
48
+ #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile &&
49
49
  cp -- #{shared_path.shellescape}/assets/manifest.yml #{current_release.shellescape}/assets_manifest.yml
50
50
  CMD
51
51
  end
@@ -110,9 +110,7 @@ namespace :deploy do
110
110
  current_assets = Set.new
111
111
  manifests.each do |yaml|
112
112
  manifest = YAML.load(yaml)
113
- current_assets += manifest.to_a.flatten.flat_map do |file|
114
- [file, "#{file}.gz"]
115
- end
113
+ current_assets += manifest.to_a.flatten.map {|f| [f, "#{f}.gz"] }.flatten
116
114
  end
117
115
  current_assets += %w(manifest.yml sources_manifest.yml)
118
116
 
@@ -154,7 +152,7 @@ namespace :deploy do
154
152
  run <<-CMD.compact
155
153
  cd -- #{previous_release.shellescape} &&
156
154
  cp -f -- #{previous_manifest.shellescape} #{shared_path.shellescape}/assets/manifest.yml &&
157
- #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile:nondigest
155
+ #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile:nondigest
158
156
  CMD
159
157
  end
160
158
  end
@@ -199,11 +199,13 @@ HELP
199
199
  # thread and generally gets things ready for the REPL.
200
200
  def setup
201
201
  configuration.logger.level = Capistrano::Logger::INFO
202
+ wait_for = 0.1
202
203
 
203
204
  @mutex = Mutex.new
204
205
  @bgthread = Thread.new do
205
206
  loop do
206
- @mutex.synchronize { process_iteration(0.1) }
207
+ ret = @mutex.synchronize { process_iteration(wait_for) }
208
+ sleep wait_for if !ret
207
209
  end
208
210
  end
209
211
  end
@@ -2,7 +2,7 @@ module Capistrano
2
2
  class Version
3
3
  MAJOR = 2
4
4
  MINOR = 14
5
- PATCH = 1
5
+ PATCH = 2
6
6
 
7
7
  def self.to_s
8
8
  "#{MAJOR}.#{MINOR}.#{PATCH}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.14.1
4
+ version: 2.14.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-10 00:00:00.000000000 Z
13
+ date: 2013-02-07 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: highline
@@ -118,13 +118,13 @@ executables:
118
118
  - capify
119
119
  extensions: []
120
120
  extra_rdoc_files:
121
- - README.mdown
121
+ - README.md
122
122
  files:
123
123
  - .gitignore
124
124
  - .travis.yml
125
125
  - CHANGELOG
126
126
  - Gemfile
127
- - README.mdown
127
+ - README.md
128
128
  - Rakefile
129
129
  - bin/cap
130
130
  - bin/capify
@@ -257,54 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
257
257
  version: '0'
258
258
  requirements: []
259
259
  rubyforge_project:
260
- rubygems_version: 1.8.23
260
+ rubygems_version: 1.8.24
261
261
  signing_key:
262
262
  specification_version: 3
263
263
  summary: Capistrano - Welcome to easy deployment with Ruby over SSH
264
- test_files:
265
- - test/cli/execute_test.rb
266
- - test/cli/help_test.rb
267
- - test/cli/options_test.rb
268
- - test/cli/ui_test.rb
269
- - test/cli_test.rb
270
- - test/command_test.rb
271
- - test/configuration/actions/file_transfer_test.rb
272
- - test/configuration/actions/inspect_test.rb
273
- - test/configuration/actions/invocation_test.rb
274
- - test/configuration/alias_task_test.rb
275
- - test/configuration/callbacks_test.rb
276
- - test/configuration/connections_test.rb
277
- - test/configuration/execution_test.rb
278
- - test/configuration/loading_test.rb
279
- - test/configuration/namespace_dsl_test.rb
280
- - test/configuration/roles_test.rb
281
- - test/configuration/servers_test.rb
282
- - test/configuration/variables_test.rb
283
- - test/configuration_test.rb
284
- - test/deploy/local_dependency_test.rb
285
- - test/deploy/remote_dependency_test.rb
286
- - test/deploy/scm/accurev_test.rb
287
- - test/deploy/scm/base_test.rb
288
- - test/deploy/scm/bzr_test.rb
289
- - test/deploy/scm/darcs_test.rb
290
- - test/deploy/scm/git_test.rb
291
- - test/deploy/scm/mercurial_test.rb
292
- - test/deploy/scm/none_test.rb
293
- - test/deploy/scm/perforce_test.rb
294
- - test/deploy/scm/subversion_test.rb
295
- - test/deploy/strategy/copy_test.rb
296
- - test/extensions_test.rb
297
- - test/fixtures/cli_integration.rb
298
- - test/fixtures/config.rb
299
- - test/fixtures/custom.rb
300
- - test/logger_formatting_test.rb
301
- - test/logger_test.rb
302
- - test/recipes_test.rb
303
- - test/role_test.rb
304
- - test/server_definition_test.rb
305
- - test/shell_test.rb
306
- - test/ssh_test.rb
307
- - test/task_definition_test.rb
308
- - test/transfer_test.rb
309
- - test/utils.rb
310
- has_rdoc:
264
+ test_files: []