pa 1.1.4 → 1.2.0

data/Gemfile

@@ -1,9 +1,9 @@
-source "http://rubygems.org"
+source :rubygems
 
 group :development do
-	gem "thor"
-	gem "rspec"
-	gem "watchr"
+  gem "thor"
+  gem "rspec"
+  gem "watchr"
 end
 
 #gemspec

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    diff-lcs (1.1.3)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     thor (0.14.6)
     watchr (0.7)
 

data/lib/pa/cmd.rb

@@ -1,3 +1,5 @@
+require "securerandom"
+
 =begin
 rm family
 	* rm     _rm file only_
@@ -19,28 +21,26 @@ class Pa
       #
       # @param [Array<String>, String] src_s support globbing
       # @param [String,Pa] dest
-      # @param [Hash] o option
-      # @option o [Boolean] :force overwrite if exists.
       # @return [nil]
       def ln(src_s, dest, o={})
-        _ln(File.method(:link), src_s, dest, o) 
+        _ln(:link, src_s, dest, o) 
       end
 
       # ln force
       #
       # @see ln
       # @return [nil]
-      def ln_f(src_s, dest, o)
+      def ln_f(src_s, dest, o={})
         o[:force]=true
-        _ln(File.method(:link), src_s, dest, o) 
+        _ln(:link, src_s, dest, o) 
       end
 
       # symbol link
       #
       # @see ln
       # @return [nil]
-      def symln(src_s, dest, o)
-        _ln(File.method(:symlink), src_s, dest, o) 
+      def symln(src_s, dest, o={})
+        _ln(:symlink, src_s, dest, o) 
       end
       alias symlink ln
 
@@ -48,12 +48,11 @@ class Pa
       #
       # @see ln
       # @return [nil]
-      def symln_f(src_s, dest, o)
+      def symln_f(src_s, dest, o={})
         o[:force]=true
-        _ln(File.method(:symlink), src_s, dest, o) 
+        _ln(:symlink, src_s, dest, o) 
       end
 
-
       # @see File.readlink
       def readlink(path)
         File.readlink(get(path)) 
@@ -62,17 +61,25 @@ class Pa
       # change directory
       #
       # @param [String,Pa] path
-      def cd(path=ENV["HOME"], &blk)
-        Dir.chdir(get(path), &blk) 
+      # @param [Hash] o
+      # @option o [Boolean] :verbose verbose mode
+      def cd(path=ENV["HOME"], o={}, &blk)
+        p = get(path)
+        puts "cd #{p}" if o[:verbose]
+        Dir.chdir(p, &blk) 
       end
 
       # chroot
       # @see {Dir.chroot}
       #
       # @param [String] path
+      # @param [Hash] o
+      # @option o [Boolean] :verbose verbose mode
       # @return [nil]
-      def chroot(path)
-        Dir.chroot(get(path)) 
+      def chroot(path, o={})
+        p = get(path)
+        puts "chdroot #{p}" if o[:verbose]
+        Dir.chroot(p)
       end
 
       # touch a blank file
@@ -83,10 +90,11 @@ class Pa
       #   @option o [Fixnum,String] :mode
       #   @option o [Boolean] :mkdir auto mkdir if path contained directory not exists.
       #   @option o [Boolean] :force 
+      #   @option o [Boolean] :verbose 
       #   @return [nil]
       def touch(*args)
         paths, o = Util.extract_options(args)
-        _touch(*paths, o) 
+        _touch(paths, o) 
       end
 
       # touch force
@@ -96,8 +104,8 @@ class Pa
       #   @return [nil]
       def touch_f(*args)
         paths, o = Util.extract_options(args)
-        o[:force]=true
-        _touch(*paths, o) 
+        o[:force] = true
+        _touch(paths, o) 
       end
 
       # make a directory
@@ -107,6 +115,7 @@ class Pa
       #   @param [Hash] o option
       #   @option o [Fixnum] :mode
       #   @option o [Boolean] :force
+      #   @option o [Boolean] :verbose
       #   @return [nil]
       def mkdir(*args)
         paths, o = Util.extract_options(args)
@@ -126,45 +135,84 @@ class Pa
 
       # make temp directory
       #
-      # @param [Hash] o options
-      # @option o [Symbol] :prefix ("")
-      # @option o [Symbol] :suffix ("")
-      # @option o [Symbol] :tmpdir (ENV["TEMP"])
-      # @return [String] path
-      def mktmpdir(o={}, &blk) 
-        p = _mktmpname(o)
-        File.mkdir(p)
-        begin blk.call(p) ensure Dir.delete(p) end if blk
+      # @overload mktmpdir(name, o={}, &blk)
+      #   @param [Hash] o options
+      #   @option o [String] :tmpdir (ENV["TEMP"])
+      #   @option o [Symbol] :verbose
+      #   @return [String] path
+      # @overload mktmpdir(o={}, &blk) # name=$$
+      def mktmpdir(*args, &blk)
+        (name,), o = Util.extract_options(args)
+
+        p = _mktmpname(name, o)
+        puts "mktmpdir #{p}" if o[:verbose]
+
+        Dir.mkdir(p)
+
+        begin 
+          blk.call(p) 
+        ensure 
+          Dir.delete(p) 
+        end if blk
+
         p
       end # def mktmpdir
 
-      def home(user=nil)
+      def home
         Dir.home 
       end
 
       # make temp file
       # @see mktmpdir
       #
-      # @param [Hash] o options
-      # @return [String] path
-      def mktmpfile(o={}, &blk) 
-        p = _mktmpname(o) 
+      # @overload mktmpfile2(name=$$, o={}, &blk)
+      #   @param [Hash] o options
+      #   @option o [Boolean] :verbose
+      #   @option o [String] :tmpdir
+      #   @return [String] path
+      def mktmpfile2(*args, &blk) 
+        (name,), o = Util.extract_options(args)
+
+        p = _mktmpname(name, o) 
+        puts "mktmpfile #{p}" if o[:verbose]
+
         begin 
           blk.call(p) 
         ensure
           File.delete(p)
         end if blk
+
         p
-      end # mktmpfile
+      end
+
+      # @return [Pa] path
+      def mktmpfile(*args, &blk)
+        (name,), o = Util.extract_options(args)
+
+        p = _mktmpname(name, o) 
+        puts "mktmpfile #{p}" if o[:verbose]
+
+        begin 
+          blk.call(Pa(p)) 
+        ensure
+          File.delete(p)
+        end if blk
 
+        Pa(p)
+      end
 
       # rm file only
       #
-      # @param [String] *paths support globbing
+      # @overload rm(*paths, o={})
+      #   @param [String] *paths support globbing
+      #   @param o [Boolean] :verbose
       # @return [nil]
       def rm(*paths)
         paths, o = Util.extract_options(paths)
         glob(*paths) { |pa|
+          extra_doc = o[:force] ? "-f " : nil
+          puts "rm #{extra_doc}#{pd.p}" if o[:verbose]
+
           if File.directory?(pa.p)
             if o[:force]
               next 
@@ -190,6 +238,9 @@ class Pa
       def rmdir(*paths)
         paths, o = Util.extract_options(paths)
         glob(*paths) { |pa|
+          extra_doc = o[:force] ? "-f " : nil
+          puts "rmdir #{extra_doc}#{pa.p}" if o[:verbose]
+
           if not File.directory?(pa.p)
             if o[:force]
               next 
@@ -212,7 +263,9 @@ class Pa
       # @see rm
       # @return [nil]
       def rm_r(*paths)
+        paths, o = Util.extract_options(paths)
         glob(*paths){ |pa|
+          puts "rm -r #{pa.p}" if o[:verbose]
           File.directory?(pa.p)  ? _rmdir(pa) : File.delete(pa.p)
         }
       end
@@ -231,8 +284,9 @@ class Pa
       # @yieldreturn [Boolean] rm_r path if true
       # @return [nil]
       def rm_if(*paths, &blk)
+        paths, o = Util.extract_options(paths)
         glob(*paths) do |pa|
-          rm_r pa if blk.call(pa)
+          rm_r pa, o if blk.call(pa)
         end
       end
 
@@ -295,23 +349,6 @@ class Pa
         cp src_s, dest, o, &blk
       end
 
-
-      # a rename util 
-      #
-      # @example
-      #
-      #   Pa.rename2('/home/guten.jpg') {|pa| pa.name+'_1'+pa.fext} # => '/home/guten_1.jpg'
-      #
-      # @param [String,Pa] src
-      # @yieldparam [Pa] pa 
-      # @yieldreturn [String] fname 
-      # @return [String,Pa] # Pa.rename return String. Pa#rename return Pa.
-      def rename2(src, &blk)
-        src = Pa(src)
-        fname = blk.call(src)
-        src.dir.join(fname).path
-      end
-
       # move, use rename for same device. and cp for cross device.
       # @see cp
       #
@@ -383,9 +420,12 @@ class Pa
       def _touch(paths, o)
         o[:mode] ||= 0644
         paths.map!{|v|get(v)}
-        paths.each {|path|
-          if File.exists?(path) 
-            o[:force] ? next : raise(Errno::EEXIST, "File exist -- #{path}")
+        paths.each {|p|
+          extra_doc = o[:force] ? "-f " : nil
+          puts "touch #{extra_doc}#{p}" if o[:verbose]
+
+          if File.exists?(p) 
+            o[:force] ? next : raise(Errno::EEXIST, "File exist -- #{p}")
           end
 
           mkdir(File.dirname(p)) if o[:mkdir]
@@ -399,22 +439,29 @@ class Pa
         }
       end
 
-        # @param [Array,String,#path] src_s
-        # @param [String,#path] dest
-        def _ln(method, src_s, dest, o={})
-          dest = get(dest)
-          glob(*Util.wrap_array(src_s)) {|src|
-            src = get(src)
-            dest = File.join(dest, File.basename(src)) if File.directory?(dest)
-            Pa.rm_r(dest) if o[:force] and File.exists?(dest)
-            method.call(src, dest)
-          }	
-        end
+      # @param [Array,String,#path] src_s
+      # @param [String,#path] dest
+      def _ln(method, src_s, dest, o={})
+        dest = get(dest)
+        glob(*Util.wrap_array(src_s)) {|src|
+          src = get(src)
+          dest = File.join(dest, File.basename(src)) if File.directory?(dest)
+          Pa.rm_r(dest) if o[:force] and File.exists?(dest)
+          extra_doc = "" 
+          extra_doc << (method==:symlink ? "-s " : "")
+          extra_doc << (o[:force] ? "-f " : "")
+          puts "ln #{extra_doc}#{src} #{dest}" if o[:verbose]
+
+          File.send(method, src, dest)
+        }	
+      end
 
       def _mkdir(paths, o)
         o[:mode] ||= 0744
         paths.map!{|v|get(v)}
         paths.each {|p|
+          puts "mkdir #{p}" if o[:verbose]
+
           if File.exists?(p)
             o[:force] ? next : raise(Errno::EEXIST, "File exist -- #{p}")
           end
@@ -433,23 +480,15 @@ class Pa
         }
       end
 
-      def _mktmpname(o={})
-        # :prefix :suffix :tmpdir
-        # $$-(time*100_000).to_i.to_s(36)
-        # parse o
-        o[:dir] ||= ENV["TEMP"]
-        o[:prefix] ||= ""
-        o[:suffix] ||= ""
-
-        # begin
-        collision = 0
-        path = "#{o[:dir]}/#{o[:prefix]}#{$$}-#{(Time.time*100_000).to_i.to_s(36)}"
-        orgi_path = path.dup
-        while File.exists?(path)
-          path = orgi_path+ collision.to_s
-          collision +=1
-        end
-        path << o[:suffix]
+      # <name>.JNBNZG
+      def _mktmpname(name=nil, o={})
+        o[:tmpdir] ||= ENV["TEMP"]
+        name ||= $$
+
+        begin
+          random = SecureRandom.hex(3).upcase
+          path = "#{o[:tmpdir]}/#{name}.#{random}"
+        end while File.exists?(path)
 
         path
       end # def mktmpname
@@ -458,7 +497,7 @@ class Pa
       # param@ [Pa] path
       def _rmdir(pa, o={})
         return if not File.exists?(pa.p)
-        pa.each {|pa1|
+        Pa.each(pa) {|pa1|
           File.directory?(pa1.p) ? _rmdir(pa1, o) : File.delete(pa1.p)
         }
         File.directory?(pa.p) ? Dir.rmdir(pa.p) : File.delete(pa.p)
@@ -479,8 +518,7 @@ class Pa
 
         when "directory"
           begin
-            Pa.mkdir dest
-            puts "mkdir #{dest}" if o[:verbose]
+            Pa.mkdir dest, :verbose => o[:verbose]
           rescue Errno::EEXIST
           end
 
@@ -494,8 +532,7 @@ class Pa
           if o[:folsymlink] 
             _copy(Pa.readlink(src), dest) 
           else
-            Pa.symln(Pa.readlink(src), dest, force: true)	
-            puts "symlink #{src} #{dest}" if o[:verbose]
+            Pa.symln(Pa.readlink(src), dest, :force => true, :verbose => o[:verbose])	
           end
 
         when "unknow"

data/lib/pa/directory.rb

@@ -72,6 +72,14 @@ class Pa
         ret
       end
 
+      def tmpdir2
+        Dir.tmpdir
+      end
+
+      def tmpdir
+        Pa(Dir.tmpdir)
+      end
+
       # is directory empty?
       #
       # @param [String] path
@@ -96,8 +104,9 @@ class Pa
       # @overload each(path=".", o={})
       #   @param [String,Pa] path
       #   @prarm [Hash] o
-      #   @option o [Boolean] :nodot (false) include dot file
-      #   @option o [Boolean] :nobackup (false) include backup file
+      #   @option o [Boolean] :dot (true) include dot file
+      #   @option o [Boolean] :backup (true) include backup file
+      #   @option o [Boolean] :absolute (false) return absolute path
       #   @option o [Boolean] :error (false) yield(pa, err) instead of raise Errno::EPERM when Dir.open(dir)
       #   @return [Enumerator<String>]
       # @overload each(path=".", o={})
@@ -107,6 +116,8 @@ class Pa
         return Pa.to_enum(:each2, *args) unless blk
 
         (path,), o = Util.extract_options(args)
+        o = {dot: true, backup: true}.merge(o)
+
         path = path ? get(path) : "."
         raise Errno::ENOENT, "`#{path}' doesn't exists."  unless File.exists?(path)
         raise Errno::ENOTDIR, "`#{path}' not a directoy."  unless File.directory?(path)
@@ -119,20 +130,27 @@ class Pa
 
         while (entry=dir.read)
           next if %w(. ..).include? entry
-          next if o[:nodot] and entry=~/^\./
-          next if o[:nobackup] and entry=~/~$/
+          next if not o[:dot] and entry=~/^\./
+          next if not o[:backup] and entry=~/~$/
+
+          p = if o[:absolute]
+            File.absolute_path(File.join(path, entry))
+          else
+            # => "foo" not "./foo"
+             path=="." ? entry : File.join(path, entry)
+          end
 
-          # => "foo" not "./foo"
-          pa = path=="." ? entry : File.join(path, entry)
-          blk.call pa, err  
+          blk.call p, err  
           end
         end
 
       def each(*args, &blk)
+        return Pa.to_enum(:each, *args) unless blk
+
         args, o = Util.extract_options(args)
-        each2 *args, o do |path, err|
+        each2(*args, o) { |path, err|
           blk.call Pa(path), err
-        end
+        }
       end
 
       # each with recursive
@@ -181,11 +199,16 @@ class Pa
       #   @yieldparam [String] fname
       #   @return [Array<String>]
       def ls2(*args, &blk)
+        (path,), o = Util.extract_options(args)
+        path ||= "."
         blk ||= proc { true }
-        each2(*args).with_object([]) { |(path),m| 
+
+        each2(path, o).with_object([]) { |(path),m| 
           base = File.basename(path)
-          ret = blk.call(path, base)
-          m << base if ret
+
+          blk_ret = blk.call(path, base)
+          file = o[:absolute] ? path : base
+          m << file if blk_ret
         }
       end
 
@@ -196,16 +219,17 @@ class Pa
       #   @yieldparam [String] fname
       #   @return [Array<String>]
       def ls(*args, &blk)
-        args, o = Util.extract_options(args)
+        (path,), o = Util.extract_options(args)
+        path ||= "."
         blk ||= proc { true }
-        ret = []
 
-        ls2 *args do |path, fname|
-          rst = blk.call(Pa(path), fname)
-          ret << fname if rst 
-        end
+        each2(path, o).with_object([]) { |(path), m|
+          base = File.basename(path)
 
-        ret
+          blk_ret = blk.call(Pa(path), base)
+          file = o[:absolute] ? path : base
+          m << Pa(file) if blk_ret
+        }
       end
 
       # ls2 with recursive
@@ -247,5 +271,17 @@ class Pa
         end
       end
     end
+
+    module InstanceMethods
+      DELEGATE_METHODS = [:each2, :each, :each2_r, :each_r, :ls2, :ls]
+
+      DELEGATE_METHODS.each { |mth|
+        class_eval <<-EOF
+          def #{mth}(*args, &blk)
+            Pa.#{mth}(path, *args, &blk)
+          end
+        EOF
+      }
+    end
   end
 end