pa 1.1.4 → 1.2.0

data/lib/pa/path.rb

@@ -12,31 +12,11 @@ attribute absolute and dir return String, method absolute_path(), dirname() retu
 
 =end
 class Pa
-	NAME_EXT_PAT = /^(.+?)(?:\.([^.]+))?$/
   module Path
     extend Util::Concern
 
     module ClassMethods
-      # get path of an object. 
-      #
-      # return obj#path if object has a 'path' instance method
-      #
-      # nil -> nil
-      #
-      #
-      # @param [String,#path] obj
-      # @return [String,nil] path
-      def get(obj)
-        if obj.respond_to?(:path)
-          obj.path
-        elsif String === obj 
-          obj
-        elsif obj.nil?
-          nil
-        else
-          raise ArgumentError, "Pa.get() not support type -- #{obj.inspect}(#{obj.class})"
-        end
-      end
+      DELEGATE_METHODS = [:pwd, :dir, :absolute, :expand, :real, :parent]
 
       # return current work directory
       # @return [String] path
@@ -69,7 +49,6 @@ class Pa
         end
       end # def dsymlink?
 
-
       def dir2(path)
         File.dirname(path)
       end
@@ -88,13 +67,23 @@ class Pa
       def base2(name, o={})
         name = File.basename(get(name))
         if o[:ext]
-          name, ext = name.match(NAME_EXT_PAT).captures
+          name, ext = name.match(/^(.+?)(?:\.([^.]+))?$/).captures
           [ name, (ext || "")]
         else
           name
         end
       end
 
+      def base(*args, &blk)
+        rst = base2(*args, &blk)
+
+        if Array===rst
+          [ Pa(rst[0]), rst[1] ]
+        else
+          rst
+        end
+      end
+
       # ext of a path
       #
       # @example
@@ -108,6 +97,8 @@ class Pa
         ext
       end
 
+      alias ext ext2
+
       # alias from File.absolute_path
       # @param [String,Pa] path
       # @return [String]
@@ -131,6 +122,8 @@ class Pa
         get(path).sub /^#{Regexp.escape(ENV["HOME"])}/, "~"
       end
 
+      alias shorten shorten2
+
       # real path
       def real2(path) 
         File.realpath get(path)
@@ -148,171 +141,36 @@ class Pa
         end
         path
       end
-       
-      # split path
-      #
-      # @example
-      # 	path="/home/a/file"
-      # 	split2(path)  #=> "/home/a", "file"
-      # 	split2(path, :all => true)  #=> "/", "home", "a", "file"
-      #
-      # @param [String,Pa] name
-      # @param [Hash] o option
-      # @option o [Boolean] :all split all parts
-      # @return [Array<String>] 
-      def split2(name, o={})
-        dir, fname = File.split(get(name))
-        ret = Util.wrap_array(File.basename(fname))
-
-        if o[:all]
-          loop do
-            dir1, fname = File.split(dir)
-            break if dir1 == dir
-            ret.unshift fname
-            dir = dir1
-          end
-        end
-        ret.unshift dir
-        ret
-      end
-
-      # special case
-      def split(*args)
-        dir, *names = split2(*args)
-        [ Pa(dir), *names]
-      end
 
-      # join paths, skip nil and empty string.
-      #
-      # @param [*Array<String>] *paths
-      # @return [String]
-      def join2(*paths)
-        paths.map!{|v|get(v)}
-
-        # skip nil
-        paths.compact!
+      DELEGATE_METHODS.each { |mth|
+        mth2 = "#{mth}2"
 
-        # skip empty string
-        paths.delete("")
-
-        File.join(*paths)
-      end
+        class_eval <<-EOF
+          def #{mth}(*args, &blk)
+            Pa(Pa.#{mth2}(*args, &blk))
+          end
+        EOF
+      }
     end
 
     module InstanceMethods
-      # @return [String] 
-      attr_reader :absolute2, :dir2, :base2, :name2, :short2
-
-      # @return [String] ext "", "ogg"
-      attr_reader :ext2
-
-      # @return [String] ext "", ".ogg"
-      attr_reader :fext2
-
-      def initialize_variables
-        super
-        @absolute2 = File.absolute_path(@path) 
-        @dir2 = File.dirname(@path)
-        @base2 = File.basename(@path) 
-        @name2, @ext2 = @base2.match(NAME_EXT_PAT).captures
-        @ext2 ||= ""
-        @fext2 = @ext2.empty? ? "" : "."+@ext2
-      end
-
-      alias a2 absolute2
-      alias d2 dir2
-      alias	b2 base2
-      alias n2 name2
-      alias fname2 base2
-      alias fn2 fname2
-      alias e2 ext2
-      alias fe2 fext2
-
-      # fix name,2 => String
-      alias base base2
-      alias fname fname2
-      alias name name2
-      alias ext ext2
-      alias fext fext2
-
-      alias b base
-      alias fn fname
-      alias n name
-      alias e ext
-      alias fe fext
-
-      def short2
-        @short2 ||= Pa.shorten2(@path) 
-      end
-
-      # add string to path
-      # 
-      # @example 
-      #  pa = Pa('/home/foo/a.txt')
-      #  pa+'~' #=> new Pa('/home/foo/a.txt~')
-      #
-      # @param [String] str
-      # @return [Pa]
-      def +(str)
-        Pa(path+str)
-      end
-
-      # @return [String]
-      def sub2(*args, &blk)
-        path.sub(*args, &blk)
-      end
-
-      # @return [String]
-      def gsub2(*args, &blk)
-        path.gsub(*args, &blk)
-      end
-
-      # @return [Pa]
-      def sub(*args, &blk)
-        Pa(sub2(*args, &blk))
-      end
-
-      # @return [Pa]
-      def gsub(*args, &blk)
-        Pa(gsub2(*args, &blk))
-      end
-
-      # @return [Pa]
-      def sub!(*args,&blk)
-        self.replace path.sub(*args,&blk)
-      end
-
-      # @return [Pa]
-      def gsub!(*args,&blk)
-        self.replace path.gsub(*args,&blk)
-      end
-
-      # @return [MatchData]
-      def match(*args,&blk)
-        path.match(*args,&blk)
-      end 
-
-      # @return [Boolean]
-      def start_with?(*args)
-        path.start_with?(*args)
-      end
-
-      # @return [Boolean]
-      def end_with?(*args)
-        path.end_with?(*args)
-      end
+      DELEGATE_METHODS2 = [ :parent2 ]
+      DELEGATE_METHODS = [ :parent]
 
-      def =~(regexp)
-        path =~ regexp 
+      DELEGATE_METHODS2.each do |mth2|
+        class_eval <<-EOF
+          def #{mth2}(*args, &blk)
+            Pa.#{mth2}(path, *args, &blk)
+          end
+        EOF
       end
 
-      def ==(other)
-        case other
-        when Pa
-          self.path == other.path
-        else
-          false
-        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

@@ -1,10 +1,10 @@
 class Pa
   module State
     extend Util::Concern
-    module ClassMethods
-      # goes to File
-      FILE_DELEGATED_METHODS = [ :exists?, :atime, :ctime, :mtime, :stat, :lstat, :size, :zero?, :executable?, :executable_real?, :world_executable?, :readable?, :readable_real?, :world_readalbe?, :writeable?, :writeable_real?, :world_writeable?, :directory?, :file?, :blockdev?, :chardev?, :piple?, :socket?, :symlink?, :owned?, :grpowned?, :setgid?, :setuid?, :stricky?, :identical? ]
 
+    FILE_DELEGATED_METHODS = [ :exists?, :atime, :ctime, :mtime, :stat, :lstat, :size, :zero?, :executable?, :executable_real?, :world_executable?, :readable?, :readable_real?, :world_readalbe?, :writeable?, :writeable_real?, :world_writeable?, :directory?, :file?, :blockdev?, :chardev?, :piple?, :socket?, :symlink?, :owned?, :grpowned?, :setgid?, :setuid?, :stricky?, :identical? ]
+
+    module ClassMethods
       # delegated from File
       FILE_DELEGATED_METHODS.each { |name|
         module_eval <<-METHOD, __FILE__, __LINE__
@@ -64,7 +64,6 @@ class Pa
         end
       end # def type
 
-
       # is path a mountpoint?
       #
       # @param[String] path
@@ -82,6 +81,15 @@ class Pa
     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
+      }
+
       def chmod(mode)
         File.chmod(mode, path) 
       end

data/lib/pa/version.rb

@@ -1,3 +1,3 @@
 class Pa
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end