joekhoobyar-capsaicin 0.1.5 → 0.1.6

data/VERSION.yml

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

data/lib/capsaicin/files/local.rb

@@ -70,6 +70,17 @@ module Capsaicin
         _lstar Zlib::GzipReader.new(File.open(src, 'rb')), options, &block
       end
 
+      def tar_x(src, options={}, &block)
+        logger and logger.trace "tar -xf #{src}"
+        _untar File.open(src, 'wb'), options, &block
+      end
+
+      def tar_xz(src, options={}, &block)
+        require 'zlib' unless defined? Zlib::GzipWriter
+        logger and logger.trace "tar -xzf #{src}"
+        _untar Zlib::GzipReader.new(File.open(src, 'rb')), options, &block
+      end
+
     private
 
       def _tar(os, src, options, &filter)
@@ -130,5 +141,3 @@ module Capsaicin
     end
   end
 end
-
-Capistrano.plugin :local_files, Capsaicin::Files::Local

data/lib/capsaicin/files/remote.rb

@@ -56,12 +56,18 @@ module Capsaicin
         logger.trace "interrupted (Ctrl-C)" if logger
       end
 
-      def upload(*args)
+      def upload(from, to, options={}, &block)
         case _via
         when :system, :local_run
-          cp(*args)
+          cp from, to
         else
-          @config.upload(*args)
+          to2, to = to, "/tmp/#{File.basename to}-#{Time.now.utc.to_i}" if _via.to_s[0,4] == 'sudo'
+          @config.upload(from, to, options, &block)
+          if to2
+            run "chmod 0644 #{to}"
+            cp to, to2
+            run "rm -f #{to}"
+          end
         end
       end
 
@@ -74,12 +80,18 @@ module Capsaicin
         end
       end
       
-      def put(from, to)
+      def put(data, path, options={})
         case _via
         when :system, :local_run
           FileUtils::Verbose.copy_stream StringIO.new(from), to
         else
-          @config.put(*args)
+          path2, path = path, "/tmp/#{File.basename path}-#{Time.now.utc.to_i}" if _via.to_s[0,4] == 'sudo'
+          @config.put(data, path, options)
+          if path2
+            run "chmod 0644 #{path}"
+            cp path, path2
+            run "rm -f #{path}"
+          end
         end
       end
 
@@ -111,6 +123,21 @@ module Capsaicin
         _r 'tar -cjf', Array(src).unshift(dest)
       end
 
+      def tar_x(dest, options={}, &filter)
+        filter and abort "tar_x: remote mode does not support a filtering proc"
+        _r 'tar -xf', [dest]
+      end
+
+      def tar_xz(dest, options={}, &filter)
+        filter and abort "tar_xz: remote mode does not support a filtering proc"
+        _r 'tar -xzf', [dest]
+      end
+
+      def tar_xj(dest, src, options={}, &filter)
+        filter and abort "tar_xj: remote mode does not support a filtering proc"
+        _r 'tar -xjf', Array(src).unshift(dest)
+      end
+
       def tar_t(src, options={}, &filter)
         filter and abort "tar_t: remote mode does not support a filtering proc"
         _t 'tar -tf', [src]
@@ -172,5 +199,3 @@ module Capsaicin
     end
   end
 end
-
-Capistrano.plugin :remote_files, Capsaicin::Files::Remote

data/lib/capsaicin/files.rb

@@ -44,5 +44,3 @@ module Capsaicin
     end
   end
 end
-
-Capistrano.plugin :files, Capsaicin::Files

data/lib/capsaicin/invocation.rb

@@ -2,6 +2,14 @@ module Capsaicin
 
   module Invocation
 
+    # Automatically uses the :run_method variable to run things.
+    # Equivalent to +invoke_command *args, :via=>fetch(:run_method, :run)+
+    def vrun(*args, &block)
+      options = Hash===args.last ? args.pop.dup :  {}
+      options[:via] = fetch(:run_method, :run)
+      invoke_command *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)
@@ -43,6 +51,4 @@ module Capsaicin
       run *args.push(options), &block
     end
   end
-
-  Capistrano::Configuration.send :include, Invocation
 end

data/lib/capsaicin/service/command.rb

@@ -14,7 +14,7 @@ module Capsaicin
 
         svc_name = id.to_s
         svc_desc = next_description(:reset) || (svc_name.capitalize unless options.delete(:hide))
-        extras = args.pop if Array === args.last
+        extras = options.delete(:extras) || {}
         via = options.delete(:via)
 
         namespace id do
@@ -29,10 +29,19 @@ module Capsaicin
             send(via || fetch(:run_method, :local_run), stop)
           end
 
-          desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:restart]}" if svc_desc
-          task :restart, options do
-            stop
-            start
+          unless extras.key? :restart
+	          desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:restart]}" if svc_desc
+	          task :restart, options do
+	            stop
+	            start
+	          end
+	        end
+         
+          extras.each do |k,cmd|
+	          desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[k]}" if svc_desc
+	          task k, options do
+	            send(via || fetch(:run_method, :local_run), cmd)
+	          end
           end
         
           instance_eval { yield } if block_given?

data/lib/capsaicin/service/lsb.rb

@@ -22,24 +22,25 @@ module Capsaicin
 
         namespace id do
           svc_id = Symbol === id ? id.to_s : id.split(':').last
-          svc_cmd = case basedir
-                    when String; basedir + '/' + svc_id
-                    when NilClass; '/etc/init.d' + svc_id
-                    when Symbol; fetch(basedir) + '/' + svc_id
-                    when Proc; basedir.call + '/' + svc_id
-                    end
 
           desc "#{svc_desc}: #{SVC_ACTION_CAPTIONS[:status]}" if svc_desc
           task :default, options do
             status
           end
-
+          svc_cmd = Proc.new do
+            case basedir
+            when String; basedir + '/' + svc_id
+            when NilClass; '/etc/init.d/' + svc_id
+            when Symbol; fetch(basedir) + '/' + svc_id
+            when Proc; basedir.call(svc_id)
+            end
+          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
-              _run_method = basedir ? fetch(:run_method, :sudo) : :sudo
-              send(_run_method, "#{svc_cmd} #{svc_action}")
+              _run_method = basedir ? fetch(:run_method, :run) : :sudo
+              send(_run_method, "#{svc_cmd.call} #{svc_action}")
             end
           end
 

data/lib/capsaicin.rb

@@ -8,3 +8,9 @@ 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.plugin :files, Capsaicin::Files
+Capistrano.plugin :local_files, Capsaicin::Files::Local
+Capistrano.plugin :remote_files, Capsaicin::Files::Remote

data/test/helper.rb

@@ -0,0 +1,19 @@
+require 'stringio'
+require 'rubygems'
+require 'capistrano/logger'
+
+class CapistranoMock
+
+  def logbuf
+    @logbuf ||= StringIO.new
+  end
+
+  def logger
+    if @logger.nil?
+      @logger = Capistrano::Logger.new :output=>logbuf
+      @logger.level = Capistrano::Logger::MAX_LEVEL
+    end
+    @logger
+  end
+
+end

data/test/test_local_files.rb

@@ -0,0 +1,58 @@
+require 'test/unit'
+require 'helper'
+require 'tmpdir'
+require 'capsaicin/files'
+require 'capsaicin/files/local'
+
+class TestLocalFiles < Test::Unit::TestCase
+
+  def setup
+    @local = CapistranoMock.new
+    @local.extend Capsaicin::Files::Local
+  end
+  
+  def test_exists
+    assert @local.exists?(__FILE__)
+    assert_equal "test -e #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_exists
+    assert ! @local.exists?(__FILE__+'/nope')
+  end
+  
+  def test_readable
+    assert @local.readable?(__FILE__)
+    assert_equal "test -r #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_readable
+    assert ! @local.readable?(__FILE__+'/nope')
+  end
+  
+  def test_writable
+    assert @local.writable?(Dir.tmpdir)
+    assert_equal "test -w #{Dir.tmpdir}", @local.logbuf.string.strip
+  end
+  
+  def test_not_writable
+    assert ! @local.writable?(__FILE__+'/nope')
+  end
+  
+  def test_file
+    assert @local.file?(__FILE__)
+    assert_equal "test -f #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_file
+    assert ! @local.file?(__FILE__+'/nope')
+  end
+  
+  def test_directory
+    assert @local.directory?(File.dirname(__FILE__))
+    assert_equal "test -d #{File.dirname __FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_directory
+    assert ! @local.directory?(__FILE__)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capsaicin
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - lib/capsaicin/service/windows.rb
 - lib/capsaicin/sys.rb
 - lib/capsaicin/ui.rb
+- test/helper.rb
+- test/test_local_files.rb
 has_rdoc: false
 homepage: http://github.com/joekhoobyar/capsaicin
 post_install_message: 
@@ -85,5 +87,6 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Joe Khoobyar's spicy capistrano extensions
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/test_local_files.rb