pa 1.2.3 → 1.3.0

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+script: bundle exec rspec spec

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem "pd"
+
 group :development do
   gem "thor"
   gem "rspec"

data/Gemfile.lock

@@ -1,7 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    awesome_print (1.0.2)
     diff-lcs (1.1.3)
+    pd (1.0.5)
+      awesome_print
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -17,6 +20,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  pd
   rspec
   thor
   watchr

data/README.md

@@ -1,5 +1,4 @@
-Pa, a path libraray for Ruby
-========================
+# Pa, a path libraray for Ruby [![Build Status](https://secure.travis-ci.org/GutenYe/pa.png)](http://travis-ci.org/GutenYe/pa)
 
 | Homepage:      |  https://github.com/GutenYe/pa       |
 |----------------|--------------------------------------|

data/lib/pa.rb

@@ -1,4 +1,5 @@
 require "tmpdir"
+require "pd"
 
 =begin rdoc
 Pa(Path) is similary to Pathname, but more powerful.
@@ -204,10 +205,11 @@ class Pa
   end
 
   DELEGATE_METHODS2 = [ :join2 ]
-  DELEGATE_METHODS = [ :dir, :build, :join ]
+  DELEGATE_METHODS = [ :build, :join ]
+  DELEGATE_ATTR_METHODS = [ :dir, :rel, :rea ]
 
 	attr_reader :path2
-  attr_reader :absolute2, :dir2, :dir_strict2, :base2, :fname2, :name2, :short2, :ext2, :fext2, :rel, :rea
+  attr_reader :absolute2, :dir2, :dir_strict2, :base2, :fname2, :name2, :short2, :ext2, :fext2, :rel2, :rea2
   attr_reader :options
 
   # @param [Hash] o option
@@ -220,8 +222,7 @@ class Pa
     @path2.sub!(/^~/, ENV["HOME"].to_s) if @path2 # nil
     @options = o
 
-    @rel = o[:rel] || ""
-    @base_dir = o[:base_dir]
+    @base_dir = o[:base_dir] || "."
 
 		initialize_variables
   end
@@ -231,41 +232,40 @@ class Pa
 	end
 	include chainable
 
-  def rel
-    raise Error, "don't have a :rel option" unless rel?
-
-    @rel ||= options[:rel]
-  end
-
   def base_dir
-    raise Error, "don't have a :base_dir option" unless base_dir?
-
-    @base_dir ||= options[:base_dir]
+    @base_dir ||= (options[:base_dir] || ".")
   end
 
-  def rea
-    raise Error, "don't have a :base_dir option" unless base_dir?
-
-    @rea ||= File.join(options[:base_dir], path)
+  def rel2
+    @rel2 ||= (options[:rel] || "" )
   end
 
-  def rel?
-    options.has_key?(:rel)
+  def rea2
+    @rea2 ||= options[:base_dir] ? File.join(base_dir, path) : path
   end
 
-  def base_dir?
-    options.has_key?(:base_dir)
+  def absolute2
+    @absolute2 ||= File.absolute_path(rea2)
   end
 
-  def absolute2
-    @absolute2 ||= File.absolute_path(options[:base_dir] ? rea : path)
+  def absolute
+    @absolute ||= Pa(absolute2)
   end
 
   # => ".", "..", "/", "c:"
+  #
+  # "foo" => "."
+  # "./foo" => "."
+  # "../../foo" => "../.."
+  #
   def dir2
     @dir2 ||= File.dirname(path)
   end
 
+  def dir
+    @dir ||= Pa(dir2)
+  end
+
   # Pa("foo") => ""
   # Pa("./foo") => "."
   def dir_strict2
@@ -273,13 +273,17 @@ class Pa
 
     dir = File.dirname(path)
 
-    @dir_strict2 = if %w[. ..].include?(dir) && path !~ %r!^\.\.?/!
+    @dir_strict2 = if %w[.].include?(dir) && path !~ %r~^\./~
       ""
     else
       dir
     end
   end
 
+  def dir_strict
+    @dir_strict ||= Pa(dir_strict2)
+  end
+
   def base2
     @base2 ||= File.basename(path)
   end
@@ -308,7 +312,7 @@ class Pa
   alias ext ext2
   alias fext fext2
 
-  # abbretive
+  # abbreviate
   alias p2 path2 
   alias p2 path
   alias a2 absolute2
@@ -326,6 +330,10 @@ class Pa
   alias e ext
   alias fe fext
 
+  alias a absolute
+  alias d dir
+  alias d_s dir_strict
+
 	# return '#<Pa @path="foo", @absolute="/home/foo">'
 	#
 	# @return [String]
@@ -383,6 +391,10 @@ class Pa
     @short2 ||= Pa.shorten2(@path) 
   end
 
+  def short
+    @short ||= Pa(short2)
+  end
+
   # @return [String]
   def sub2(*args, &blk)
     path.sub(*args, &blk)
@@ -458,6 +470,14 @@ class Pa
       end
     EOF
   }
+
+  DELEGATE_ATTR_METHODS.each {|mth|
+    class_eval <<-EOF
+      def #{mth}(*args, &blk)
+        @#{mth} ||= Pa(#{mth}2(*args, &blk))
+      end
+    EOF
+  }
 end
 
 require "pa/path"
@@ -476,9 +496,10 @@ private
 	# a very convient function.
 	# 
 	# @example
+  #
 	#   Pa('/home').exists? 
-	def Pa(path)
+	def Pa(path, o={})
 		return path if Pa===path
-		Pa.new path
+		Pa.new path, o
 	end
 end

data/lib/pa/cmd.rb

@@ -9,6 +9,23 @@ rm family
 === Example 
   rm path # it's clear: remove a file
   rmdir path #  it's clear: remove a directory
+
+:verbose and :show_cmd options, almost every cmd has these two options.
+
+Pa.mv "dira", "dirb", :show_cmd => true
+  > mv dira dirb
+
+Pa.mv "dira", "dirb", :verbose => true
+  > rename dira/filea dirb/filea
+  > rename dira/fileb dirb/fileb
+
+Pa.touch "a b c", :show_cmd => true
+ > touch a b c
+
+Pa.touch "a b c", :verbose => true
+ > touch a
+ > touch b
+ > touch c
 =end
 class Pa
   module Cmd
@@ -27,6 +44,9 @@ class Pa
       #
       # @param [Array<String>, String] src_s support globbing
       # @param [String,Pa] dest
+      # @param [Hash] o
+      # @option o [Boolean] :show_cmd puts cmd
+      # @option o [Boolean] :verbose verbose mode
       # @return [nil]
       def ln(src_s, dest, o={})
         _ln(:link, src_s, dest, o) 
@@ -69,9 +89,10 @@ class Pa
       # @param [String,Pa] path
       # @param [Hash] o
       # @option o [Boolean] :verbose verbose mode
+      # @option o [Boolean] :show_cmd puts cmd
       def cd(path=ENV["HOME"], o={}, &blk)
         p = get(path)
-        puts "cd #{p}" if o[:verbose]
+        puts "cd #{p}" if (o[:verbose] or o[:show_cmd])
         Dir.chdir(p, &blk) 
       end
 
@@ -81,10 +102,11 @@ class Pa
       # @param [String] path
       # @param [Hash] o
       # @option o [Boolean] :verbose verbose mode
+      # @option o [Boolean] :show_cmd puts cmd
       # @return [nil]
       def chroot(path, o={})
         p = get(path)
-        puts "chdroot #{p}" if o[:verbose]
+        puts "chdroot #{p}" if (o[:verbose] or o[:show_cmd])
         Dir.chroot(p)
       end
 
@@ -96,7 +118,8 @@ class Pa
       #   @option o [Fixnum,String] :mode (0664)
       #   @option o [Boolean] :mkdir auto mkdir if path contained directory not exists.
       #   @option o [Boolean] :force 
-      #   @option o [Boolean] :verbose 
+      #   @option o [Boolean] :verbose verbose mode
+      #   @option o [Boolean] :show_cmd puts cmd
       #   @return [nil]
       def touch(*args)
         paths, o = Util.extract_options(args)
@@ -121,7 +144,8 @@ class Pa
       #   @param [Hash] o option
       #   @option o [Fixnum] :mode (0775)
       #   @option o [Boolean] :force
-      #   @option o [Boolean] :verbose
+      #   @option o [Boolean] :verbose verbose mode
+      #   @option o [Boolean] :show_cmd puts cmd
       #   @return [nil]
       def mkdir(*args)
         paths, o = Util.extract_options(args)
@@ -144,14 +168,15 @@ class Pa
       # @overload mktmpdir(name, o={}, &blk)
       #   @param [Hash] o options
       #   @option o [String] :tmpdir (ENV["TEMP"])
-      #   @option o [Symbol] :verbose
+      #   @option o [Symbol] :verbose verbose mode
+      #   @option o [Symbol] :show_cmd puts cmd
       #   @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]
+        puts "mktmpdir #{p}" if (o[:verbose] or o[:show_cmd])
 
         Dir.mkdir(p)
 
@@ -169,14 +194,15 @@ class Pa
       #
       # @overload mktmpfile2(name=$$, o={}, &blk)
       #   @param [Hash] o options
-      #   @option o [Boolean] :verbose
+      #   @option o [Boolean] :verbose verbose mode
+      #   @option o [Boolean] :show_cmd puts cmd
       #   @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]
+        puts "mktmpfile #{p}" if (o[:verbose] or o[:show_cmd])
 
         begin 
           blk.call(p) 
@@ -192,7 +218,7 @@ class Pa
         (name,), o = Util.extract_options(args)
 
         p = _mktmpname(name, o) 
-        puts "mktmpfile #{p}" if o[:verbose]
+        puts "mktmpfile #{p}" if (o[:verbose] or o[:show_cmd])
 
         begin 
           blk.call(Pa(p)) 
@@ -207,12 +233,15 @@ class Pa
       #
       # @overload rm(*paths, o={})
       #   @param [String] *paths support globbing
-      #   @param o [Boolean] :verbose
+      #   @param o [Boolean] :verbose verbose mode
+      #   @param o [Boolean] :show_cmd puts cmd
       # @return [nil]
       def rm(*paths)
         paths, o = Util.extract_options(paths)
-        glob(*paths) { |pa|
-          extra_doc = o[:force] ? "-f " : nil
+        extra_doc = o[:force] ? "-f " : nil
+        puts "rm #{extra_doc}#{paths.join(" ")}" if o[:show_cmd]
+
+        Pa.glob(*paths) { |pa|
           puts "rm #{extra_doc}#{pa.p}" if o[:verbose]
 
           if File.directory?(pa.p)
@@ -236,12 +265,16 @@ class Pa
       # rm directory only. still remove if directory is not empty.
       #
       # @param [String] *paths support globbing
+      # @param [Hash] o options
+      # @option o [Boolean] :verbose verbose mode
+      # @option o [Boolean] :show_cmd puts cmd
       # @return [nil]
       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]
+        extra_doc = o[:force] ? "-f " : nil
+        puts "rmdir #{extra_doc}#{paths.join(" ")}" if o[:show_cmd]
+        Pa.glob(*paths) { |pa|
+          puts "  rmdir #{extra_doc}#{pa.p}" if o[:verbose]
 
           if not File.directory?(pa.p)
             if o[:force]
@@ -259,14 +292,49 @@ class Pa
         o[:force] = true
         rmdir *paths, o
       end
+      
+      # empty a directory.
+      #
+      # @example
+      #
+      #  empty_dir("foo")
+      #
+      # @param [String] *dirs
+      # @param [Hash] o options
+      # @option o [Boolean] :verbose verbose mode
+      # @option o [Boolean] :show_cmd puts cmd
+      # @return [nil]
+      def empty_dir(*dirs)
+        dirs, o = Util.extract_options(dirs)
+        extra_doc = o[:force] ? "-f " : nil
+        puts "empty_dir #{extra_doc}#{dirs.join(" ")}" if o[:show_cmd]
+
+        dirs.each {|dir|
+          dir = Pa(dir)
+          if not File.exists?(dir.p)
+            raise Errno::ENOENT, "not exists -- #{dir}" unless o[:force]
+          elsif not File.directory?(dir.p)
+            raise Errno::ENOTDIR, "not a directory -- #{dir}"  unless o[:force]
+          else
+            rm_r *Pa.glob2("#{dir}/*", :dotmatch => true)
+          end
+        }
+      end
 
+      def empty_dir_f(*dirs)
+        dirs, o = Util.extract_options(dirs)
+        o[:force] = true
+        empty_dir *dirs, o
+      end
+      
       # rm recusive, rm both file and directory
       #
       # @see rm
       # @return [nil]
       def rm_r(*paths)
         paths, o = Util.extract_options(paths)
-        glob(*paths){ |pa|
+        puts "rm -r #{path.join(" ")}" if o[:show_cmd]
+        Pa.glob(*paths){ |pa|
           puts "rm -r #{pa.p}" if o[:verbose]
           File.directory?(pa.p)  ? _rmdir(pa) : File.delete(pa.p)
         }
@@ -287,7 +355,7 @@ class Pa
       # @return [nil]
       def rm_if(*paths, &blk)
         paths, o = Util.extract_options(paths)
-        glob(*paths) do |pa|
+        Pa.glob(*paths) do |pa|
           rm_r pa, o if blk.call(pa)
         end
       end
@@ -316,6 +384,7 @@ class Pa
       #   @param [Hash] o option
       #   @option o [Boolean] :mkdir mkdir(dest) if dest not exists.
       #   @option o [Boolean] :verbose puts cmd when execute
+      #   @option o [Boolean] :show_cmd puts cmd
       #   @option o [Boolean] :folsymlink follow symlink
       #   @option o [Boolean] :force force dest file if dest is a file
       #   @option o [Boolean] :special special copy, when cp a directory, only mkdir, not cp the directory's content, usefull in Pa.each_r
@@ -324,8 +393,9 @@ class Pa
       #   @yield [src,dest,o]
       #   @return [nil]
       def cp(src_s, dest, o={}, &blk)
-        srcs = glob(*Util.wrap_array(src_s)).map{|v| v.path}
+        srcs = Pa.glob(*Util.wrap_array(src_s)).map{|v| v.path}
         dest = Pa.get(dest)
+        puts "cp #{srcs.join(" ")} #{dest}" if o[:show_cmd]
 
         if o[:mkdir] and (not File.exists?(dest))
           Pa.mkdir dest
@@ -357,14 +427,18 @@ class Pa
       # @see cp
       #
       # @param [Hash] o option
-      # @option o [Boolean] :verbose
+      # @option o [Boolean] :verbose verbose mode
+      # @option o [Boolean] :show_cmd puts cmd
       # @option o [Boolean] :mkdir
       # @option o [Boolean] :fore
       # @return [nil]
       def mv(src_s, dest, o={}, &blk)
-        srcs = glob(*Util.wrap_array(src_s)).map{|v| get(v)}
+        srcs = Pa.glob(*Util.wrap_array(src_s)).map{|v| get(v)}
         dest = get(dest)
 
+        extra_doc = o[:force] ? "-f " : nil
+        puts "mv #{extra_doc}#{srcs.join(" ")} #{dest}" if o[:show_cmd]
+
         if o[:mkdir] and (not File.exists?(dest))
           mkdir dest
         end
@@ -425,8 +499,9 @@ class Pa
       def _touch(paths, o)
         o[:mode] ||= 0644
         paths.map!{|v|get(v)}
+        extra_doc = o[:force] ? "-f " : nil
+        puts "touch #{extra_doc}#{paths.join(" ")}" if o[:show_cmd]
         paths.each {|p|
-          extra_doc = o[:force] ? "-f " : nil
           puts "touch #{extra_doc}#{p}" if o[:verbose]
 
           if File.exists?(p) 
@@ -446,29 +521,47 @@ class Pa
 
       # @param [Array,String,#path] src_s
       # @param [String,#path] dest
+      #
       def _ln(method, src_s, dest, o={})
+        srcs = Util.wrap_array(src_s)
         dest = get(dest)
-        glob(*Util.wrap_array(src_s)) {|src|
+        extra_doc = "" 
+        extra_doc << (method==:symlink ? "-s " : "")
+        extra_doc << (o[:force] ? "-f " : "")
+        puts "ln #{extra_doc}#{srcs.join(" ")} #{dest}" if o[:show_cmd]
+
+        Pa.glob(*srcs) {|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]
+
+          if File.exists?(dest) 
+            if o[:force]
+              Pa.rm_r(dest)
+            else
+              raise Errno::EEXIST, "dest exists -- #{dest}"
+            end
+          end
+
+          puts "ln #{extra_doc}#{src} #{dest}" if o[:verbose] 
 
           File.send(method, src, dest)
         }	
       end
 
       def _mkdir(paths, o)
+        puts "mkdir #{paths.join(" ")}" if o[:show_cmd]
+
         o[:mode] ||= 0775
         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}")
+            if o[:force] 
+              next 
+            else 
+              raise Errno::EEXIST, "File exist -- #{p}"
+            end
           end
 
           stack = []

data/lib/pa/directory.rb

@@ -24,15 +24,15 @@ class Pa
     extend Util::Concern
 
     module ClassMethods
-      # path globbing, exclude '.' '..' for :dotmatch
+      # path globbing, exclude '.' '..'
       # @note glob is * ** ? [set] {a,b}
       #
       # @overload glob2(*paths, o={})
       # 	@param [String] path
       # 	@param [Hash] o option
-      # 	@option o [Boolean] :dotmatch glob not match dot file by default.
-      # 	@option o [Boolean] :pathname wildcard doesn't match /
-      # 	@option o [Boolean] :noescape makes '\\' ordinary
+      # 	@option o [Boolean] :dotmatch (false) match dot file.   FNM_DOTMATCH
+      # 	@option o [Boolean] :pathname (false) wildcard doesn't match /. FNM_PATHNAME
+      # 	@option o [Boolean] :noescape (false) makes '\\' ordinary. FNM_NOESCAPE
       # 	@return [Array<String>] 
       # @overload glob2(*paths, o={})
       #   @yieldparam [String] path
@@ -47,10 +47,8 @@ class Pa
           flag |= File.const_get("FNM_#{option.upcase}") if value
         end
 
-        files = Dir.glob(paths, flag)
-
-        # delete . .. for '.*'
-        %w(. ..).each {|v| files.delete(v)}
+        # delete . .. 
+        files = Dir.glob(paths, flag).delete_if{|v| v =~ %r~(^|/)\.\.?$~}
 
         ret = []
         files.each { |path|
@@ -192,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), abs, rel, err, rea
+          blk.call Pa(path, :rel => rel), abs, rel, err, rea
         end
       end
 

data/lib/pa/version.rb

@@ -1,3 +1,3 @@
 class Pa
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/pa.gemspec

@@ -14,4 +14,5 @@ a path library for Ruby
 	s.rubyforge_project = "xx"
 
 	s.files = `git ls-files`.split("\n")
+  s.add_dependency "pd"
 end

data/spec/pa/cmd_spec.rb

@@ -47,65 +47,46 @@ describe Pa do
 
   describe "#ln" do
     # file1
+    # file2
     before :each do
-      FileUtils.touch %w[file1]
+      FileUtils.touch %w[file1 file2]
     end
 
     it "works" do
       Pa.ln("file1", "lna")
       File.identical?("file1", "lna").should be_true
-
-      Pa.ln(Pa("file1"), Pa("lnb"))
-      File.identical?("file1", "lnb").should be_true
     end
-  end
 
-  describe "#ln_f" do
-    # file1
-    # file2
-    # file3
-    before :each do
-      FileUtils.touch %w[file1 file2 file3]
+    it "raises Errno::EEXIST" do
+      lambda{ Pa.ln("file1", "file2") }.should raise_error(Errno::EEXIST)
     end
 
-    it "works" do
-      Pa.ln_f("file1", "file2")
+    it "doesn't raise Errno::EEXIST with :force" do
+      lambda{ Pa.ln("file1", "file2", :force => true)  }.should_not raise_error(Errno::EEXIST) 
       File.identical?("file1", "file2").should be_true
-
-      Pa.ln_f(Pa("file1"), Pa("file3"))
-      File.identical?("file1", "file3").should be_true
     end
   end
 
   describe "#symln" do
     # file1
+    # file2
     before :each do
-      FileUtils.touch %w[file1]
+      FileUtils.touch %w[file1 file2]
     end
 
     it "works" do
       Pa.symln("file1", "syma")
       File.symlink?("syma").should be_true
-
-      Pa.symln(Pa("file1"), Pa("symb"))
-      File.symlink?("symb").should be_true
     end
-  end
 
-  describe "#symln_f" do
-    # file1 
-    # file2
-    # file3
-    before :each do
-      FileUtils.touch %w[file1 file2 file3]
+    it "raises Errno::EEXIST" do
+      lambda{ Pa.symln("file1", "file2") }.should raise_error(Errno::EEXIST)
     end
 
-    it "works" do
-      Pa.symln_f("file1", "file2")
+    it "doesn't raise Errno::EEXIST with :force" do
+      lambda{ Pa.symln("file1", "file2", :force => true) }.should_not raise_error(Errno::EEXIST) 
       File.symlink?("file2").should be_true
-
-      Pa.symln_f(Pa("file1"), Pa("file3"))
-      File.symlink?("file3").should be_true
+      File.readlink("file2").should == "file1"
     end
   end
 
@@ -182,21 +163,23 @@ describe Pa do
   end
 
 	describe "#mkdir" do
-		it "mkdir" do
-			Pa.mkdir("guten/tag")
-			File.exists?("guten/tag").should be_true
-		end
-	end
-
-	describe "#mkdir_f" do
     # dir1/dira
     before :each do
       FileUtils.mkdir_p %w[dir1/dira]
     end
 
-		it "mkdir" do
-			Pa.mkdir_f "dir1/dira"
+		it "works" do
+			Pa.mkdir("dir2/dirb")
+			File.exists?("dir2/dirb").should be_true
 		end
+
+    it "raise Errno::EEXIST" do
+      lambda{ Pa.mkdir("dir1/dira") }.should raise_error(Errno::EEXIST)
+    end
+
+    it "doesn't raise Errno::EEXIST with :force" do
+      lambda{ Pa.mkdir("dir1/dira", :force) }.should_not raise_error(Errno::EEXIST)
+    end
 	end
 
   describe "#_mktmpname" do
@@ -263,23 +246,14 @@ describe Pa do
     it "remove file" do
       Pa.rm "a"
       File.exists?("a").should be_false
-      lambda{Pa.rm("dir")}.should raise_error(Errno::EISDIR)
     end
-  end
 
-  describe "#rm_f" do
-    # rm family
-    # a
-    # dir/ 
-    #   dir1/
-    #   a 
-    before :each do
-      FileUtils.mkdir_p %w[dir/dir1]
-      FileUtils.touch %w[a dir/a]
+    it "raises Errno::EISDIR" do
+      lambda{ Pa.rm("dir") }.should raise_error(Errno::EISDIR)
     end
 
-    it "remove file force" do
-      lambda{Pa.rm_f("dir")}.should_not raise_error(Errno::EISDIR)
+    it "doens't raises Errno::EISDIR with :force" do
+      lambda{ Pa.rm("dir", :force => true) }.should_not raise_error(Errno::EISDIR)
     end
   end
 
@@ -297,12 +271,18 @@ describe Pa do
     it "remove directory" do
       Pa.rmdir "dir"
       File.exists?("dir").should be_false
-      lambda{Pa.rmdir("a")}.should raise_error(Errno::ENOTDIR)
+    end
+
+    it "raises Errno::ENOTDIR" do
+      lambda{ Pa.rmdir("a") }.should raise_error(Errno::ENOTDIR)
+    end
+
+    it "doesn't raise Errno::ENOTDIR with :force" do
+      lambda{ Pa.rmdir_r("a", :force => true) }.should_not raise_error(Errno::ENOTDIR) 
     end
   end
 
-  describe "#rmdir_f" do
-    # rm family
+  describe "#empty_dir" do
     # a
     # dir/ 
     #   dir1/
@@ -312,8 +292,25 @@ describe Pa do
       FileUtils.touch %w[a dir/a]
     end
 
-    it "remove directory force" do
-      lambda{Pa.rmdir_r("a")}.should_not raise_error(Errno::ENOTDIR) 
+    it "empty a directory" do
+      Pa.empty_dir "dir"
+      Dir.entries("dir").should == %w[. ..]
+    end
+
+    it "raises Errno::ENOTDIR" do
+      lambda{ Pa.empty_dir("a") }.should raise_error(Errno::ENOTDIR)
+    end
+
+    it "doesn't raise Errno::ENOTDIR with :force" do
+      lambda{ Pa.empty_dir("a", :force => true) }.should_not raise_error(Errno::ENOTDIR)
+    end
+
+    it "raises Errno::ENOENT" do
+      lambda{ Pa.empty_dir "ENOENT" }.should raise_error(Errno::ENOENT)
+    end
+
+    it "doesn't raise Errno::ENOENT with :force" do
+      lambda{ Pa.empty_dir("ENOENT", :force => true) }.should_not raise_error(Errno::ENOENT)
     end
   end
 
@@ -505,20 +502,25 @@ describe Pa do
 	end
 
 	describe "#mv" do
-		# a b c
-		# dir/ aa  
+		# file1 with foo
+    # file2
+    # file3
+		# dir1/ 
+    #   filea
+    # dir2/
+    #  dir1/
 		before :each do
 			FileUtils.mkdir_p %w[dir]
 			FileUtils.touch %w[a b c dir/aa]
-		end
 
-		it "mv a dir/" do
-			Pa.mv "a", "dir"
-			File.exists?("dir/a").should be_true
+			FileUtils.mkdir_p %w[dir1 dir2/dir1]
+			FileUtils.touch %w[file1 file2 file3 dir1/filea]
+      open("file1", "w") {|f| f.write("foo")}
 		end
 
-		it "mv a b .. file" do
-			lambda{Pa.mv(%w(a b), "c")}.should raise_error(Errno::ENOTDIR)
+		it "mv file1 dir1" do
+			Pa.mv "file1", "dir1"
+			File.exists?("dir1/file1").should be_true
 		end
 
 		it "mv file1 file2 .. dir/" do
@@ -526,26 +528,21 @@ describe Pa do
 			File.exists?("dir/a").should be_true
 			File.exists?("dir/b").should be_true
 		end
-	end
 
-	describe "#mv_f" do
-		# file1 with foo
-    # file2
-		# dir1/ 
-    #   filea
-    # dir2/
-    #  dir1/
-		before :each do
-			FileUtils.mkdir_p %w[dir1 dir2/dir1]
-			FileUtils.touch %w[file1 file2 dir1/filea]
-      open("file1", "w") {|f| f.write("foo")}
+    it "raises dest Errno::ENOTDIR" do
+      lambda{ Pa.mv(%w[file1 file2], "file3") }.should raise_error(Errno::ENOTDIR)
+    end
+
+		it "raises Errno::EEXIST" do 
+			lambda{ Pa.mv("file1", "file2") }.should raise_error(Errno::EEXIST)
+      lambda{ Pa.mv("dir1", "dir2")  }.should raise_error(Errno::EEXIST)
 		end
 
-		it "works" do
-      Pa.mv_f "file1", "file2"
+    it "doesn't raise Errno::ENOTDIR with :force" do
+      lambda{ Pa.mv("file1", "file2", :force => true) }.should_not raise_error(Errno::EEXIST)
       File.read("file2").should == "foo"
 
-      Pa.mv_f "dir1", "dir2"
+      lambda{ Pa.mv("dir1", "dir2", :force => true) }.should_not raise_error(Errno::EEXIST)
       File.exists?("dir2/dir1/filea").should be_true
 		end
 	end

data/spec/pa/directory_spec.rb

@@ -55,6 +55,11 @@ describe Pa do
     it "#glob returns Pa instead" do
       Pa.glob("*")[0].should be_an_instance_of Pa
     end
+
+    it "remove . .." do
+      Pa.glob2(".*").should have(1).items
+      Pa.glob2("#{@tmpdir}/.*").should have(1).items
+    end
 	end
 
 	describe ".each2" do
@@ -196,8 +201,8 @@ describe Pa do
 		end
 
 		it "works" do
-			Pa.ls2.should == %w[filea dira dirb]
-      Pa.ls2("dira").should == %w[fileb]
+			Pa.ls2.sort.should == %w[dira dirb filea]
+      Pa.ls2("dira").sort.should == %w[fileb]
 		end
 
     it "list multi paths" do
@@ -218,7 +223,7 @@ describe Pa do
     end
 
 		it "call a block returns filtered result" do
-			Pa.ls2 {|p| File.directory?(p)}.should == %w[dira dirb]
+			Pa.ls2 {|p| File.directory?(p)}.sort.should == %w[dira dirb]
 		end
   end
 
@@ -235,8 +240,8 @@ describe Pa do
 		end
 
 		it "works" do
-			Pa.ls2_r.should == %w[filea dira dira/fileb dirb dirb/dirb1 dirb/dirb1/fileb1]
-      Pa.ls2_r("dirb").should == %w[dirb1 dirb1/fileb1]
+			Pa.ls2_r.sort.should == %w[dira dira/fileb dirb dirb/dirb1 dirb/dirb1/fileb1 filea]
+      Pa.ls2_r("dirb").sort.should == %w[dirb1 dirb1/fileb1]
 		end
 
     it "list multi paths" do
@@ -257,7 +262,7 @@ describe Pa do
     end
 
 		it "call a block returns filtered result" do
-			Pa.ls2_r {|p, fn| File.directory?(p)}.should == %w[dira dirb dirb/dirb1]
+			Pa.ls2_r {|p, fn| File.directory?(p)}.sort.should == %w[dira dirb dirb/dirb1]
 		end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "bundler/setup"
+require "stringio"
 require "pa"
 
 $specdir = Pa.dir(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pa
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
-dependencies: []
+date: 2012-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'a path library for Ruby
 
 '
@@ -21,6 +37,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -54,6 +71,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1635973500048505799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xx
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: a path library for Ruby