joekhoobyar-capistrano-extensions 0.0.2 → 0.0.3

data/VERSION.yml

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

data/lib/capistrano_extensions/files.rb

@@ -2,6 +2,31 @@ require File.join(File.dirname(__FILE__), %w(files local.rb))
 require File.join(File.dirname(__FILE__), %w(files remote.rb))
 
 module CapistranoExtensions::Files
+
+  COMMANDS = [ %w(mkdir mkdir_p rmdir cp cp_r rm rm_r rm_rf
+                  chmod chmod_R chown chown_R touch),
+              %w(ln ln_s ln_sf mv install) ]
+
+  FILE_TESTS = [
+    %w(blockdev? -b),
+    %w(chardev? -c),
+    %w(directory? -d),
+    %w(exists? -e),
+    %w(file? -f),
+    %w(grpowned? -G),
+    %w(owned? -O),
+    %w(pipe? -p),
+    %w(readable? -r),
+    %w(setgid? -g),
+    %w(setuid? -u),
+    %w(size? -s),
+    %w(socket? -S),
+    %w(sticky? -k),
+    %w(symlink? -h),
+    %w(writable? -w),
+    %w(executable? -x)
+  ]
+
   class_eval(Local.public_instance_methods(false).map do |m|
     "def #{m}(*f) send(_via.to_s + '_files').#{m}(*f) end"
   end.join("\n"))

data/lib/capistrano_extensions/files/local.rb

@@ -4,6 +4,20 @@ module CapistranoExtensions
   module Files
     module Local
 
+      include FileUtils::Verbose
+
+      public *COMMANDS
+      public :pwd
+
+      FILE_TESTS.each do |m,t|
+        class_eval <<-EODEF
+          def #{m}(a, options={})
+            logger.trace "test #{t} \#{a.gsub ' ', '\\ '}" if logger 
+            File.#{m} a
+          end
+        EODEF
+      end
+
       def tail_f(file, n=10)
         unless defined? File::Tail::Logfile then gem 'file-tail'; require 'file/tail' end
         File::Tail::Logfile.tail(file, :backward=>n) do |line| puts line end
@@ -12,35 +26,20 @@ module CapistranoExtensions
       end
 
       def upload(from, to)
-        cp(from, to)
+        cp from, to
       end
 
       def download(from, to)
-        cp(from, to)
-      end
-
-
-      include FileUtils::Verbose
-
-      public *FileUtils::Verbose.methods(false)
-      private *%w(copy_entry copy_file copy_stream
-                  remove_entry remove_entry_secure remove_file
-                  compare_file compare_stream
-                  uptodate?)
-
-      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
+        cp from, to
       end
 
-      def executable?(a, options={})
-        $stdout.puts "[ -x #{_q a} ]"
-        File.executable? a
+      def cd(dir, options={})
+        if block_given?
+          dir, dir2 = pwd, dir
+          cd dir2
+          yield
+        end  
+        cd dir
       end
 
     end

data/lib/capistrano_extensions/files/remote.rb

@@ -4,6 +4,23 @@ module CapistranoExtensions
   module Files
     module Remote
 
+      COMMANDS = [ %w(mkdir mkdir_p rmdir cp cp_r rm rm_r rm_rf
+                      chmod chmod_R chown chown_R touch),
+                  %w(ln ln_s ln_sf mv install) ]
+
+      COMMANDS.each_with_index do |l,n|
+        l.each do |k|
+          k, f = k.split('_')
+          f = ' -' + f if f
+          class_eval <<-EODEF
+            def #{k}(a, options={})
+              options = args.pop if Hash === args.last
+              _r '#{k}#{f}', args#{', ' + (n+1).to_s if n > 0}
+            end
+          EODEF
+        end
+      end
+
       def tail_f(file, n=10)
         cmd = "tail -n #{n} -f #{_q file}"
         _via == :system ? system(cmd) : stream(cmd, :via => _via)
@@ -29,112 +46,17 @@ module CapistranoExtensions
       end
 
       def pwd
-        capture("pwd", :via => _via)
-      end
-
-      def mkdir(*args)
-        options = args.pop if Hash === args.last
-        _r 'mkdir', args
-      end
-
-      def mkdir_p(*args)
-        options = args.pop if Hash === args.last
-        _r 'mkdir -p', args
-      end
-
-      def rmdir(*args)
-        options = args.pop if Hash === args.last
-        _r 'rmdir', args
-      end
-
-      def ln(*args)
-        options = args.pop if Hash === args.last
-        _r 'ln', args, 2
-      end
-
-      def ln_s(*args)
-        options = args.pop if Hash === args.last
-        _r 'ln -s', args, 2
-      end
-
-      def ln_sf(*args)
-        options = args.pop if Hash === args.last
-        _r 'ln -sf', args, 2
-      end
-
-      def cp(*args)
-        options = args.pop if Hash === args.last
-        _r 'cp', args
-      end
-
-      def cp_r(*args)
-        options = args.pop if Hash === args.last
-        _r 'cp -r', args
-      end
-
-      def mv(*args)
-        options = args.pop if Hash === args.last
-        _r 'mv', args, 2
-      end
-
-      def rm(*args)
-        options = args.pop if Hash === args.last
-        _r 'rm', args
-      end
-
-      def rm_r(*args)
-        options = args.pop if Hash === args.last
-        _r 'rm -r', args
-      end
-
-      def rm_rf(*args)
-        options = args.pop if Hash === args.last
-        _r 'rm -rf', args
-      end
-
-      def install(*args)
-        options = args.pop if Hash === args.last
-        _r 'install', args, 2
-      end
-
-      def chmod(*args)
-        options = args.pop if Hash === args.last
-        _r 'chmod', args
-      end
-
-      def chmod_R(*args)
-        options = args.pop if Hash === args.last
-        _r 'chmod -R', args
+        capture('pwd', :via => _via)
       end
 
-      def chown(*args)
-        options = args.pop if Hash === args.last
-        _r 'chown', args
+      FILE_TESTS.each do |m,t|
+        class_eval <<-EODEF
+          def #{m}(a, options={})
+            _t "test #{t}", a
+          end
+        EODEF
       end
 
-      def chown_R(*args)
-        options = args.pop if Hash === args.last
-        _r 'chown -R', args
-      end
-
-      def touch(*args)
-        options = args.pop if Hash === args.last
-        _r 'touch', args
-      end
-
-      def exists?(a)
-        _t "test -f", a
-      end
-
-      def directory?(a, options={:verbose=>false})
-        _t "test -d", a
-      end
-
-      def executable?(a, options={:verbose=>false})
-        _t "test -x", a
-      end
-
-
     private
 
       def _t(cmd, args=nil, min=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joekhoobyar-capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency