pa 1.3.2 → 1.3.3

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/CHANGELOG.md

@@ -1,20 +1,25 @@
+## 1.4.0 (xx)
+
+Changes
+
+  - `Pa.rm`, `Pa.cp` ... doesn't support globbing any more.
+  - `Pa.has_ext?(path, ext)` -> `Pa.has_ext?(path, *exts)`
+  - `Pa.delete_ext?(path, ext)` -> `Pa.delete_ext?(path, *exts)`
+
 ## 1.3.2 (Sep 9, 2012)
 
 Improvements
 
-  - `Pa.expand2` and `Pa.real2` support second arguments as `(name, dir=".")` ([@GutenYe][])
+  - `Pa.expand2` and `Pa.real2` support second arguments as `(name, dir=".")` *GutenYe*
 
 ## 1.3.0 (Aug 28, 2012)
 
 Improvements
 
-  - add `Pa.relative_to?`, `Pa.relative_to2`, `Pa.has_ext?`, `Pa.delete_ext2`, `Pa.add_ext2` ([@GutenYe][])
+  - add `Pa.relative_to?`, `Pa.relative_to2`, `Pa.has_ext?`, `Pa.delete_ext2`, `Pa.add_ext2` *GutenYe*
 
 Changes
 
   - change `Pa.ext2` return from "ext" to ".ext", `Pa.fext2` return from ".ext" to "ext"
   - remove `Pa.fname2`
   - remove `Pa.build2` and change `Pa#build2` to `Pa#change2`
-
-<!--- The following link definition list is generated by PimpMyChangelog --->
-[@GutenYe]: https://github.com/GutenYe

data/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+
+2. Create a topic branch from where you want to base your work. 
+
+3. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+4. Make the test pass with `rake test`.
+
+5. Push to your fork and submit a pull request.
+
+6. Coding Style Guide: https://gist.github.com/1105334
+
+And in case we didn't emphasize it enough: we love tests!

data/Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem "thor"
   gem "rspec"
   gem "guard"
+  gem "guard-rspec"
   gem "pimpmychangelog"
 end
 

data/Gemfile.lock

@@ -6,6 +6,9 @@ GEM
     guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
+    guard-rspec (2.1.0)
+      guard (>= 1.1)
+      rspec (~> 2.11)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
@@ -33,6 +36,7 @@ PLATFORMS
 
 DEPENDENCIES
   guard
+  guard-rspec
   pd
   pimpmychangelog
   rspec

data/README.md

@@ -36,21 +36,14 @@ Install
 Development [![Dependency Status](https://gemnasium.com/GutenYe/pa.png?branch=master)](https://gemnasium.com/GutenYe/pa) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/GutenYe/pa)
 ===========
 
-Contributing
+Contributing 
 -------------
 
 * Submit any bugs/features/ideas to github issue tracker.
 
-Pull requests are very welcome! Please try to follow these simple rules if applicable:
+Please see [Contibution Documentation](https://github.com/GutenYe/pa/blob/master/CONTRIBUTING.md).
 
-* Please create a topic branch for every separate change you make.
-* Make sure your patches are well tested. All specs run with `rake test:portability` must pass.
-* Coding Style Guide: https://gist.github.com/1105334
-
-Contributors
-------------
-
-[https://github.com/GutenYe/pa/contributors](https://github.com/GutenYe/pa/contributors)
+A list of [Contributors](https://github.com/GutenYe/pa/contributors)
 
 Copyright
 ---------

data/lib/pa.rb

@@ -171,6 +171,17 @@ class Pa
     def ext2(path)
       File.extname(get(path))
     end
+    
+    # Return path without ext.
+    #
+    #   Pa.head2("/foo/a.txt") -> "/foo/a")
+    #
+    def head2(path)
+      p = get(path)
+      ext = File.extname(p)
+
+      ext.empty? ? p : p[0...-ext.length]
+    end
 
       # => "ogg", ""
     def fext2(path)
@@ -251,7 +262,7 @@ class Pa
     end
   end
 
-  DELEGATE_ATTR_METHODS2 = [ :dir2, :dir_strict2, :base2, :name2, :ext2, :fext2]
+  DELEGATE_ATTR_METHODS2 = [ :dir2, :dir_strict2, :base2, :name2, :ext2, :fext2, :head2]
   DELEGATE_ATTR_METHODS = [ :absolute, :dir, :dir_strict, :rel, :rea ]
   DELEGATE_METHODS2 = [ :join2 ]
   DELEGATE_METHODS = [ :change, :join]
@@ -259,7 +270,7 @@ class Pa
   DELEGATE_TO_PATH = [:match, :start_with?, :end_with?]
 
 	attr_reader :path2
-  attr_reader :absolute2, :dir2, :dir_strict2, :base2, :name2, :short2, :ext2, :fext2, :rel2, :rea2
+  attr_reader :absolute2, :dir2, :dir_strict2, :base2, :name2, :short2, :ext2, :fext2, :head2, :rel2, :rea2
   attr_reader :options
 
   # @param [Hash] o option

data/lib/pa/cmd.rb

@@ -44,7 +44,7 @@ class Pa
       # @overload ln(src, dest)
       # @overload ln([src,..], directory)
       #
-      # @param [Array<String>, String] src_s support globbing
+      # @param [Array<String>, String] src_s 
       # @param [String,Pa] dest
       # @param [Hash] o
       # @option o [Boolean] :show_cmd puts cmd
@@ -94,7 +94,7 @@ class Pa
       # @option o [Boolean] :show_cmd puts cmd
       def cd(path=ENV["HOME"], o={}, &blk)
         p = get(path)
-        puts "cd #{p}" if (o[:verbose] or o[:show_cmd])
+        puts _wrap_cmd("cd #{p}", o[:show_cmd]) if (o[:verbose] or o[:show_cmd])
         Dir.chdir(p, &blk) 
       end
 
@@ -108,7 +108,7 @@ class Pa
       # @return [nil]
       def chroot(path, o={})
         p = get(path)
-        puts "chdroot #{p}" if (o[:verbose] or o[:show_cmd])
+        puts _wrap_cmd("chdroot #{p}", o[:show_cmd]) if (o[:verbose] or o[:show_cmd])
         Dir.chroot(p)
       end
 
@@ -178,7 +178,7 @@ class Pa
         (name,), o = Util.extract_options(args)
 
         p = _mktmpname(name, o)
-        puts "mktmpdir #{p}" if (o[:verbose] or o[:show_cmd])
+        puts _wrap_cmd("mktmpdir #{p}", o[:show_cmd]) if (o[:verbose] or o[:show_cmd])
 
         Dir.mkdir(p)
 
@@ -204,7 +204,7 @@ class Pa
         (name,), o = Util.extract_options(args)
 
         p = _mktmpname(name, o) 
-        puts "mktmpfile #{p}" if (o[:verbose] or o[:show_cmd])
+        puts _wrap_cmd("mktmpfile #{p}", o[:show_cmd]) if (o[:verbose] or o[:show_cmd])
 
         begin 
           blk.call(p) 
@@ -220,7 +220,7 @@ class Pa
         (name,), o = Util.extract_options(args)
 
         p = _mktmpname(name, o) 
-        puts "mktmpfile #{p}" if (o[:verbose] or o[:show_cmd])
+        puts _wrap_cmd("mktmpfile #{p}", o[:show_cmd]) if (o[:verbose] or o[:show_cmd])
 
         begin 
           blk.call(Pa(p)) 
@@ -234,16 +234,17 @@ class Pa
       # rm file only
       #
       # @overload rm(*paths, o={})
-      #   @param [String] *paths support globbing
+      #   @param [String] *paths
       #   @param o [Boolean] :verbose verbose mode
       #   @param o [Boolean] :show_cmd puts cmd
       # @return [nil]
       def rm(*paths)
         paths, o = Util.extract_options(paths)
         extra_doc = o[:force] ? "-f " : nil
-        puts "rm #{extra_doc}#{paths.join(" ")}" if o[:show_cmd]
+        puts _wrap_cmd("rm #{extra_doc}#{paths.join(' ')}", o[:show_cmd]) if o[:show_cmd]
 
-        Pa.glob(*paths) { |pa|
+        paths.each { |path|
+          pa = Pa(path)
           puts "rm #{extra_doc}#{pa.p}" if o[:verbose]
 
           if File.directory?(pa.p)
@@ -266,7 +267,7 @@ class Pa
 
       # rm directory only. still remove if directory is not empty.
       #
-      # @param [String] *paths support globbing
+      # @param [String] *paths
       # @param [Hash] o options
       # @option o [Boolean] :verbose verbose mode
       # @option o [Boolean] :show_cmd puts cmd
@@ -274,8 +275,9 @@ class Pa
       def rmdir(*paths)
         paths, o = Util.extract_options(paths)
         extra_doc = o[:force] ? "-f " : nil
-        puts "rmdir #{extra_doc}#{paths.join(" ")}" if o[:show_cmd]
-        Pa.glob(*paths) { |pa|
+        puts _wrap_cmd("rmdir #{extra_doc}#{paths.join(" ")}", o[:show_cmd]) if o[:show_cmd]
+        paths.each { |path|
+          pa = Pa(path)
           puts "  rmdir #{extra_doc}#{pa.p}" if o[:verbose]
 
           if not File.directory?(pa.p)
@@ -309,7 +311,7 @@ class Pa
       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]
+        puts _wrap_cmd("empty_dir #{extra_doc}#{dirs.join(" ")}", o[:show_cmd]) if o[:show_cmd]
 
         dirs.each {|dir|
           dir = Pa(dir)
@@ -335,8 +337,9 @@ class Pa
       # @return [nil]
       def rm_r(*paths)
         paths, o = Util.extract_options(paths)
-        puts "rm -r #{path.join(" ")}" if o[:show_cmd]
-        Pa.glob(*paths){ |pa|
+        puts _wrap_cmd("rm -r #{path.join(' ')}", o[:show_cmd]) if o[:show_cmd]
+        paths.each { |path|
+          pa = Pa(path)
           puts "rm -r #{pa.p}" if o[:verbose]
           File.directory?(pa.p)  ? _rmdir(pa) : File.delete(pa.p)
         }
@@ -350,14 +353,15 @@ class Pa
       #     pa.name == 'old'
       #   end
       #
-      # @param [String] *paths support globbing
+      # @param [String] *paths
       # @yield [path]
       # @yieldparam [Pa] path
       # @yieldreturn [Boolean] rm_r path if true
       # @return [nil]
       def rm_if(*paths, &blk)
         paths, o = Util.extract_options(paths)
-        Pa.glob(*paths) do |pa|
+        paths.each do |path|
+          pa = Pa(path)
           rm_r pa, o if blk.call(pa)
         end
       end
@@ -381,7 +385,7 @@ class Pa
       # default: preverse mode, not owner.
       #
       # @overload cp(src_s, dest, o)
-      #   @param [Array<String>, String] src_s support globbing
+      #   @param [Array<String>, String] src_s
       #   @param [String,Pa] dest
       #   @param [Hash] o option
       #   @option o [Boolean] :mkdir mkdir(dest) if dest not exists.
@@ -395,7 +399,7 @@ class Pa
       #   @yield [src,dest,o]
       #   @return [nil]
       def cp(src_s, dest, o={}, &blk)
-        srcs = Pa.glob(*Util.wrap_array(src_s)).map{|v| v.path}
+        srcs = Util.wrap_array(src_s).map{|v| Pa.get(v)}
         dest = Pa.get(dest)
         puts "cp #{srcs.join(" ")} #{dest}" if o[:show_cmd]
 
@@ -435,7 +439,7 @@ class Pa
       # @option o [Boolean] :fore
       # @return [nil]
       def mv(src_s, dest, o={}, &blk)
-        srcs = Pa.glob(*Util.wrap_array(src_s)).map{|v| get(v)}
+        srcs = Util.wrap_array(src_s).map{|v| get(v)}
         dest = get(dest)
 
         extra_doc = o[:force] ? "-f " : nil
@@ -476,6 +480,9 @@ class Pa
       def _move(src, dest, o)
         raise Errno::EEXIST, "dest exists -- #{dest}" if File.exists?(dest) and (not o[:force])
 
+        # move same file.
+        return if File.absolute_path(src) == File.absolute_path(dest)
+
         # :force. mv "dir", "dira" and 'dira' exists and is a directory. 
         if File.exists?(dest) and File.directory?(dest)
             ls(src) { |pa|
@@ -534,7 +541,7 @@ class Pa
         extra_doc << (o[:force] ? "-f " : "")
         puts "ln #{extra_doc}#{srcs.join(" ")} #{dest}" if o[:show_cmd]
 
-        Pa.glob(*srcs) {|src|
+        srcs.each {|src|
           src = get(src)
           dest = File.join(dest, File.basename(src)) if File.directory?(dest)
 
@@ -663,6 +670,16 @@ class Pa
           end
         EOF
       end
+
+      # @private
+      def _wrap_cmd(cmd, pretty)
+        case pretty
+        when "$", "#"
+          "#{pretty} cmd"
+        else
+          cmd
+        end
+      end
     end
   end
 end

data/lib/pa/path.rb

@@ -19,7 +19,6 @@ class Pa
       :relative_to, :shorten, :delete_ext, :add_ext ]
 
     module ClassMethods
-
       # Return current work directory
       #
       # @return [String] path
@@ -116,29 +115,31 @@ class Pa
       #
       # @example
       #
-      #   Pa.has_ext?("foo.txt", ".txt")   -> true
-      #   Pa.has_ext?("foo", ".txt")        -> false
+      #   Pa.has_ext?("foo.txt", ".epub", ".txt")   -> true
+      #   Pa.has_ext?("foo", ".txt")       -> false
       #
-      def has_ext?(path, ext)
-        Pa.ext2(get(path)) == ext
+      def has_ext?(path, *exts)
+        exts.include? Pa.ext2(get(path))
       end
 
       # Delete the tail.
       #
       # @example
       #
-      #   Pa.delete_ext2("foo.txt", ".txt")      -> "foo"
+      #   Pa.delete_ext2("foo.txt", ".epub", ".txt")      -> "foo"
       #   Pa.delete_ext2("foo", ".txt")          -> "foo"
       #   Pa.delete_ext2("foo.epub", ".txt")     -> "foo.epub"
       #
-      def delete_ext2(path, ext)
+      def delete_ext2(path, *exts)
         p = get(path)
 
-        if has_ext?(p, ext)
-          p[0...p.rindex(ext)]
-        else
-          p
-        end
+        exts.each {|ext|
+          if has_ext?(p, ext)
+            return p[0...p.rindex(ext)]
+          end
+        }
+
+        p
       end
 
       # Ensure the tail
@@ -208,8 +209,8 @@ class Pa
 
     end
 
-    DELEGATE_METHODS2 = [ :parent2 ]
-    DELEGATE_METHODS = [ :parent]
+    DELEGATE_METHODS2 = [ :parent2, :delete_ext2, :add_ext2 ]
+    DELEGATE_METHODS = [ :parent, :delete_ext, :add_ext]
 
     DELEGATE_METHODS2.each do |mth2|
       class_eval <<-EOF

data/lib/pa/version.rb

@@ -1,3 +1,3 @@
 class Pa
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spec/pa/path_spec.rb

@@ -81,6 +81,9 @@ describe Pa do
       expect(Pa.has_ext?("foo.txt", ".txt")).to be_true
       expect(Pa.has_ext?("foo", ".txt")).to be_false
       expect(Pa.has_ext?("foo.1txt", ".txt")).to be_false
+
+      expect(Pa.has_ext?("foo.txt", *%w[.epub .txt])).to be_true
+      expect(Pa.has_ext?("foo.txt", *%w[.epub .mobi])).to be_false
     end
   end
 
@@ -89,6 +92,9 @@ describe Pa do
       expect(Pa.delete_ext2("foo.txt", ".txt")).to eq("foo")
       expect(Pa.delete_ext2("foo", ".txt")).to eq("foo")
       expect(Pa.delete_ext2("foo.epub", ".txt")).to eq("foo.epub")
+
+      expect(Pa.delete_ext2("foo.txt", *%w[.epub .txt])).to eq("foo")
+      expect(Pa.delete_ext2("foo.txt", *%w[.epub .mobi])).to eq("foo.txt")
     end
   end
 

data/spec/pa_spec.rb

@@ -94,6 +94,13 @@ describe Pa do
     end
   end
 
+  describe ".head2" do
+    it do
+      expect(Pa.head2("/bar/foo.txt.tar")).to eq("/bar/foo.txt")
+      expect(Pa.head2("/bar/foo")).to eq("/bar/foo")
+    end
+  end
+
   describe "split2" do
     it "split a path into two part: dirname and basename" do
       expect(Pa.split2("/home/b/a.txt")).to eq(["/home/b", "a.txt"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pa
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pd
@@ -35,10 +35,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .bundle/config
 - .gitignore
 - .rspec
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -86,4 +88,3 @@ signing_key:
 specification_version: 3
 summary: a path library for Ruby
 test_files: []
-has_rdoc: