rake-remote_task 2.0.6 → 2.1.0

data/History.txt

@@ -1,3 +1,18 @@
+=== 2.1.0 / 2012-11-23
+
+* 4 minor enhancements:
+
+  * Allow a set of preliminary commands that will always be run
+  * Allow the manipultation of array variable in which one can append values
+  * Trust remote umask by default
+  * Updated rake dep to be >= 0.8 and < 11.0 for the new wack version scheme. (MichaelXavier)
+
+* 3 bug fixes:
+
+  * Add documentation for +command_prefix+ in +run+
+  * Declare append as an operation of Rake:RemoteTask. Fix 7863.
+  * Fix misc coding style
+
 === 2.0.6 / 2012-01-04
 
 * 1 minor enhancement:

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'rake-remote_task' do
 
   self.rubyforge_name = 'hitsquad'
 
-  dependency 'rake',     '~> 0.8'
+  dependency 'rake',    ['>= 0.8', '< 11.0']
   dependency 'open4',    '~> 1.0'
 
   multiruby_skip << "rubinius"

data/lib/rake/remote_task.rb

@@ -8,7 +8,7 @@ $-w = true if $TRACE # asshat, don't mess with my warn.
 
 [
  ["Thread.current[:task]", :get, :put, :rsync, :run, :sudo, :target_host],
- ["Rake::RemoteTask",      :host, :remote_task, :role, :set]
+ ["Rake::RemoteTask",      :host, :remote_task, :role, :set, :append]
 ].each do |methods|
   receiver = methods.shift
   methods.each do |method|
@@ -45,7 +45,7 @@ end
 
 class Rake::RemoteTask < Rake::Task
 
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 
   @@current_roles = []
 
@@ -169,9 +169,19 @@ class Rake::RemoteTask < Rake::Task
   ##
   # Use ssh to execute +command+ on target_host. If +command+ uses sudo, the
   # sudo password will be prompted for then saved for subsequent sudo commands.
+  #
+  # If +command_prefix+ has been filled up with one or several commands, they
+  # will be run on target_host before +command+.
 
   def run command
-    command = "cd #{target_dir} && #{command}" if target_dir
+    commands = []
+
+    commands << "cd #{target_dir}" if target_dir
+    commands += command_prefix.flatten if command_prefix
+    commands << "#{command}"
+
+    command = commands.join(" && ")
+
     cmd     = [ssh_cmd, ssh_flags, target_host, command].flatten
     result  = []
 
@@ -256,6 +266,10 @@ class Rake::RemoteTask < Rake::Task
     @@env
   end
 
+  def self.is_array
+    @@is_array
+  end
+
   ##
   # Fetches environment variable +name+ from the environment using
   # default +default+.
@@ -265,11 +279,21 @@ class Rake::RemoteTask < Rake::Task
     if @@env.has_key? name then
       protect_env(name) do
         v = @@env[name]
-        v = @@env[name] = v.call if Proc === v unless per_thread[name]
-        v = v.call if Proc === v
+        if @@is_array[name] then
+          v = v.map do |item|
+            Proc === item ? item.call : item
+          end
+          unless per_thread[name] then
+            @@env[name] = v
+            @@is_array[name] = false
+          end
+        elsif Proc === v then
+          v = v.call
+          @@env[name] = v unless per_thread[name]
+        end
         v
       end
-    elsif default || default == false
+    elsif default || default == false then
       v = @@env[name] = default
     else
       raise Rake::FetchError
@@ -349,6 +373,7 @@ class Rake::RemoteTask < Rake::Task
   def self.reset
     @@def_role_hash = {}                # official default role value
     @@env           = {}
+    @@is_array      = {}
     @@tasks         = {}
     @@roles         = Hash.new { |h,k| h[k] = @@def_role_hash }
     @@env_locks     = Hash.new { |h,k| h[k] = Mutex.new }
@@ -430,6 +455,35 @@ class Rake::RemoteTask < Rake::Task
     end
   end
 
+  ##
+  # Append +value+ or +default_block+ to  environment variable +name+
+  #
+  # To initialize an empty array, just do append +name+
+  #
+  # If +default_block+ is defined, the block will be executed the
+  # first time the variable is fetched, and the value will be used for
+  # every subsequent fetch.
+
+  def self.append name, value = nil, &default_block
+    raise ArgumentError, "cannot provide both a value and a block" if
+      value and default_block unless
+      value == :per_thread
+    raise ArgumentError, "cannot set reserved name: '#{name}'" if
+      Rake::RemoteTask.reserved_name?(name) unless $TESTING
+
+    name = name.to_s
+
+    set(name, []) unless @@is_array[name]
+    Rake::RemoteTask.is_array[name] = true
+    Rake::RemoteTask.per_thread[name] ||= default_block && value == :per_thread
+
+    v = default_block || value
+    if v then
+      Rake::RemoteTask.default_env[name] << v
+      Rake::RemoteTask.env[name] << v
+    end
+  end
+
   ##
   # Sets all the default values. Should only be called once. Use reset
   # if you need to restore values.
@@ -455,12 +509,14 @@ class Rake::RemoteTask < Rake::Task
                :sudo_cmd,           "sudo",
                :sudo_flags,         ['-p Password:'],
                :sudo_prompt,        /^Password:/,
-               :umask,              '02',
+               :umask,              nil,
                :mkdirs,             [],
                :shared_paths,       {},
                :perm_owner,         nil,
                :perm_group,         nil)
 
+    append :command_prefix, []
+
     set(:current_release)    { File.join(releases_path, releases[-1]) }
     set(:latest_release)     {
       deploy_timestamped ? release_path : current_release

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-remote_task
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 6
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -46,13 +46,20 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
         - 0
         - 8
         version: "0.8"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 11
+        - 0
+        version: "11.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -78,11 +85,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
-        - 2
-        - 9
-        version: "2.9"
+        - 4
+        - 3
+        version: "4.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -108,11 +115,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 1
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id005
 description: |-
@@ -170,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Vlad the Deployer's sexy brainchild is rake-remote_task, extending Rake with remote task goodness.