pa 1.3.0 → 1.3.1

data/lib/pa/cmd.rb

@@ -30,8 +30,10 @@ Pa.touch "a b c", :verbose => true
 class Pa
   module Cmd
     extend Util::Concern
+
+    DELEGATE_CLASS_METHODS = [ :home ]
+
     module ClassMethods
-      DELEGATE_METHODS = [ :home ]
 
       def home2
         Dir.home 
@@ -81,7 +83,7 @@ class Pa
 
       # @see File.readlink
       def readlink(path)
-        File.readlink(get(path)) 
+        File.readlink(File.absolute_path(get(path), ".")) # jruby rbx
       end
 
       # change directory
@@ -510,11 +512,13 @@ class Pa
 
           mkdir(File.dirname(p)) if o[:mkdir]
 
-          if Util.win32?
-            # win32 BUG. must f.write("") then file can be deleted.
-            File.open(p, "w"){|f| f.chmod(o[:mode]); f.write("")} 
+          if Util.windows?
+            # windows BUG. must f.write("") then file can be deleted.
+            File.open(p, "w"){|f| f.write("")}  # windows need f.write so that it can be delete.
+            File.chmod(o[:mode], p) # jruby can't use File#chmod
           else
-            File.open(p, "w"){|f| f.chmod(o[:mode])}
+            File.open(p, "w"){}
+            File.chmod(o[:mode], p) 
           end
         }
       end
@@ -544,6 +548,11 @@ class Pa
 
           puts "ln #{extra_doc}#{src} #{dest}" if o[:verbose] 
 
+          # jruby need absolute_path
+          if method == :link then
+            src, dest = File.absolute_path(src, "."), File.absolute_path(dest, ".") # rbx
+          end
+
           File.send(method, src, dest)
         }	
       end
@@ -580,7 +589,7 @@ class Pa
 
       # <name>.JNBNZG
       def _mktmpname(name=nil, o={})
-        o[:tmpdir] ||= ENV["TEMP"]
+        o[:tmpdir] ||= Dir.tmpdir
         name ||= $$
 
         begin
@@ -647,8 +656,8 @@ class Pa
         end
       end # _copy
 
-      DELEGATE_METHODS.each do |mth|
-        class_eval <<-EOF
+      DELEGATE_CLASS_METHODS.each do |mth|
+        eval <<-EOF
           def #{mth}(*args, &blk)
             Pa(#{mth}2(*args, &blk))
           end

data/lib/pa/directory.rb

@@ -128,7 +128,7 @@ class Pa
         if not File.directory?(rea_dir) 
           if o[:file]
             rea_path = rea_dir
-            blk.call dir, File.absolute_path(rea_path), File.basename(rea_path), nil, rea_path
+            blk.call dir, File.absolute_path(rea_path, "."), File.basename(rea_path), nil, rea_path # jruby rbx
             return
           else
             raise Errno::ENOTDIR, "`#{rea_dir}' is not a directoy."
@@ -146,9 +146,9 @@ class Pa
           next if not o[:dot] and entry=~/^\./
           next if not o[:backup] and entry=~/~$/
 
-          path = Util.join(dir, entry)
-          rea_path = Util.join(rea_dir, entry)
-          blk.call path, File.absolute_path(rea_path), File.basename(rea_path), err, rea_path
+          path = Util.join_path(dir, entry)
+          rea_path = Util.join_path(rea_dir, entry)
+          blk.call path, File.absolute_path(rea_path, "."), File.basename(rea_path), err, rea_path # jruby rbx
         end
       end
 
@@ -157,7 +157,7 @@ class Pa
 
         args, o = Util.extract_options(args)
         each2(*args, o) { |path, abs, fname, err, rea|
-          blk.call Pa(path), abs, fname, err, rea
+          blk.call Pa(path), abs, fname, err, rea # jruby need []
         }
       end
 
@@ -190,7 +190,7 @@ class Pa
 
         args, o = Util.extract_options(args)
         each2_r *args, o do |path, abs, rel, err, rea|
-          blk.call Pa(path, :rel => rel), abs, rel, err, rea
+          blk.call Pa(path, :rel => rel), abs, rel, err, rea # jruby need []
         end
       end
 
@@ -312,7 +312,7 @@ class Pa
           rel = File.join(*[relative, File.basename(path2)].compact)
           rea = o[:base_dir] ? File.join(get(o[:base_dir]), rel) : rel
 
-          blk.call path2, abs, rel, err, rea
+          blk.call path2, abs, rel, err, rea # jruby need []
 
           if File.directory?(abs)
             _each2_r(path2, rel, o, &blk)
@@ -321,16 +321,14 @@ class Pa
       end
     end
 
-    module InstanceMethods
-      DELEGATE_METHODS = [:each2, :each, :each2_r, :each_r, :ls2, :ls]
+    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
+    DELEGATE_METHODS.each { |mth|
+      class_eval <<-EOF
+        def #{mth}(*args, &blk)
+          Pa.#{mth}(path, *args, &blk)
+        end
+      EOF
+    }
   end
 end

data/lib/pa/path.rb

@@ -15,102 +15,140 @@ class Pa
   module Path
     extend Util::Concern
 
+    DELEGATE_CLASS_METHODS = [:pwd, :dir, :expand, :real, :parent, 
+      :relative_to, :shorten, :delete_ext, :add_ext ]
+
     module ClassMethods
-      DELEGATE_METHODS = [:pwd, :dir, :absolute, :expand, :real, :parent]
 
-      # return current work directory
+      # Return current work directory
+      #
       # @return [String] path
       def pwd2
         Dir.getwd 
       end
 
-      # is path an absolute path ?
+      # Is path an absolute path ?
       #
       # @param [String,Pa] path
       # @return [Boolean]
       def absolute?(path) 
-        path=get(path) 
-        File.absolute_path(path) == path 
+        p = get(path) 
+        File.absolute_path(p, ".") == p  # rbx
       end
 
-      # is path a dangling symlink?
+      # Is path a dangling symlink?
       #
       # a dangling symlink is a dead symlink.
       #
       # @param [String,Pa] path
       # @return [Boolean]
-      def dangling? path
-        path=get(path)
-        if File.symlink?(path)
-          src = File.readlink(path)
+      def dangling?(path)
+        p = get(path)
+
+        if File.symlink?(p)
+          src = File.readlink(p)
           not File.exists?(src)
         else
           nil
         end
-      end # def dsymlink?
+      end
 
-      def dir2(path)
-        File.dirname(path)
+      # Alias from File.expand_path
+      #
+      # @param [String,Pa] path
+      # @return [String]
+      def expand2(path) 
+        File.expand_path get(path) 
       end
 
-      # get a basename of a path
+      # Path relative_to? dir
       #
       # @example
-      #   Pa.basename("foo.bar.c", ext: true)  #=> \["foo.bar", "c"]
       #
-      # @param [String,Pa] name
-      # @param [Hash] o options
-      # @option o [Boolean, String] :ext (false) return \[name, ext] if true
-      #   
-      # @return [String] basename of a path unless o[:ext]
-      # @return [Array<String>] \[name, ext] if o[:ext].  
-      def base2(name, o={})
-        name = File.basename(get(name))
-        if o[:ext]
-          name, ext = name.match(/^(.+?)(?:\.([^.]+))?$/).captures
-          [ name, (ext || "")]
-        else
-          name
-        end
+      #   Pa.relative_to?("/home/foo", "/home")  -> true
+      #   Pa.relative_to?("/home1/foo", "/home")  -> false
+      #
+      def relative_to?(path, dir)
+        path_parts = Pa.split2(get(path), all: true)
+        dir_parts = Pa.split2(get(dir), all: true)
+
+        index = -1
+        dir_parts.all? {|part| 
+          index += 1
+          path_parts[index] == part
+        }
       end
 
-      def base(*args, &blk)
-        rst = base2(*args, &blk)
-
-        if Array===rst
-          [ Pa(rst[0]), rst[1] ]
+      # Delete the head.
+      #
+      # @example
+      #   
+      #   Pa.relative_to2("/home/foo", "/home") -> "foo"
+      #   Pa.relative_to2("/home/foo", "/home/foo") -> "."
+      #   Pa.relative_to2("/home/foo", "/bin") -> "/home/foo"
+      #
+      #   Pa.relative_to2("/home/foo", "/home/foo/") -> "."
+      #   Pa.relative_to2("/home/foo/", "/home/foo") -> "."
+      #
+      # @return [String]
+      def relative_to2(path, dir)
+        p = get(path)
+
+        if relative_to?(p, dir)
+          path_parts = Pa.split(p, all: true)
+          dir_parts = Pa.split(dir, all: true)
+          ret = File.join(*path_parts[dir_parts.length..-1])
+          ret == "" ? "." : ret
         else
-          rst
+          p
         end
       end
 
-      # ext of a path
+      # Return true if a path has the ext.
       #
       # @example
-      # 	"a.ogg" => "ogg"
-      # 	"a" => nil
       #
-      # @param [String,Pa] path
-      # @return [String]
-      def ext2 path
-        _, ext = get(path).match(/\.([^.]+)$/).to_a
-        ext
+      #   Pa.has_ext?("foo.txt", ".txt")   -> true
+      #   Pa.has_ext?("foo", ".txt")        -> false
+      #
+      def has_ext?(path, ext)
+        Pa.ext2(get(path)) == ext
       end
 
-      alias ext ext2
+      # Delete the tail.
+      #
+      # @example
+      #
+      #   Pa.delete_ext2("foo.txt", ".txt")      -> "foo"
+      #   Pa.delete_ext2("foo", ".txt")          -> "foo"
+      #   Pa.delete_ext2("foo.epub", ".txt")     -> "foo.epub"
+      #
+      def delete_ext2(path, ext)
+        p = get(path)
 
-      # alias from File.absolute_path
-      # @param [String,Pa] path
-      # @return [String]
-      def absolute2(path) 
-        File.absolute_path get(path)
+        if has_ext?(p, ext)
+          p[0...p.rindex(ext)]
+        else
+          p
+        end
       end
 
-      # alias from File.expand_path
-      # @param [String,Pa] path
-      # @return [String]
-      def expand2(path) 
-        File.expand_path get(path) 
+      # Ensure the tail
+      #
+      # @example
+      #
+      #  Pa.add_ext2("foo", ".txt")         -> "foo.txt"
+      #  Pa.add_ext2("foo.txt", ".txt")     -> "foo.txt"
+      #  Pa.add_ext2("foo.epub", ".txt")    -> "foo.txt.epub"
+      #
+      def add_ext2(path, ext)
+        p = get(path)
+
+        if Pa.ext2(p) == ext
+          p
+        else
+          "#{p}#{ext}"
+        end
       end
 
       # shorten2 a path,
@@ -119,10 +157,20 @@ class Pa
       # @param [String,Pa] path
       # @return [String]
       def shorten2(path)
-        get(path).sub /^#{Regexp.escape(ENV["HOME"])}/, "~"
-      end
+        p = get(path)
+        home = Pa.home2
 
-      alias shorten shorten2
+        return p if home.empty?
+
+        ret = relative_to2(p, home)
+
+        if ret == p
+          p
+        else
+          ret == "." ? "" : ret
+          File.join("~", ret)
+        end
+      end
 
       # real path
       def real2(path) 
@@ -142,36 +190,38 @@ class Pa
         path
       end
 
-      DELEGATE_METHODS.each { |mth|
+      DELEGATE_CLASS_METHODS.each { |mth|
         mth2 = "#{mth}2"
 
-        class_eval <<-EOF
+        eval <<-EOF
           def #{mth}(*args, &blk)
             Pa(Pa.#{mth2}(*args, &blk))
           end
         EOF
       }
+
+
+    private
+
     end
 
-    module InstanceMethods
-      DELEGATE_METHODS2 = [ :parent2 ]
-      DELEGATE_METHODS = [ :parent]
+    DELEGATE_METHODS2 = [ :parent2 ]
+    DELEGATE_METHODS = [ :parent]
 
-      DELEGATE_METHODS2.each do |mth2|
-        class_eval <<-EOF
-          def #{mth2}(*args, &blk)
-            Pa.#{mth2}(path, *args, &blk)
-          end
-        EOF
-      end
+    DELEGATE_METHODS2.each do |mth2|
+      class_eval <<-EOF
+        def #{mth2}(*args, &blk)
+          Pa.#{mth2}(path, *args, &blk)
+        end
+      EOF
+    end
 
-      DELEGATE_METHODS.each do |mth|
-        class_eval <<-EOF
-          def #{mth}(*args, &blk)
-            Pa(#{mth}2(*args, &blk))
-          end
-        EOF
-      end
+    DELEGATE_METHODS.each do |mth|
+      class_eval <<-EOF
+        def #{mth}(*args, &blk)
+          Pa(#{mth}2(*args, &blk))
+        end
+      EOF
     end
   end
 end

data/lib/pa/state.rb

@@ -80,35 +80,33 @@ class Pa
       end
     end
 
-    module InstanceMethods
-      # delegated from File
-      FILE_DELEGATED_METHODS.each { |name|
-        module_eval <<-METHOD, __FILE__, __LINE__
-          def #{name}(*args)
-            File.#{name}(*args, path)
-          end
-        METHOD
-      }
+    # delegated from File
+    FILE_DELEGATED_METHODS.each { |name|
+      module_eval <<-METHOD, __FILE__, __LINE__
+        def #{name}(*args)
+          File.#{name}(*args, path)
+        end
+      METHOD
+    }
 
-      def chmod(mode)
-        File.chmod(mode, path) 
-      end
+    def chmod(mode)
+      File.chmod(mode, path) 
+    end
 
-      def lchmod(mode)
-        File.lchmod(mode, path) 
-      end
+    def lchmod(mode)
+      File.lchmod(mode, path) 
+    end
 
-      def chown(uid, gid=nil)
-        File.chown(uid, gid, path) 
-      end
+    def chown(uid, gid=nil)
+      File.chown(uid, gid, path) 
+    end
 
-      def lchown(uid, gid=nil)
-        File.lchown(uid, gid, path) 
-      end
+    def lchown(uid, gid=nil)
+      File.lchown(uid, gid, path) 
+    end
 
-      def utime(atime, mtime)
-        File.utime(atime, mtime, path) 
-      end
+    def utime(atime, mtime)
+      File.utime(atime, mtime, path) 
     end
   end
 end