joekhoobyar-capsaicin 0.1.4 → 0.1.5

data/VERSION.yml

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

data/lib/capsaicin/files/local.rb

@@ -33,6 +33,10 @@ module Capsaicin
         cp from, to
       end
 
+      def put(from, to)
+        copy_stream StringIO.new(from), to
+      end
+
       def cd(dir, options={})
         if block_given?
           dir, dir2 = pwd, dir
@@ -45,7 +49,7 @@ module Capsaicin
       def tar_c(dest, src, options={}, &filter)
         logger and
           logger.trace "tar -cf #{dest} " + Array(src).map { |s| s.gsub ' ', '\\ ' }.join(' ')
-        _tar File.open(dest, 'wb'), src, v, &filter
+        _tar File.open(dest, 'wb'), src, options, &filter
       end
 
       def tar_cz(dest, src, options={}, &filter)
@@ -55,16 +59,22 @@ module Capsaicin
         _tar Zlib::GzipWriter.new(File.open(dest, 'wb')), src, options, &filter
       end
 
+      def tar_t(src, options={}, &block)
+        logger and logger.trace "tar -tf #{src}"
+        _lstar File.open(src, 'wb'), options, &block
+      end
+
+      def tar_tz(src, options={}, &block)
+        require 'zlib' unless defined? Zlib::GzipWriter
+        logger and logger.trace "tar -tzf #{src}"
+        _lstar Zlib::GzipReader.new(File.open(src, 'rb')), options, &block
+      end
+
     private
 
       def _tar(os, src, options, &filter)
         verbose = options[:v] || options[:verbose]
-        require 'find' unless defined? Find
-        unless defined? Archive::Tar::Minitar
-          require 'archive/tar/minitar'
-        end
-        minitar = Archive::Tar::Minitar
-
+        minitar = _minitar
         minitar::Output.open os do |outp|
           Array(src).each do |path|
             Find.find(path) do |entry|
@@ -78,6 +88,45 @@ module Capsaicin
           end
         end
       end
+      
+      def _untar(is, dest, files=[], options={}, &callback)
+        verbose = options[:v] || options[:verbose]
+        minitar = _minitar
+        minitar::Input.open is do |inp|
+          if File.exist?(dest) and ! File.directory?(dest)
+            raise "Can't unpack to a non-directory."
+          elsif ! File.exist? dest
+            FileUtils.mkdir_p dest
+          end
+          inp.each do |entry|
+            logger.trace " - #{entry}" if verbose
+            if files.empty? or files.include?(entry.full_name)
+              inp.extract_entry(dest, entry, &callback)
+            end
+          end
+        end
+      end
+
+      def _lstar(is, options={}, &block)
+        verbose = options[:v] || options[:verbose]
+        files, minitar = [], _minitar
+        minitar::Input.open is do |inp|
+          inp.each do |entry|
+            if block.nil? then files << entry else
+              f = block[entry]
+              files << f unless f.nil?
+            end
+            logger.trace " - #{entry}" if verbose
+          end
+        end
+        files
+      end
+
+      def _minitar
+        require 'find' unless defined? Find
+        require 'archive/tar/minitar' unless defined? Archive::Tar::Minitar
+        Archive::Tar::Minitar
+      end
     end
   end
 end

data/lib/capsaicin/files/remote.rb

@@ -73,6 +73,15 @@ module Capsaicin
           @config.download(*args)
         end
       end
+      
+      def put(from, to)
+        case _via
+        when :system, :local_run
+          FileUtils::Verbose.copy_stream StringIO.new(from), to
+        else
+          @config.put(*args)
+        end
+      end
 
       def cd(dir, options={})
         if block_given?
@@ -102,6 +111,22 @@ module Capsaicin
         _r 'tar -cjf', 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]
+      end
+
+      def tar_tz(src, options={}, &filter)
+        filter and abort "tar_tz: remote mode does not support a filtering proc"
+        _t 'tar -tzf', [src]
+      end
+
+      def tar_tj(src, options={}, &filter)
+        filter and abort "tar_tj: remote mode does not support a filtering proc"
+        _t 'tar -tjf', [src]
+      end
+
+
     private
 
       def _t(cmd, args=nil, min=nil)

data/lib/capsaicin/service/lsb.rb

@@ -21,22 +21,25 @@ module Capsaicin
         svc_actions += args.pop if Array === args.last
 
         namespace id do
-          case args.first
-          when String; id = args.shift.intern
-          when Symbol; id = args.shift
-          end
-          svc_cmd = "#{basedir || '/etc/init.d'}/#{id.to_s.split(':').last}"
+          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
-              send(basedir ? run_method : :sudo, "#{svc_cmd} status")
+            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
-              send(basedir ? run_method : :sudo, "#{svc_cmd} #{svc_action}")
+              _run_method = basedir ? fetch(:run_method, :sudo) : :sudo
+              send(_run_method, "#{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.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency