joekhoobyar-capsaicin 0.1.6 → 0.1.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 6
+:patch: 7

data/lib/capsaicin.rb

@@ -3,14 +3,20 @@ unless Capistrano::Configuration.respond_to?(:instance)
 end
 require 'capistrano'
 
+module Capsaicin; end
+
 require File.join(File.dirname(__FILE__), %w(capsaicin sys))
+require File.join(File.dirname(__FILE__), %w(capsaicin namespace))
 require File.join(File.dirname(__FILE__), %w(capsaicin invocation))
 require File.join(File.dirname(__FILE__), %w(capsaicin files))
 require File.join(File.dirname(__FILE__), %w(capsaicin service))
 require File.join(File.dirname(__FILE__), %w(capsaicin ui))
 
-Capistrano::Configuration.send :include, Invocation
+Capistrano::Configuration.send :include, Capsaicin::Invocation
+Capistrano::Configuration::Namespaces::Namespace.send :include, Capsaicin::Namespace
 
+Capistrano.plugin :local_sys, Capsaicin::LocalSys
+Capistrano.plugin :service, Capsaicin::Service
 Capistrano.plugin :files, Capsaicin::Files
 Capistrano.plugin :local_files, Capsaicin::Files::Local
 Capistrano.plugin :remote_files, Capsaicin::Files::Remote

data/lib/capsaicin/bundle.rb

@@ -3,6 +3,4 @@ module Capsaicin
   module Bundle   # :nodoc:
     
   end
-
-  Capistrano.plugin :bundle
 end

data/lib/capsaicin/files/remote.rb

@@ -61,7 +61,15 @@ module Capsaicin
         when :system, :local_run
           cp from, to
         else
-          to2, to = to, "/tmp/#{File.basename to}-#{Time.now.utc.to_i}" if _via.to_s[0,4] == 'sudo'
+          if _via.to_s[0,4] == 'sudo'
+            if to[-1]==?/ || to[-1]==?\\ || directory?(to)
+              tof = File.basename from
+              to2, to = "#{to}/#{tof}", "/tmp/#{tof}-#{Time.now.utc.to_i}"
+            else
+              tof = File.basename to
+              to2, to = to, "/tmp/#{tof}-#{Time.now.utc.to_i}"
+            end
+          end
           @config.upload(from, to, options, &block)
           if to2
             run "chmod 0644 #{to}"
@@ -85,7 +93,14 @@ module Capsaicin
         when :system, :local_run
           FileUtils::Verbose.copy_stream StringIO.new(from), to
         else
-          path2, path = path, "/tmp/#{File.basename path}-#{Time.now.utc.to_i}" if _via.to_s[0,4] == 'sudo'
+          if _via.to_s[0,4] == 'sudo'
+            if path[-1]==?/ || path[-1]==?\\ || directory?(path)
+              abort "Target path is a directory!"
+            else
+              pathf = File.basename path
+              path2, path = path, "/tmp/#{pathf}-#{Time.now.utc.to_i}"
+            end
+          end
           @config.put(data, path, options)
           if path2
             run "chmod 0644 #{path}"

data/lib/capsaicin/invocation.rb

@@ -10,6 +10,22 @@ module Capsaicin
       invoke_command *args.push(options), &block
     end
 
+    # Automatically uses the :run_method variable to run things.
+    # Equivalent to +capture *args, :via=>fetch(:run_method, :run)+
+    def vcapture(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      options[:via] = fetch(:run_method, :run)
+      capture *args.push(options), &block
+    end
+
+    # Automatically uses the :run_method variable to run things.
+    # Equivalent to +stream *args, :via=>fetch(:run_method, :run)+
+    def vstream(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      options[:via] = fetch(:run_method, :run)
+      stream *args.push(options), &block
+    end
+
     # Capistrano's system() override is only available from the base deployment strategy.
     # Also, we could do with a few more windows checks.
     def local_run(*args, &block)

data/lib/capsaicin/namespace.rb

@@ -0,0 +1,48 @@
+module Capsaicin
+
+  module Namespace
+    
+    # Redefine settings for the duration of an existing task.
+    def task_settings(task, vars)
+      orig_vars = vars.keys.select { |k| exists? k }.inject({}) { |h,k| h[k] = variables[k]; h }
+      orig_body = tasks[task].body
+      tasks[task].instance_variable_set(:@body, lambda do
+        vars.each { |k,v| Proc===v ? set(k, &v) : set(k, v) }
+        begin
+          orig_body.call
+        ensure
+	        vars.keys.each do |k|
+            if ! orig_vars.include? k
+              variables.delete k
+            else
+              v = orig_vars[k]
+              Proc===v ? set(k, &v) : set(k, v)
+            end
+          end
+        end
+      end)
+    end
+
+	  # Undefine tasks in a namespace.
+	  def undef_tasks(name, list)
+	    namespace name do
+	      metaclass = class << self; self; end
+	      list.each do |k|
+	        k = k.to_sym  
+	        metaclass.send(:undef_method, k)
+	        tasks.delete k
+	      end
+	    end
+	  end
+	
+	  # Override tasks in a namespace to a NOOP.
+	  def noop_tasks(name, list)
+	    namespace name do
+	      metaclass = class << self; self; end
+	      list.each do |k|
+	        tasks[k.to_sym].instance_variable_set(:@body, lambda {})
+	      end
+	    end
+	  end
+	end
+end

data/lib/capsaicin/service.rb

@@ -17,5 +17,3 @@ module Capsaicin
   end
 
 end
-
-Capistrano.plugin :service, Capsaicin::Service

data/lib/capsaicin/sys.rb

@@ -6,6 +6,4 @@ module Capsaicin
     end
 
   end
-
-  Capistrano.plugin :local_sys, LocalSys
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capsaicin
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/capsaicin/files/local.rb
 - lib/capsaicin/files/remote.rb
 - lib/capsaicin/invocation.rb
+- lib/capsaicin/namespace.rb
 - lib/capsaicin/service.rb
 - lib/capsaicin/service/command.rb
 - lib/capsaicin/service/crm.rb