joekhoobyar-capsaicin 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 1

data/lib/capsaicin/files/remote.rb

@@ -27,17 +27,32 @@ module Capsaicin
 
       def tail_f(file, n=10)
         cmd = "tail -n #{n} -f #{_q file}"
-        _via == :system ? local_run(cmd) : stream(cmd, :via => _via)
+        case v = _via
+        when :system, :local_run
+          send v, cmd
+        else
+          stream cmd, :via => v
+        end
       rescue Interrupt
         logger.trace "interrupted (Ctrl-C)" if logger
       end
 
       def upload(*args)
-        _via == :system ? cp(*args) : @config.upload(*args)
+        case _via
+        when :system, :local_run
+          cp(*args)
+        else
+          @config.upload(*args)
+        end
       end
 
       def download(*args)
-        _via == :system ? cp(*args) : @config.download(*args)
+        case _via
+        when :system, :local_run
+          cp(*args)
+        else
+          @config.download(*args)
+        end
       end
 
       def cd(dir, options={})
@@ -50,7 +65,7 @@ module Capsaicin
       end
 
       def pwd
-        capture('pwd', :via => _via)
+        capture 'pwd', :via => _via
       end
 
     private
@@ -92,14 +107,7 @@ module Capsaicin
       end
 
       def _via
-        case (v = @config.fetch(:files_via, nil))
-        when :local
-          :system
-        when :remote, NilClass
-          @config.fetch(:run_method, nil)
-        else 
-          v
-        end
+        @config.fetch(:run_method, nil)
       end
 
     end

data/lib/capsaicin/files.rb

@@ -25,6 +25,8 @@ module Capsaicin
       %w(executable? -x)
     ]
 
+    LOCAL_RUN_METHODS = [:system, :local_run]
+
     require File.join(File.dirname(__FILE__), %w(files local.rb))
     require File.join(File.dirname(__FILE__), %w(files remote.rb))
 
@@ -33,7 +35,11 @@ module Capsaicin
     end.join("\n"), __FILE__, __LINE__)
 
     def _via
-      @config.fetch(:files_via, :remote).to_sym != :local ? :remote : :local
+      if LOCAL_RUN_METHODS.include? @config.fetch(:run_method, nil)
+        :local
+      else
+        :remote
+      end
     end
   end
 end

data/lib/capsaicin/invocation.rb

@@ -1,25 +1,40 @@
 module Capsaicin
 
   module Invocation
+
+    # 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)
       args.pop if Hash===args.last
-      args = args.first
-      logger.debug "executing locally: #{args}"
-      system args
+      cmd = args.join(' ')
+      if RUBY_PLATFORM =~ /win32|mingw|mswin/
+        cmd.gsub!('/','\\') # Replace / with \\
+        cmd.gsub!(/^cd /,'cd /D ') # Replace cd with cd /D
+        cmd.gsub!(/&& cd /,'&& cd /D ') # Replace cd with cd /D
+        logger.trace "executing locally: #{cmd}"
+        Kernel.system cmd
+      else
+        logger.trace "executing locally: #{cmd}"
+        Kernel.system cmd
+      end
     end
     
+    # Always uses :runner to sudo as someone. 
+    # Equivalent to:  sudo "command", :as => fetch(:runner,nil)
     def sudo_as(*args, &block)
       options = Hash===args.last ? args.pop.dup :  {}
       options[:as] = fetch(:runner, nil)
       sudo *args.push(options), &block
     end
     
+    # Extremely helpful if you only have permission to: sudo su SOMEUSER -c "command"
     def sudo_su(*args, &block)
       options = Hash===args.last ? args.pop.dup :  {}
       args[0] = "su #{fetch(:runner, nil)} -c '#{args[0]}'"
       sudo *args.push(options), &block
     end
     
+    # Extremely helpful if you only have permission to: sudo su - SOMEUSER
     def sudo_su_to(*args, &block)
       options = Hash===args.last ? args.pop.dup :  {}
       options[:shell] = false

data/lib/capsaicin/service/lsb.rb

@@ -4,9 +4,9 @@ module Capsaicin
 
       DEFAULT_ACTIONS = %w(status start stop restart)
 
-      # Check for the existance of a generic Windows NT service.
-      def lsb?(id)
-        files.exists? "/etc/init.d/#{id.to_s.split(':').last}"
+      # Check for the existance of a generic LSB initscript.
+      def lsb?(id, basedir="/etc/init.d")
+        files.exists? "#{basedir}/#{id.to_s.split(':').last}"
       end
 
       # Defines a recipe to control a generic LSB service.
@@ -14,6 +14,7 @@ module Capsaicin
       def lsb(id,*args)
         options = Hash===args.last ? args.pop : {}
 
+        basedir = options.delete(:basedir)
         svc_name = id.to_s
         svc_desc = next_description(:reset) || (svc_name.capitalize unless options.delete(:hide))
         svc_actions = DEFAULT_ACTIONS 
@@ -24,18 +25,18 @@ module Capsaicin
           when String; id = args.shift.intern
           when Symbol; id = args.shift
           end
-          svc_cmd = "/etc/init.d/#{id.to_s.split(':').last}"
+          svc_cmd = "#{basedir || '/etc/init.d'}/#{id.to_s.split(':').last}"
 
           desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:status]}" if svc_desc
           task :default, options do
-              sudo "#{svc_cmd} status"
+              send(basedir ? run_method : :sudo, "#{svc_cmd} status")
           end
 
           svc_actions.each do |svc_action|
             svc_action = svc_action.intern if String === svc_action
             desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[svc_action]}" if svc_desc
             task svc_action, options do
-              sudo "#{svc_cmd} #{svc_action}"
+              send(basedir ? run_method : :sudo, "#{svc_cmd} #{svc_action}")
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capsaicin
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency