pa 1.1.3 → 1.1.4

data/Gemfile.lock

@@ -2,7 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -18,7 +17,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake
   rspec
   thor
   watchr

data/lib/pa.rb

@@ -75,7 +75,7 @@ class Pa
       # dir -> dir2
       name2 = "#{name}2".to_sym
       if public_methods.include?(name2)
-        ret = __send__(name2, *args)
+        ret = __send__(name2, *args, &blk)
         return case ret
         when Array
           ret.map{|v| Pa(v)}
@@ -130,17 +130,7 @@ class Pa
 
 	# missing method goes to Pa.class-method 
 	def method_missing(name, *args, &blk)
-		ret = self.class.__send__(name, path, *args, &blk)
-
-		case ret	
-		# e.g. readlink ..
-		when String
-			Pa(ret)
-		# e.g. directory? 
-		else
-			ret
-		end
-
+		self.class.__send__(name, path, *args, &blk)
 	end
 
 	def <=> other
@@ -158,16 +148,15 @@ end
 
 require "pa/path"
 require "pa/cmd"
-require "pa/dir"
+require "pa/directory"
 require "pa/state"
 class Pa
   include Path
-  include Dir
+  include Directory
   include State
   include Cmd
 end
 
-
 module Kernel
 private
 	# a very convient function.

data/lib/pa/cmd.rb

@@ -59,12 +59,11 @@ class Pa
         File.readlink(get(path)) 
       end
 
-
       # change directory
       #
       # @param [String,Pa] path
       def cd(path=ENV["HOME"], &blk)
-        ::Dir.chdir(get(path), &blk) 
+        Dir.chdir(get(path), &blk) 
       end
 
       # chroot
@@ -73,7 +72,7 @@ class Pa
       # @param [String] path
       # @return [nil]
       def chroot(path)
-        ::Dir.chroot(get(path)) 
+        Dir.chroot(get(path)) 
       end
 
       # touch a blank file
@@ -135,12 +134,12 @@ class Pa
       def mktmpdir(o={}, &blk) 
         p = _mktmpname(o)
         File.mkdir(p)
-        begin blk.call(p) ensure ::Dir.delete(p) end if blk
+        begin blk.call(p) ensure Dir.delete(p) end if blk
         p
       end # def mktmpdir
 
       def home(user=nil)
-        ::Dir.home 
+        Dir.home 
       end
 
       # make temp file
@@ -301,14 +300,13 @@ class Pa
       #
       # @example
       #
-      #   Pa.rename('/home/guten.jpg') {|pa| pa.name+'_1'+pa.fext} # => '/home/guten_1.jpg'
-      #   Pa('/home/guten.jpg').rename {|pa| pa.name+'_1'+pa.fext} # => <#Pa('/home/guten_1.jpg')>
+      #   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 rename(src, &blk)
+      def rename2(src, &blk)
         src = Pa(src)
         fname = blk.call(src)
         src.dir.join(fname).path
@@ -429,7 +427,7 @@ class Pa
           end
 
           stack.reverse.each do |path|
-            ::Dir.mkdir(path)
+            Dir.mkdir(path)
             File.chmod(o[:mode], path)
           end
         }
@@ -463,7 +461,7 @@ class Pa
         pa.each {|pa1|
           File.directory?(pa1.p) ? _rmdir(pa1, o) : File.delete(pa1.p)
         }
-        File.directory?(pa.p) ? ::Dir.rmdir(pa.p) : File.delete(pa.p)
+        File.directory?(pa.p) ? Dir.rmdir(pa.p) : File.delete(pa.p)
       end
 
       # I'm recursive 

data/lib/pa/{dir.rb → directory.rb}

@@ -20,7 +20,7 @@
 
 =end
 class Pa
-  module Dir
+  module Directory
     extend Util::Concern
 
     module ClassMethods
@@ -40,32 +40,36 @@ class Pa
       def glob2(*args, &blk)
         paths, o = Util.extract_options(args)
         paths.map!{|v|get(v)}
+        blk ||= proc { |path| path }
 
         flag = 0
         o.each do |option, value|
-          next if option==:use_pa
           flag |= File.const_get("FNM_#{option.upcase}") if value
         end
 
-        ret = ::Dir.glob(paths, flag)
+        files = Dir.glob(paths, flag)
 
         # delete . .. for '.*'
-        %w(. ..).each {|v| ret.delete(v)}
-        ret = ret.map{|v| Pa(v)} if o[:use_pa]
-
-        if blk
-          ret.each {|pa|
-            blk.call pa
-          }
-        else
-          ret
-        end
+        %w(. ..).each {|v| files.delete(v)}
+
+        ret = []
+        files.each { |path|
+          ret << blk.call(path)
+        }
+
+        ret
       end
 
       def glob(*args, &blk)
         args, o = Util.extract_options(args)
-        o[:use_pa] = true
-        glob2(*args, o, &blk)
+        ret = []
+        blk ||= proc { |path| path }
+
+        glob2 *args, o do |path|
+          ret << blk.call(Pa(path))
+        end
+
+        ret
       end
 
       # is directory empty?
@@ -73,7 +77,7 @@ class Pa
       # @param [String] path
       # @return [Boolean]
       def empty?(path)
-        ::Dir.entries(get(path)).empty? 
+        Dir.entries(get(path)).empty? 
       end
 
       # traverse directory 
@@ -108,7 +112,7 @@ class Pa
         raise Errno::ENOTDIR, "`#{path}' not a directoy."  unless File.directory?(path)
 
         begin
-          dir = ::Dir.open(path)
+          dir = Dir.open(path)
         rescue Errno::EPERM => err
         end
         raise err if err and !o[:error]
@@ -120,19 +124,15 @@ class Pa
 
           # => "foo" not "./foo"
           pa = path=="." ? entry : File.join(path, entry)
-          pa = Pa(pa) if o[:use_pa]
-          if o[:error]
-            blk.call pa, err  
-          else
-            blk.call pa
+          blk.call pa, err  
           end
         end
-      end
 
       def each(*args, &blk)
         args, o = Util.extract_options(args)
-        o[:use_pa] = true
-        each2(*args, o, &blk)
+        each2 *args, o do |path, err|
+          blk.call Pa(path), err
+        end
       end
 
       # each with recursive
@@ -158,9 +158,12 @@ class Pa
       end
 
       def each_r(*args, &blk)
+        return Pa.to_enum(:each_r, *args) if not blk
+
         args, o = Util.extract_options(args)
-        o[:use_pa] = true
-        each2_r(*args, o, &blk)
+        each2_r *args, o do |path, err|
+          blk.call Pa(path), err
+        end
       end
 
       # list directory contents
@@ -178,18 +181,31 @@ class Pa
       #   @yieldparam [String] fname
       #   @return [Array<String>]
       def ls2(*args, &blk)
-        blk ||= proc {true}
-        each2(*args).with_object([]) { |path,m| 
+        blk ||= proc { true }
+        each2(*args).with_object([]) { |(path),m| 
           base = File.basename(path)
           ret = blk.call(path, base)
           m << base if ret
         }
       end
 
+      # @overload ls(path=".", o={})
+      # 	@return [Array<Pa>]
+      # @overload ls(path=".", o={})
+      #   @yieldparam [Pa] path
+      #   @yieldparam [String] fname
+      #   @return [Array<String>]
       def ls(*args, &blk)
         args, o = Util.extract_options(args)
-        o[:use_pa] = true
-        ls2(*args, o, &blk)
+        blk ||= proc { true }
+        ret = []
+
+        ls2 *args do |path, fname|
+          rst = blk.call(Pa(path), fname)
+          ret << fname if rst 
+        end
+
+        ret
       end
 
       # ls2 with recursive
@@ -217,16 +233,16 @@ class Pa
       # @param [String] path
       def _each2_r(path, relative, o, &blk)
         o.merge!(error: true)
-        Pa.each2(path, o) do |path1, err|
+
+        Pa.each2(path, o) do |path2, err|
           # fix for File.join with empty string
-          joins=[ relative=="" ? nil : relative, File.basename(path1)].compact
-          relative1 = File.join(*joins)
+          joins=[ relative=="" ? nil : relative, File.basename(path2)].compact
+          relative2 = File.join(*joins)
 
-          path1 = Pa(path1) if o[:use_pa]
-          blk.call path1, relative1, err
+          blk.call path2, relative2, err
 
-          if File.directory?(path1)
-            _each2_r(path1, relative1, o, &blk)
+          if File.directory?(path2)
+            _each2_r(path2, relative2, o, &blk)
           end
         end
       end

data/lib/pa/ext.rb

@@ -0,0 +1,35 @@
+# add Pa support in Marshal
+module Marshal 
+  class <<self
+
+    alias :original_load :load
+
+    # add support with Pa
+    #
+    #   Marshal.load(Pa(path))
+    #
+    # @param [IO,String,Pa] obj
+    # @return [String]
+    def load(obj) original_load Pa===obj ? File.read(obj.p) : obj end
+
+    alias :original_dump :dump
+
+    # add support with Pa
+    #
+    #   Marshal.dump(obj, Pa(path))
+    #   dump(con, [obj], limit=-1)
+    #
+    # @param [String,Pa] obj
+    # @return [String]
+    def dump(obj, *args)
+      case args[0]
+      when String, Pa
+        path = String===args[0] ? args[0] : args[0].p
+        open(path, "wb"){|f| f.write(original_dump(con))}
+      else
+        original_dump con, *args
+      end
+    end
+
+  end
+end

data/lib/pa/path.rb

@@ -15,11 +15,15 @@ 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)
@@ -27,8 +31,10 @@ class Pa
           obj.path
         elsif String === obj 
           obj
+        elsif obj.nil?
+          nil
         else
-          raise Error, "not support type -- #{obj.inspect}(#{obj.class})"
+          raise ArgumentError, "Pa.get() not support type -- #{obj.inspect}(#{obj.class})"
         end
       end
 
@@ -38,6 +44,32 @@ class Pa
         Dir.getwd 
       end
 
+      # is path an absolute path ?
+      #
+      # @param [String,Pa] path
+      # @return [Boolean]
+      def absolute?(path) 
+        path=get(path) 
+        File.absolute_path(path) == path 
+      end
+
+      # 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)
+          not File.exists?(src)
+        else
+          nil
+        end
+      end # def dsymlink?
+
+
       def dir2(path)
         File.dirname(path)
       end
@@ -76,40 +108,53 @@ class Pa
         ext
       end
 
-
       # alias from File.absolute_path
       # @param [String,Pa] path
       # @return [String]
-      def absolute2(path); File.absolute_path(get(path)) end
+      def absolute2(path) 
+        File.absolute_path get(path)
+      end
 
       # alias from File.expand_path
       # @param [String,Pa] path
       # @return [String]
-      def expand2(path); File.expand_path(get(path)) end
+      def expand2(path) 
+        File.expand_path get(path) 
+      end
 
       # shorten2 a path,
       # convert /home/user/file to ~/file
       #
       # @param [String,Pa] path
       # @return [String]
-      def shorten2(path);
-        get(path).sub(%r!^#{Regexp.escape(ENV["HOME"])}!, "~")
+      def shorten2(path)
+        get(path).sub /^#{Regexp.escape(ENV["HOME"])}/, "~"
       end
 
+      # real path
+      def real2(path) 
+        File.realpath get(path)
+      end
 
-
-      # is path an absolute path ?
-      #
+      # get parent path
+      # 
       # @param [String,Pa] path
-      # @return [Boolean]
-      def absolute?(path) path=get(path); File.absolute_path(path) == path end
+      # @param [Fixnum] n up level
+      # @return [String]
+      def parent2(path, n=1)
+        path = get(path)
+        n.times do
+          path = File.dirname(path)
+        end
+        path
+      end
        
       # split path
       #
       # @example
       # 	path="/home/a/file"
-      # 	split(path)  #=> "/home/a", "file"
-      # 	split(path, :all)  #=> "/", "home", "a", "file"
+      # 	split2(path)  #=> "/home/a", "file"
+      # 	split2(path, :all => true)  #=> "/", "home", "a", "file"
       #
       # @param [String,Pa] name
       # @param [Hash] o option
@@ -117,7 +162,7 @@ class Pa
       # @return [Array<String>] 
       def split2(name, o={})
         dir, fname = File.split(get(name))
-        ret = Util.wrap_array(basename(fname, o))
+        ret = Util.wrap_array(File.basename(fname))
 
         if o[:all]
           loop do
@@ -131,6 +176,7 @@ class Pa
         ret
       end
 
+      # special case
       def split(*args)
         dir, *names = split2(*args)
         [ Pa(dir), *names]
@@ -151,38 +197,6 @@ class Pa
 
         File.join(*paths)
       end
-
-      # get parent path
-      # 
-      # @param [String,Pa] path
-      # @param [Fixnum] n up level
-      # @return [String]
-      def parent2(path, n=1)
-        path = get(path)
-        n.times do
-          path = File.dirname(path)
-        end
-        path
-      end
-
-      # 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)
-          not File.exists?(src)
-        else
-          nil
-        end
-      end # def dsymlink?
-
-      # real path
-      def real2(path) File.realpath(get(path)) end
     end
 
     module InstanceMethods
@@ -215,11 +229,13 @@ class Pa
       alias fe2 fext2
 
       # fix name,2 => String
-      alias name name2
+      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
@@ -242,13 +258,23 @@ class Pa
       end
 
       # @return [String]
-      def sub2(*args,&blk)
-        path.sub(*args,&blk)
+      def sub2(*args, &blk)
+        path.sub(*args, &blk)
       end
 
       # @return [String]
-      def gsub2(*args,&blk)
-        path.gsub(*args,&blk)
+      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]

data/lib/pa/state.rb

@@ -3,11 +3,16 @@ class Pa
     extend Util::Concern
     module ClassMethods
       # goes to File
-      [ :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?, :dangling?, :owned?, :grpowned?, :setgid?, :setuid?, :stricky?, :identical? ].each do |name|
-        define_method(name) { |*args|
-          File.__send__ name, *args
-        }
-      end
+      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? ]
+
+      # delegated from File
+      FILE_DELEGATED_METHODS.each { |name|
+        module_eval <<-METHOD, __FILE__, __LINE__
+          def #{name}(*args)
+            File.#{name}(*args)
+          end
+        METHOD
+      }
 
       # @see File.chmod
       def chmod(mode, *paths)

data/lib/pa/version.rb

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

data/spec/pa/cmd_spec.rb

@@ -134,7 +134,7 @@ describe Pa do
 
 		it "_copy directory" do
 			Pa._copy 'dir', 'dirc'
-			Dir.entries('dirc').should == Dir.entries('dir')
+			Dir.entries('dirc').sort.should == Dir.entries('dir').sort
 		end
 
 		context "with :symlink" do
@@ -269,11 +269,10 @@ describe Pa do
 		end
 	end
 
-	describe ".rename" do
+	describe ".rename2" do
 		it "works" do
-			Pa.rename('/home/guten.jpg') {|pa|
-				pa.name+'_1'+pa.fext
-			}.should == '/home/guten_1.jpg'
+			a = Pa.rename2('/home/guten.jpg') {|pa| pa.name+'_1'+pa.fext }
+      a.should == '/home/guten_1.jpg'
 		end
 	end
 
@@ -284,6 +283,4 @@ describe Pa do
 			}.should == Pa('/home/guten_1.jpg')
 		end
 	end
-
-
 end

data/spec/pa/{dir_spec.rb → directory_spec.rb}

@@ -29,17 +29,17 @@ describe Pa do
 			FileUtils.rm @files
 		end
 
-		context "call without any option" do
-			it "returns 1 items" do
-				Pa.glob2("*").should have(1).items
-			end
-		end
+    it "returns 1 items" do
+      Pa.glob2("*").should have(1).items
+    end
 
-		context "call with :dotmatch option" do
-			it "returns 2 items" do
-				Pa.glob2("*", dotmatch: true).should have(2).items
-			end
-		end
+    it "returns 2 items with :dotmatch" do
+      Pa.glob2("*", dotmatch: true).should have(2).items
+    end
+
+    it "#glob returns Pa instead" do
+      Pa.glob("*")[0].should be_an_instance_of Pa
+    end
 	end
 
 	describe "#each2" do
@@ -77,13 +77,19 @@ describe Pa do
 		end
 
 		it "each2(.) return 'foo' not '.foo'" do 
-			Pa.each2.with_object([]){|pa,m| m<<pa}.sort.should == %w(.fa dira fa fa~)
+			Pa.each2.with_object([]){|(pa),m| m<<pa}.sort.should == %w(.fa dira fa fa~)
 		end
 
 		it "each2(nodot: true) -> list all files except dot file" do
-			Pa.each2(nodot: true).with_object([]){|pa,m|m<<pa}.sort.should == %w(dira fa fa~)
+			Pa.each2(nodot: true).with_object([]){|(pa),m|m<<pa}.sort.should == %w(dira fa fa~)
 		end
 
+    it "each returns Pa" do
+      Pa.each { |pa|
+        pa.should be_an_instance_of Pa
+        break
+      }
+    end
 	end
 
 	describe "#each2_r" do
@@ -106,8 +112,14 @@ describe Pa do
 			Pa.each2_r.should be_an_instance_of Enumerator
 		 	Pa.each2_r.with_object([]){|(pa,r),m|m<<r}.sort.should == %w(.fa dira dira/dirb dira/dirb/b fa fa~)
 		end
-	end
 
+    it "#each_r returns Pa" do
+      Pa.each_r { |pa|
+        pa.should be_an_instance_of Pa
+        break
+      }
+    end
+	end
 
 	describe "#ls2" do
 		# filea 
@@ -131,5 +143,10 @@ describe Pa do
 		it "call a block" do
 			Pa.ls2 { |pa, fname| File.directory?(pa)  }.should == ["dira"]
 		end
+
+    it "#ls returns string" do
+      Pa.ls[0].should be_an_instance_of String
+    end
 	end
 end
+

data/spec/pa/path_spec.rb

@@ -1,120 +1,247 @@
-require "spec_helper"
+require 'spec_helper'
+
+class T_FakePath
+  def path
+    "hello"
+  end
+end
 
 describe Pa do
-  context "dir and dir2" do
-    it "#dir => Pa" do
-      Pa.dir("/home/guten").should be_an_instance_of Pa
+  context 'dir and dir2' do
+    it '#dir => Pa' do
+      Pa.dir('/home/guten').should be_an_instance_of Pa
     end
 
-    it "#dir2 => Pa" do
-      Pa.dir2("/home/guten").should be_an_instance_of String
+    it '#dir2 => Pa' do
+      Pa.dir2('/home/guten').should be_an_instance_of String
     end
-
   end
 
-	describe ".shorten2" do
-		it "short /home/usr/file into ~/file" do
-			ENV["HOME"] = "/home/foo"
-			Pa.shorten2("/home/foo/file").should == "~/file"
+	describe 'NAME_EXT_PAT' do
+		it 'matchs `foo.bar`' do
+			'foo.bar'.match(Pa::NAME_EXT_PAT).captures.should == %w(foo bar)
 		end
 
-		it "not short /home/other-user/file" do
-			ENV["HOME"] = "/home/foo"
-			Pa.shorten2("/home/bar/file").should == "/home/bar/file"
+		it 'matchs `foo`' do
+			'foo'.match(Pa::NAME_EXT_PAT).captures.should == ['foo', nil]
 		end
 	end
 
-	describe "NAME_EXT_PAT" do
-		it "matchs `foo.bar'" do
-			"foo.bar".match(Pa::NAME_EXT_PAT).captures.should == %w(foo bar)
-		end
+  describe '.get' do
+    it 'get path from a path object' do
+      Pa.get(T_FakePath.new).should == 'hello'
+    end
 
-		it "matchs `foo'" do
-			"foo".match(Pa::NAME_EXT_PAT).captures.should == ["foo", nil]
-		end
+    it 'get path from a string' do
+      Pa.get('foo').should == 'foo'
+    end
 
+    it 'get nil from nil' do
+      Pa.get(nil).should == nil
+    end
+
+    it 'otherwise raise ArgumentError' do
+      lambda { Pa.get([]) }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe '.absolute?' do
+    it 'is true if path is a absolute path' do
+      Pa.absolute?('/').should == true
+    end
+
+    it 'is false if path is a relative path' do
+      Pa.absolute?('.').should == false
+    end
+  end
+
+  describe '.dangling?' do 
+    it 'works' do
+      olddir=Dir.pwd
+      Dir.chdir("#{$specdir}/data/tmp")
+
+      begin
+        File.open('fa', 'w'){|f| f.puts "guten" }
+        File.symlink('fa', 'symlink')
+        File.symlink('fb', 'dangling')
+
+        Pa.dangling?('symlink').should be_false
+        Pa.dangling?('dangling').should be_true
+      ensure
+        FileUtils.rm_r Dir.glob("*")
+        Dir.chdir(olddir)
+      end
+    end
+  end
+
+  describe '.pwd2' do
+    olddir = Dir.getwd
+    Dir.chdir('/tmp')
+    begin
+      Pa.pwd2.should == '/tmp'
+    ensure
+      Dir.chdir(olddir)
+    end
+  end
+
+  describe '.dir2' do
+    it "get a path's directory name" do
+      Pa.dir2('/home/guten').should == '/home'
+    end
+  end
+
+	describe '.base2' do
+		it 'get name, ext with :ext => true' do
+			Pa.base2('/home/foo.bar', ext: true).should == ['foo', 'bar']
+		end
 	end
 
-	describe ".base2" do
-		it "get name, ext with :ext => true" do
-			Pa.base2("/home/foo.bar", ext: true).should == ["foo", "bar"]
+  describe '.ext2' do
+    it "get a path's extension" do
+      Pa.ext2('/home/a.txt').should == 'txt'
+    end
+
+    it 'return nil when don extension' do
+      Pa.ext2('/home/a').should == nil
+    end
+
+    it 'with complex' do
+      Pa.ext2('/home/a.b.c.txt').should == 'txt'
+    end
+  end
+
+  describe '.absolute2' do
+    it 'returns absolute_path' do
+      Pa.absolute2('.').should == File.absolute_path('.')
+    end
+  end
+
+  describe '.expand2' do
+    it 'expand_path' do
+      Pa.expand2('~').should == File.expand_path('~') 
+    end
+  end
+
+	describe '.shorten2' do
+		it 'short /home/usr/file into ~/file' do
+			ENV['HOME'] = '/home/foo'
+			Pa.shorten2('/home/foo/file').should == '~/file'
+		end
+
+		it 'not short /home/other-user/file' do
+			ENV['HOME'] = '/home/foo'
+			Pa.shorten2('/home/bar/file').should == '/home/bar/file'
 		end
 	end
 
+  describe '.real2' do
+    Pa.real2('.').should == File.realpath('.')
+  end
+
 	describe '.parent2' do
 		before :each do
-			@path = "/home/foo/a.txt"
+			@path = '/home/foo/a.txt'
 		end
 
-		it "return parent path" do
-			Pa.parent2(@path).should == "/home/foo"
+		it 'return parent path' do
+			Pa.parent2(@path).should == '/home/foo'
 		end
 
-		it "return parent upto 2 level path" do
-			Pa.parent2(@path, 2).should == "/home"
+		it 'return parent upto 2 level path' do
+			Pa.parent2(@path, 2).should == '/home'
 		end
 	end
-	
-	describe "#==" do
-		it "runs ok" do
+
+  describe 'split2' do
+    it 'split a path into two part: dirname and basename' do
+      Pa.split2('/home/b/a.txt').should == ['/home/b', 'a.txt']
+    end
+
+    it 'with :all options: split all parts' do
+      Pa.split2('/home/b/a.txt', :all => true).should == ['/', 'home', 'b', 'a.txt']
+    end
+  end
+
+  describe 'split' do
+    it 'is a special case' do
+      Pa.split('/home/b/a.txt').should == [Pa('/home/b'), 'a.txt']
+    end
+  end
+
+  describe '.join2' do
+    it 'join a path' do
+      Pa.join2('/a', 'b').should == '/a/b'
+    end
+
+    it 'skip nil values' do
+      Pa.join2('/a', 'b', nil).should == '/a/b'
+    end
+
+    it 'skip empty values' do
+      Pa.join2('/a', 'b', '').should == '/a/b'
+    end
+  end
+
+	describe '#==' do
+		it 'runs ok' do
 			(Pa('/home') == Pa('/home')).should be_true
 		end
 	end
 
-	describe "#+" do
-		it "runs ok" do
+	describe '#+' do
+		it 'runs ok' do
 			(Pa('/home')+'~').should == Pa('/home~')
 		end
 	end
 
-	describe "#sub2" do
-		it "runs ok" do
+	describe '#sub2' do
+		it 'runs ok' do
 			Pa('/home/foo').sub2(/o/,'').should == '/hme/foo'
 		end
 	end
 
-	describe "#sub!" do
-		it "runs ok" do
+	describe '#sub!' do
+		it 'runs ok' do
 			pa = Pa('/home/foo')
 			pa.sub!(/o/,'')
 			pa.should == Pa('/hme/foo')
 		end
 	end
 
-	describe "#gsub2" do
-		it "runs ok" do
+	describe '#gsub2' do
+		it 'runs ok' do
 			Pa('/home/foo').gsub2(/o/,'').should == '/hme/f'
 		end
 	end
 
-	describe "#gsub!" do
-		it "runs ok" do
+	describe '#gsub!' do
+		it 'runs ok' do
 			pa = Pa('/home/foo')
 			pa.gsub!(/o/,'')
 			pa.should == Pa('/hme/f')
 		end
 	end
 
-	describe "#match" do
-		it "runs ok" do
+	describe '#match' do
+		it 'runs ok' do
 			Pa('/home/foo').match(/foo/)[0].should == 'foo'
 		end
 	end
 
-	describe "#start_with?" do
-		it "runs ok" do
+	describe '#start_with?' do
+		it 'runs ok' do
 			Pa('/home/foo').start_with?('/home').should be_true
 		end
 	end
 
-	describe "#end_with?" do
-		it "runs ok" do
+	describe '#end_with?' do
+		it 'runs ok' do
 			Pa('/home/foo').end_with?('foo').should be_true
 		end
 	end
 
-	describe "#=~" do
-		it "runs ok" do
+	describe '#=~' do
+		it 'runs ok' do
 			(Pa('/home/foo') =~ /foo/).should be_true
 		end
 	end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require "pa"
 
+$specdir = Pa.dir(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pa
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies: []
 description: ! 'a path library for Ruby
 
@@ -27,7 +27,8 @@ files:
 - Ragfile
 - lib/pa.rb
 - lib/pa/cmd.rb
-- lib/pa/dir.rb
+- lib/pa/directory.rb
+- lib/pa/ext.rb
 - lib/pa/path.rb
 - lib/pa/state.rb
 - lib/pa/util.rb
@@ -35,7 +36,7 @@ files:
 - pa.gemspec
 - pa.watchr
 - spec/pa/cmd_spec.rb
-- spec/pa/dir_spec.rb
+- spec/pa/directory_spec.rb
 - spec/pa/path_spec.rb
 - spec/pa/state_spec.rb
 - spec/pa_spec.rb
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xx
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: a path library for Ruby