pa 1.0.3 → 1.1.3

data/lib/pa/state.rb

@@ -1,64 +1,103 @@
 class Pa
-module ClassMethods::State
-	# @see File.chmod
-	def chmod(mode, *paths) paths.map!{|v|get(v)}; File.chmod(mode, *paths) end
+  module State
+    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
 
-	# @see File.lchmod
-	def lchmod(mode, *paths) paths.map!{|v|get(v)}; File.lchmod(mode, *paths) end
+      # @see File.chmod
+      def chmod(mode, *paths)
+        paths.map!{|v|get(v)}
+        File.chmod(mode, *paths) 
+      end
 
-	# @see File.chown
-	def chown(user, group=nil, *paths) paths.map!{|v|get(v)}; File.chown(user, group, *paths) end
+      # @see File.lchmod
+      def lchmod(mode, *paths)
+        paths.map!{|v|get(v)}
+        File.lchmod(mode, *paths) 
+      end
 
-	# @see File.lchown
-	def lchown(user, group=nil, *paths) paths.map!{|v|get(v)}; File.lchown(user, group, *paths) end
+      # @see File.chown
+      def chown(user, group=nil, *paths)
+        paths.map!{|v|get(v)}
+        File.chown(user, group, *paths) 
+      end
 
-	# @see File.utime
-	def utime(atime, mtime, *paths) paths.map!{|v|get(v)}; File.utime(atime, mtime, *paths) end
+      # @see File.lchown
+      def lchown(user, group=nil, *paths)
+        paths.map!{|v|get(v)}
+        File.lchown(user, group, *paths) 
+      end
 
-	# get file type
-	#
-	# file types:
-	#   "chardev" "blockdev" "symlink" ..
-	#
-	# @param [String] path
-	# @return [String] 
-	def type(path)
-		case (t=File.ftype(get(path)))
-		when "characterSpecial"
-			"chardev"
-		when "blockSpecial"
-			"blockdev"
-		when "link"
-			"symlink"
-		else
-			t
-		end
-	end # def type
+      # @see File.utime
+      def utime(atime, mtime, *paths)
+        paths.map!{|v|get(v)}
+        File.utime(atime, mtime, *paths) 
+      end
 
-	# is path a mountpoint?
-	#
-	# @param[String] path
-	# @return [Boolean]
-	def mountpoint? path
-		path=get(path)
-		begin
-			stat1 = File.lstat(path)
-			stat2 = File.lstat(File.join(path, '..'))
-			stat1.dev == stat2.dev && stat1.ino == stat2.ino || stat1.dev != stat2.dev
-		rescue Errno::ENOENT
-			false
-		end
-	end
-end
+      # get file type
+      #
+      # file types:
+      #   "chardev" "blockdev" "symlink" ..
+      #
+      # @param [String] path
+      # @return [String] 
+      def type(path)
+        case (t=File.ftype(get(path)))
+        when "characterSpecial"
+          "chardev"
+        when "blockSpecial"
+          "blockdev"
+        when "link"
+          "symlink"
+        else
+          t
+        end
+      end # def type
 
-module State
-	def chmod(mode); File.chmod(mode, path) end
-	def lchmod(mode); File.lchmod(mode, 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 utime(atime, mtime); File.utime(atime, mtime, path) end
-end
 
+      # is path a mountpoint?
+      #
+      # @param[String] path
+      # @return [Boolean]
+      def mountpoint?(path)
+        path=get(path)
+        begin
+          stat1 = File.lstat(path)
+          stat2 = File.lstat(File.join(path, '..'))
+          stat1.dev == stat2.dev && stat1.ino == stat2.ino || stat1.dev != stat2.dev
+        rescue Errno::ENOENT
+          false
+        end
+      end
+    end
+
+    module InstanceMethods
+      def chmod(mode)
+        File.chmod(mode, path) 
+      end
+
+      def lchmod(mode)
+        File.lchmod(mode, 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 utime(atime, mtime)
+        File.utime(atime, mtime, path) 
+      end
+    end
+  end
 end
 
 

data/lib/pa/util.rb

@@ -0,0 +1,32 @@
+class Pa
+  class Util
+    module Concern
+      def included(base)
+        base.extend const_get(:ClassMethods) if const_defined?(:ClassMethods)
+        base.send :include, const_get(:InstanceMethods) if const_defined?(:InstanceMethods)
+      end
+    end
+
+    class << self
+      # extract options
+      # @see extract_options!
+      # @example
+      #   def mkdir(*args)
+      #     paths, o = args.extract_options
+      #   end
+      #
+      # @return [Array<Array,Hash>] 
+      def extract_options(ary, default={})
+        if ary.last.is_a?(Hash) && ary.last.instance_of?(Hash)
+          [ary[0...-1], ary[-1].merge(default)]
+        else
+          [ary, default]
+        end
+      end
+
+      def wrap_array(value)
+        Array === value ? value : [value]
+      end
+    end
+  end
+end

data/lib/pa/version.rb

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

data/pa.gemspec

@@ -1,9 +1,9 @@
-$: << "."
-require "version"
+$: << File.expand_path("../lib", __FILE__)
+require "pa/version"
 
 Gem::Specification.new do |s|
 	s.name = "pa"
-	s.version = Pa::VERSION::IS
+	s.version = Pa::VERSION
 	s.summary = "a path library for Ruby"
 	s.description = <<-EOF
 a path library for Ruby
@@ -15,6 +15,4 @@ a path library for Ruby
 	s.rubyforge_project = "xx"
 
 	s.files = `git ls-files`.split("\n")
-
-	s.add_dependency "tagen", "~>1.0.0"
 end

data/spec/pa/cmd_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "fileutils"
 require "tmpdir"
 
-module Pa::ClassMethods::Cmd
+module Pa::Cmd::ClassMethods
 	public :_copy, :_touch, :_mkdir, :_mktmpname, :_rmdir, :_copy, :_move
 end
 

data/spec/pa/dir_spec.rb

@@ -20,7 +20,7 @@ describe Pa do
 		FileUtils.rm_r @tmpdir
 	end
 
-	describe "#glob" do
+	describe "#glob2" do
 		before(:each) do 
 			@files = %w(fa .fa)
 			FileUtils.touch(@files)
@@ -31,18 +31,18 @@ describe Pa do
 
 		context "call without any option" do
 			it "returns 1 items" do
-				Pa.glob("*").should have(1).items
+				Pa.glob2("*").should have(1).items
 			end
 		end
 
 		context "call with :dotmatch option" do
 			it "returns 2 items" do
-				Pa.glob("*", dotmatch: true).should have(2).items
+				Pa.glob2("*", dotmatch: true).should have(2).items
 			end
 		end
 	end
 
-	describe "#each" do
+	describe "#each2" do
 		# fa .fa fa~ 
 		# dira/
 		#   dirb/
@@ -60,33 +60,33 @@ describe Pa do
 
 		it "runs on" do
 			ret = []
-			Pa.each{|pa| ret << pa.fname}
+			Pa.each2{|pa| ret << pa}
 			ret.sort.should == %w(.fa dira fa fa~)
 		end
 
 		it "return a Enumerator when call without block" do
-			Pa.each.should be_an_instance_of Enumerator
+			Pa.each2.should be_an_instance_of Enumerator
 		end
 
 		it "raise Errno::ENOENT if path doesn't exists" do
-			lambda { Pa.each("path_doesn't_exits"){} }.should raise_error(Errno::ENOENT)
+			lambda { Pa.each2("path_doesn't_exits"){} }.should raise_error(Errno::ENOENT)
 		end
 
 		it "raise Errno::ENOTDIDR if path isn't a directory" do
-			lambda { Pa.each("fa"){} }.should raise_error(Errno::ENOTDIR)
+			lambda { Pa.each2("fa"){} }.should raise_error(Errno::ENOTDIR)
 		end
 
-		it "each(.) return 'foo' not '.foo'" do 
-			Pa.each.with_object([]){|pa,m| m<<pa.p}.sort.should == %w(.fa dira fa fa~)
+		it "each2(.) return 'foo' not '.foo'" do 
+			Pa.each2.with_object([]){|pa,m| m<<pa}.sort.should == %w(.fa dira fa fa~)
 		end
 
-		it "each(nodot: true) -> list all files except dot file" do
-			Pa.each(nodot: true).with_object([]){|pa,m|m<<pa.b}.sort.should == %w(dira fa fa~)
+		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~)
 		end
 
 	end
 
-	describe "#each_r" do
+	describe "#each2_r" do
 		# fa .fa fa~ 
 		# dira/
 		#   dirb/
@@ -102,14 +102,14 @@ describe Pa do
 			FileUtils.rm_r @dirs
 		end
 
-		it "each_r -> Enumerator" do
-			Pa.each_r.should be_an_instance_of Enumerator
-		 	Pa.each_r.with_object([]){|(pa,r),m|m<<r}.sort.should == %w(.fa dira dira/dirb dira/dirb/b fa fa~)
+		it "each2_r -> Enumerator" 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
 
 
-	describe "#ls" do
+	describe "#ls2" do
 		# filea 
 		# dira/
 		# 	fileb
@@ -125,13 +125,11 @@ describe Pa do
 		end
 
 		it "runs ok -> Array" do
-			Pa.ls.should == ["filea", "dira"]
+			Pa.ls2.should == ["filea", "dira"]
 		end
 
 		it "call a block" do
-			Pa.ls { |pa, fname| pa.directory?  }.should == ["dira"]
+			Pa.ls2 { |pa, fname| File.directory?(pa)  }.should == ["dira"]
 		end
 	end
-
-
 end

data/spec/pa/path_spec.rb

@@ -1,39 +1,26 @@
 require "spec_helper"
 
 describe Pa do
-	describe "#test" do
-		it "runs ok" do
-			pa = Pa('/home/guten/')
-		end
-	end
-
-	describe "#dir2" do
-		it "runs ok" do
-			Pa('/home/foo').dir2.should be_an_instance_of Pa
-		end
-	end
+  context "dir and dir2" do
+    it "#dir => Pa" do
+      Pa.dir("/home/guten").should be_an_instance_of Pa
+    end
 
-	describe "#absoulte2" do
-		it "runs ok" do
-			Pa('.').absolute2.should be_an_instance_of Pa
-		end
-	end
+    it "#dir2 => Pa" do
+      Pa.dir2("/home/guten").should be_an_instance_of String
+    end
 
-	describe "pwd2" do
-		it "runs ok" do
-			Pa.pwd2.should be_an_instance_of Pa
-		end
-	end
+  end
 
-	describe ".shorten" do
+	describe ".shorten2" do
 		it "short /home/usr/file into ~/file" do
 			ENV["HOME"] = "/home/foo"
-			Pa.shorten("/home/foo/file").should == "~/file"
+			Pa.shorten2("/home/foo/file").should == "~/file"
 		end
 
 		it "not short /home/other-user/file" do
 			ENV["HOME"] = "/home/foo"
-			Pa.shorten("/home/bar/file").should == "/home/bar/file"
+			Pa.shorten2("/home/bar/file").should == "/home/bar/file"
 		end
 	end
 
@@ -48,31 +35,26 @@ describe Pa do
 
 	end
 
-	describe "basename" do
-		it "get a basename of a path" do
-			Pa.basename("/home/foo").should == "foo"
-		end
-
+	describe ".base2" do
 		it "get name, ext with :ext => true" do
-			Pa.basename("/home/foo.bar", ext: true).should == ["foo", "bar"]
+			Pa.base2("/home/foo.bar", ext: true).should == ["foo", "bar"]
 		end
-
 	end
-	
-	describe '.parent' do
+
+	describe '.parent2' do
 		before :each do
 			@path = "/home/foo/a.txt"
 		end
 
 		it "return parent path" do
-			Pa.parent(@path).should == "/home/foo"
+			Pa.parent2(@path).should == "/home/foo"
 		end
 
 		it "return parent upto 2 level path" do
-			Pa.parent(@path, 2).should == "/home"
+			Pa.parent2(@path, 2).should == "/home"
 		end
 	end
-
+	
 	describe "#==" do
 		it "runs ok" do
 			(Pa('/home') == Pa('/home')).should be_true
@@ -85,9 +67,9 @@ describe Pa do
 		end
 	end
 
-	describe "#sub" do
+	describe "#sub2" do
 		it "runs ok" do
-			Pa('/home/foo').sub(/o/,'').should == Pa('/hme/foo')
+			Pa('/home/foo').sub2(/o/,'').should == '/hme/foo'
 		end
 	end
 
@@ -99,9 +81,9 @@ describe Pa do
 		end
 	end
 
-	describe "#gsub" do
+	describe "#gsub2" do
 		it "runs ok" do
-			Pa('/home/foo').gsub(/o/,'').should == Pa('/hme/f')
+			Pa('/home/foo').gsub2(/o/,'').should == '/hme/f'
 		end
 	end
 
@@ -136,11 +118,4 @@ describe Pa do
 			(Pa('/home/foo') =~ /foo/).should be_true
 		end
 	end
-
-	describe "#dir_pa" do
-		it "return Pa instance" do
-			Pa('/home/guten').dir_pa.should be_an_instance_of(Pa)
-		end
-	end
-
 end