fun_with_files 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/files/file_path.rb

@@ -204,14 +204,15 @@ module FunWith
         split_basename.length > 1 ? split_basename.last : ""
       end
       
-      # given an ancestor dir, returns a relative path that takes you from
-      # the ancestor dir to the pathfile.  TODO: expand to arbitrary paths, not
-      # just immediate ancestors.  For example "/usr/bin/bash".relative_to("/usr/bin/zsh") => "." ?
-      # TODO:  look at Pathname.relative_path_from.  Might just want to alias.
-      def relative_to( ancestor_dir )
-        depth = ancestor_dir.to_s.split(File::SEPARATOR).length
-        relative_path = self.to_s.split(File::SEPARATOR)
-        relative_path[(depth)..-1].join(File::SEPARATOR).fwf_filepath
+      # base, ext =  @path.basename_and_ext
+      def basename_and_ext
+        [basename_no_ext, ext]
+      end
+      
+      # Basically Pathname.relative_path_from, but you can pass in strings
+      def relative_path_from( dir )
+        dir = super( Pathname.new( dir ) )
+        self.class.new( dir )
       end
       
       # gsub acts on the filepath, not the file contents
@@ -227,6 +228,39 @@ module FunWith
       def fwf_filepath
         self
       end
+      
+      # Gives a sequence of files.  Examples:
+      # file.dat --> file.000000.dat
+      # file_without_ext --> file_without_ext.000000
+      # If it sees a six-digit number at or near the end of the
+      # filename, it increments it.
+      #
+      # You can change the length of the sequence string by passing
+      # in an argument, but it should always be the same value for
+      # a given set of files.
+      SUCC_DIGIT_COUNT = 6
+      def succ( digit_count = SUCC_DIGIT_COUNT )
+        chunks = basename.to_s.split(".")
+        if chunks.length == 1  # not being counted, no file extension.
+          chunks.push( "0" * digit_count )
+        elsif match_data = chunks[-2].match( /^(\d{#{digit_count}})$/ )
+          i = match_data[1].to_i + 1
+          chunks[-2] = sprintf("%0#{digit_count}i", i)
+        elsif  match_data = chunks[-1].match( /^(\d{#{digit_count}})$/ )
+          i = match_data[1].to_i + 1
+          chunks[-1] = sprintf("%0#{digit_count}i", i)
+        else  # not being counted, has file extension
+          chunks = [chunks[0..-2], ("0" * digit_count), chunks[-1]].flatten
+        end
+
+        self.up.join( chunks.join(".") )
+      end
     end
+    
+    # TODO: succession : enumerates a sequence of files that get passed
+    # to a block in order.
+    
+    # TODO: succ_last : find the last existing file of the given sequence.
+    # TODO: succ_next : find the first free file of the given sequence
   end
 end

data/lib/files/pathname_extensions.rb

@@ -0,0 +1,5 @@
+class Pathname
+  def fwf_filepath(*args)
+    FunWith::Files::FilePath.new( self, *args )
+  end
+end

data/lib/fun_with_files.rb

@@ -7,6 +7,7 @@ require_relative File.join("files", "file_path")
 require_relative File.join("files", "root_path")
 require_relative File.join("files", "remote_path")
 require_relative File.join("files", "string_extensions")
+require_relative File.join("files", "pathname_extensions")
 
 FunWith::Files::RootPath.rootify( FunWith::Files, FunWith::Files::FilePath.new(__FILE__).dirname.up )
 

data/test/test_file_path.rb

@@ -32,6 +32,27 @@ class TestFilePath < Test::Unit::TestCase
       #invoking down didn't change original
       assert_no_match /ask_for_floyd/, f2.to_s
     end
+    
+    should "convert from string" do
+      str = "/"
+      f1 = FilePath.new(str)
+      f2 = str.fwf_filepath
+      
+      assert_equal f1, f2
+    end
+    
+    should "convert from pathname" do
+      str = "/"
+      f1 = FilePath.new(str)
+      f2 = Pathname.new(str).fwf_filepath
+      
+      assert_equal f1, f2
+      
+      f3 = f1.join( "bin", "bash" )
+      f4 = Pathname.new( str ).fwf_filepath( "bin", "bash" )
+      
+      assert_equal f3, f4
+    end
   end
   
   context "test glob" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_files
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -106,6 +106,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ./lib/files/file_path.rb
+- ./lib/files/pathname_extensions.rb
 - ./lib/files/remote_path.rb
 - ./lib/files/root_path.rb
 - ./lib/files/string_extensions.rb
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1077870850940227410
+      hash: -2333632354630146614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: