joekhoobyar-capistrano-extensions 0.0.1 → 0.0.2

data/VERSION.yml

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

data/lib/capistrano_extensions/files/local.rb

@@ -28,9 +28,20 @@ module CapistranoExtensions
                   compare_file compare_stream
                   uptodate?)
 
-      class_eval(%w(exists? directory? executable?).map do |m|
-        "def #{m}(f) File.#{m}(f) end"
-      end.join("\n"))
+      def exists?(a, options={})
+        $stdout.puts "[ -f #{_q a} ] ]"
+        File.exists? a
+      end
+
+      def directory?(a, options={})
+        $stdout.puts "[ -d #{_q a} ]"
+        File.directory? a
+      end
+
+      def executable?(a, options={})
+        $stdout.puts "[ -x #{_q a} ]"
+        File.executable? a
+      end
 
     end
   end

data/lib/capistrano_extensions/files/remote.rb

@@ -12,11 +12,11 @@ module CapistranoExtensions
       end
 
       def upload(*args)
-        _via == :system ? cp(*args) : @config.upload(*args.push(:via => _via))
+        _via == :system ? cp(*args) : @config.upload(*args)
       end
 
       def download(*args)
-        _via == :system ? cp(*args) : @config.download(*args.push(:via => _via))
+        _via == :system ? cp(*args) : @config.download(*args)
       end
 
       def cd(dir, options={})
@@ -122,30 +122,41 @@ module CapistranoExtensions
         _r 'touch', args
       end
 
-      def exists?(a, options={:verbose=>false})
-        silence!(options) { _r "[ -f #{_q a} ]" }
+      def exists?(a)
+        _t "test -f", a
       end
 
       def directory?(a, options={:verbose=>false})
-        silence!(options) { _r "[ -d #{_q a} ]" }
+        _t "test -d", a
       end
 
       def executable?(a, options={:verbose=>false})
-        silence!(options) { _r "[ -x #{_q a} ]" }
+        _t "test -x", a
       end
 
 
     private
 
-      def silence!(quiet=false)
-        quiet = (FalseClass===quiet[:verbose]) if Hash === quiet
-        orig_quiet, @quiet = @quiet, quiet
-        yield
-      ensure
-        @quiet = orig_quiet
+      def _t(cmd, args=nil, min=nil)
+        cmd = _a cmd, args, min
+        if _via == :system then
+          system(cmd)
+        else
+          capture("#{cmd}; echo $?", :via => _via).strip == '0'
+        end
       end
 
       def _r(cmd, args=nil, min=nil)
+        cmd = _a cmd, args, min
+        if _via != :system then
+          invoke_command(cmd, :via => _via)
+        else
+          $stdout.puts cmd
+          system cmd
+        end          
+      end
+
+      def _a(cmd, args=nil, min=nil)
         case args
         when NilClass
           raise ArgumentError unless min.nil? or min.zero?
@@ -154,17 +165,9 @@ module CapistranoExtensions
           raise ArgumentError if (min || 1) > args.length
           cmd = "#{cmd} #{_q(*args)}" if args.any?
         else
-          raise ArgumentError if min.nil? or min < 1
+          raise ArgumentError if min and min < 1
           cmd = "#{cmd} #{_q args}"
         end
-
-        case (v = _via)
-        when :system
-          @quiet or $stderr.puts cmd
-          system cmd
-        else
-          invoke_command cmd, :via => v
-        end          
       end
 
       def _q(*list)

data/lib/capistrano_extensions/invocation.rb

@@ -15,7 +15,9 @@ module CapistranoExtension
     def sudo_su_to(*args, &block)
       options = Hash===args.last ? args.pop.dup :  {}
       options[:shell] = false
-      args[0] = "echo \"#{args[0].gsub('"', '\\"')}\" | #{sudo} su - #{fetch(:runner, nil)}"
+      cmd = args[0].gsub(/[$\\`"]/) { |m| "\\#{m}" }
+      args[0] = "echo \"#{cmd}\" | #{sudo} su - #{fetch(:runner, nil)}"
+      #args[0] = "echo \"#{.gsub('"', '\\"')}\" | #{sudo} su - #{fetch(:runner, nil)}"
       run *args.push(options), &block
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joe Khoobyar