fun_with_files 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDc0MmI0ZDg0NWRkMTFmMTBkMGM1ZTRhZjA4MTc4OWMwOTZmN2RhNA==
-  data.tar.gz: !binary |-
-    OTE2Y2IxNTI0Y2U0Y2VhNjFlODlmOWE0NmM2ZTAxZjNlMzlkYzZjYg==
+SHA1:
+  metadata.gz: cf6595c5de6273e8d7fb668ddc70d161a1354c4c
+  data.tar.gz: 4938516e5ad413f8ffa722985d963fcb6eb1f039
 SHA512:
-  metadata.gz: !binary |-
-    ZWFjZTJjZjkyMTUwZDU1M2MxOTcyYTM5OTYwYzQzYjlhNTBiMDAxZjJmNmU1
-    Yjk4ZTBiYThhMTc0ZDVlZTQ2MDQzZjQ1ZmQ0NmE3MDQxZmQzNDJiMzJhZjAx
-    YjRmNGRkNGRhZTUyMWI2ZWU4NTkzMjk3ZTQzOTdlZDhlMjYxZDg=
-  data.tar.gz: !binary |-
-    M2Q0Zjc1NjAxZDdlZGQ1Y2YzNzc1ZTAzYjAwZjRlYTdmM2MxMDM1ZDVjMDAy
-    MGExZDRhMTFjYTQ4NTI1NzdiNGIzNDRkZTY4ZGRhMjYyNDM2ZjQ0YmI1Zjdl
-    NTZlNTc3MmM1NTYwZTNhNjgxODEyNTUxYzhhMDljNzUzYTUzMTY=
+  metadata.gz: 09db56d93b3cde0407d1f0e7d8691ab0373158301828ee5af974c1cb259369c2f8a5c43c79eb37352760bede2d5d4d4f310887b9129aba917100109643138787
+  data.tar.gz: 06690ccc56d90230e7d8c55a9f9372cc74dc9f6ff1104fe7f8ea26c1efdb601b5ff221a0c4250630d40ab7e2a065cc71ff124545de1ed1a66405fc591ffbc49a

data/CHANGELOG.markdown

@@ -0,0 +1,50 @@
+CHANGELOG
+=========
+
+v0.0.14
+=======
+
+Make symlinking actually work in a sensible way.
+
+v0.0.12
+=======
+
+FilePath.touch() takes same options as FileUtils.touch()
+FilePath.glob() now takes a block (yields files one at a time)
+
+
+
+v0.0.9
+------
+
+Changed the initialization procedure, which wasn't working on some systems.
+
+v0.0.8
+------
+
+A few new, useful functions.  .ext() overloaded to take an argument, spit out the path with .arg added to the end.  timestamp() 
+
+v0.0.7
+------
+
+Added dependency on `fun_with_version_strings`.  Then removed it, cuz fwvs needs fwf more.  Bleh.
+Added filepath.md5() => hexdigest of file contents.
+Added shaXXXX functions, so the poor li'l crypto won't feel left out.
+
+
+0.0.4 - 0.0.6
+-------------
+
+I've not been so good about updating this doc.
+
+
+0.0.3
+-----
+
+Added .succession() to get all existing files within a succession group.  The differentiating piece of the filename can be either a timestamp or a numeric ID.
+
+
+TODO
+----
+
+* It really makes more sense for path.basename to return a string instead of a filepath.  Or is it?  Why does Pathname.basename return a path?  Imma cargo cult this and leave it as-is.

data/README.rdoc

@@ -1,4 +1,4 @@
-= fun_with_files
+= fun_with_files =
 
 FunWith::Files adds a bit of whimsy to your file manipulations, if that's what you're looking for.
 
@@ -34,7 +34,15 @@ To the code!
     
     # whole buchcha other goodies, yet to be documented.
     
-== DirectoryBuilder
+
+
+=== Linking files ===
+
+While fwf.symlink and fwf.link are both backed by FileUtils.ln / FileUtils.ln_s, the defaults are somewhat different
+
+
+
+== DirectoryBuilder ==
 
 DirectoryBuilder is a class for defining and populating a file hierarchy with relative ease.  DirectoryBuilder is probably most easily demonstrated by example.  Sample code:
 

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/fun_with/files/core_extensions/file.rb

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

data/lib/fun_with/files/directory_builder.rb

@@ -4,7 +4,7 @@ module FunWith
     # Describes a domain-specific language for creating and populating a
     # directory of files.
     class DirectoryBuilder
-      attr_accessor :current_path, :current_file
+      attr_accessor :current_path
       
       def initialize( path )
         @paths = []
@@ -68,10 +68,16 @@ module FunWith
         end
       end
       
-      def current_file
-        @current_file ? FunWith::Files::FilePath.new( @current_file.path ) : nil
+      attr_reader :current_file
+      
+      def current_file=( file )
+        @current_file = file.fwf_filepath
       end
       
+      # def current_file
+      #   @current_file ? FunWith::Files::FilePath.new( @current_file.path ) : nil
+      # end
+      
       # if file not given, the result is appended to the current file.
       def download( url, file = nil )
         if file

data/lib/fun_with/files/file_manipulation_methods.rb

@@ -21,45 +21,68 @@ module FunWith
       #
       # 
       def cp( *args )
-        dest, opts = self.destination_and_options( args )
-        FileUtils.cp_r( self, dest, narrow_options( opts, FileUtils::OPT_TABLE["cp_r"] ) )
-        dest.fwf_filepath
+        destination_and_options( args ) do |dest, opts|
+          FileUtils.cp_r( self, dest, narrow_options( opts, FileUtils::OPT_TABLE["cp_r"] ) )
+          dest.fwf_filepath
+        end
       end
       
       alias :copy :cp
       
+      # Treat as a copy then a delete?  Nah, that's a lot slower in some cases.  Should be much more in tune with what the command line program does
       def mv( *args )
         
       end
       
+      alias :move :mv
+      
       
-      # self is the target, link is the thing linking to self
+      # Logic of link()
+      #
+      # self is the target, link is the filepath entry linking to the file represented by self
       # returns filepath of the new link.  Will fall back to symbolic
-      # link if self is a directory
-      def ln( *args )
-        self.destination_and_options( args ) do |link, opts|
-          symlink = self.directory? || opts[:symbolic] || opts[:sym] || opts[:soft]
+      # link if self is a directory.  Necessary directories will be created.
+      def link *args
+        self.destination_and_options( args ) do |lnk, opts|
+          symlink_requested = self.directory? || opts[:symbolic] || opts[:sym] || opts[:soft]
         
-          if symlink
-            FileUtils.ln_s( self, link, narrow_options( opts, FileUtils::OPT_TABLE["ln_s"] ) )
+          if symlink_requested
+            self.symlink lnk, opts
           else
-            FileUtils.ln( self, link, narrow_options( opts, FileUtils::OPT_TABLE["ln"] ) )
+            opts = narrow_options opts, FileUtils::OPT_TABLE["ln"]
+            
+            FileUtils.ln self, lnk, opts
           end
           
-          link.fwf_filepath
+          lnk.fwf_filepath
         end
       end
       
-      alias :link :ln
+      alias :ln :link
 
-      
-      def ln_s( *args )
-        link, opts = self.destination_and_options( args )
-        FileUtils.ln_s( self, link, narrow_options( opts, FileUtils::OPT_TABLE["ln_s"] ) )
-        link.fwf_filepath
+      # * Where does the symlink live in the filesys.
+      # * What does it point to?
+      # * How does it point to the thing?
+      #     * absolutely
+      #     * relatively
+      #     * custom string (programmer error hilarity ensues?)
+      # It can't 
+      # What to return?  The path of the symlink, or the path of the target?
+      # 
+      def symlink( *args )
+        lnk, opts = self.destination_and_options( args )
+        
+        if opts[:absolute]
+          lnk = lnk.fwf_filepath.expand
+        else
+          lnk = lnk.fwf_filepath
+        end
+        
+        FileUtils.ln_s( self, lnk, narrow_options( opts, FileUtils::OPT_TABLE["ln_s"] ) )
+        lnk.fwf_filepath
       end
       
-      alias :symlink :ln_s
+      alias :ln_s :symlink
       
       
       def file_gsub( *args, &block )
@@ -118,10 +141,11 @@ module FunWith
         end
       end
       
+      
       protected
       def destination_and_options( args, &block )
         options = args.last.is_a?(Hash) ? args.pop : {}
-        destination = self.find_destination_from_args( args )
+        destination = self._find_destination_from_args( args )
         
         if block_given?
           yield [destination, options]
@@ -140,7 +164,7 @@ module FunWith
       # If dest doesn't exist, and src (self) is a file, dest is taken to be the complete path.
       # If dest doesn't exist, and src (self) is a directory, then dest is taken to be 
       # If dest is a directory and the source is a file, then the file will be copied into dest with the src's basename
-      def find_destination_from_args( args )
+      def _find_destination_from_args( args )
         raise ArgumentError.new("File #{self} must exist.") unless self.exist?
         
         if args.first.is_a?(Pathname) 

data/lib/fun_with/files/file_path.rb

@@ -1,6 +1,7 @@
 module FunWith
   module Files
     class FilePath < Pathname
+
       SUCC_DIGIT_COUNT = 6
       DEFAULT_TIMESTAMP_FORMAT = "%Y%m%d%H%M%S%L"
       
@@ -44,50 +45,57 @@ module FunWith
         self.join(*args)
       end
       
-      alias :exists? :exist?
       
       def doesnt_exist?
         self.exist? == false
       end
       
+      def not_a_file?
+        ! self.file?
+      end
+
+      alias :absent? :doesnt_exist?
+      alias :exists? :exist?
+      alias :folder? :directory?
+
       # If called on a file instead of a directory,
       # has the same effect as path.dirname
       def up
         self.class.new( self.join("..") ).expand
       end
-      
+
       alias :down :join
-      
+
       # opts:
-      #    :flags  =>  File::FNM_CASEFOLD  
-      #                File::FNM_DOTMATCH  
-      #                File::FNM_NOESCAPE  
-      #                File::FNM_PATHNAME  
-      #                File::FNM_SYSCASE   
-      #                See Dir documentation for details.  
-      #                  Can be given as an integer: (File::FNM_DOTMATCH | File::FNM_NOESCAPE)  
+      #    :flags  =>  File::FNM_CASEFOLD
+      #                File::FNM_DOTMATCH
+      #                File::FNM_NOESCAPE
+      #                File::FNM_PATHNAME
+      #                File::FNM_SYSCASE
+      #                See Dir documentation for details.
+      #                  Can be given as an integer: (File::FNM_DOTMATCH | File::FNM_NOESCAPE)
       #                  or as an array: [File::FNM_CASEFOLD, File::FNM_DOTMATCH]
-      #                
+      #
       #    :class  =>  [self.class] The class of objects you want returned (String, FilePath, etc.)
       #                Should probably be a subclass of FilePath or String.  Class.initialize() must accept a string
       #                [representing a file path] as the sole argument.
       #
       #    :recurse => [defaults true]
       #    :recursive (synonym for :recurse)
-      #    
+      #
       #    :ext => []  A single symbol, or a list containing strings/symbols representing file name extensions.
       #                No leading periods kthxbai.
       #    :sensitive => true : do a case sensitive search.  I guess the default is an insensitive search, so
       #                         the default behaves similarly on Windows and Unix.  Not gonna fight it.
       #
-      #    :dots => true      : include dotfiles.  Does not include . and ..s unless you also 
-      #                         specify the option :parent_and_current => true.  
-      #     
+      #    :dots => true      : include dotfiles.  Does not include . and ..s unless you also
+      #                         specify the option :parent_and_current => true.
+      #
       #    If opts[:recurse] / opts[:ext] not given, the user can get the same
       #    results explicitly with arguments like .glob("**", "*.rb")
-      # 
+      #
       # :all : if :all is the only argument, this is the same as .glob("**", "*")
-      # 
+      #
       # Examples:
       # @path.glob( "css", "*.css" )      # Picks up all css files in the css folder
       # @path.glob( "css", :ext => :css ) # same
@@ -95,20 +103,20 @@ module FunWith
       # @path.glob(:all)                  # same. Note: :all cannot be used in conjunction with :ext or any other arguments.  Which may be a mistake on my part.
       # @path.glob("**", "*")             # same
       # @path.entries                     # synonym for :all, :recursive => false
-      # 
+      #
       # TODO:  depth argument?  depth should override recurse.  When extention given, recursion should default to true?
       #        the find -depth argument says depth(0) is the root of the searched directory, any files beneath would be depth(1)
       def glob( *args, &block )
         args.push( :all ) if args.fwf_blank?
         opts = args.last.is_a?(Hash) ? args.pop : {}
-        
+
         if args.last == :all
           all_arg_given = true
           args.pop
         else
           all_arg_given = false
         end
-        
+
         flags = case (flags_given = opts.delete(:flags))
                 when NilClass
                   0
@@ -119,10 +127,10 @@ module FunWith
                 when Integer
                   flags_given
                 end
-        
+
         flags |= File::FNM_DOTMATCH if opts[:dots]
         flags |= File::FNM_CASEFOLD if opts[:sensitive]   # case sensitive.  Only applies to Windows.
-    
+
         recurse = if all_arg_given
                     if opts[:recursive] == false || opts[:recurse] == false
                       false
@@ -132,7 +140,7 @@ module FunWith
                   else
                     opts[:recursive] == true || opts[:recurse] == true || false
                   end
-        
+
         if all_arg_given
           if recurse
             args = ["**", "*"]
@@ -155,15 +163,15 @@ module FunWith
               nil
             end
           end
-          
+
           args.push( extensions ) if extensions
         end
-        
+
         class_to_return = opts[:class] || self.class
-        
+
         files = Dir.glob( self.join(*args), flags ).map{ |f| class_to_return.new( f ) }
         files.reject!{ |f| f.basename.to_s.match( /^\.\.?$/ ) } unless opts[:parent_and_current]
-        
+
         if block_given?
           for file in files
             yield file
@@ -172,11 +180,11 @@ module FunWith
           files
         end
       end
-      
+
       def entries
         self.glob( :recurse => false )
       end
-      
+
       def expand
         self.class.new( File.expand_path( self ) )
       end
@@ -184,14 +192,14 @@ module FunWith
       # Raises error if self is a file and args present.
       # Raises error if the file is not accessible for writing, or cannot be created.
       # attempts to create a directory
-      # 
+      #
       # Takes an options hash as the last argument, allowing same options as FileUtils.touch
       def touch( *args, &block )
         args, opts = extract_opts_from_args( args )
-        
+
         raise "Cannot create subdirectory to a file" if self.file? && args.length > 0
         touched = self.join(*args)
-        
+
         dir_for_touched_file = case args.length
           when 0
             self.up
@@ -200,39 +208,63 @@ module FunWith
           when 2..Float::INFINITY
             self.join( *(args[0..-2] ) )
           end
-        
+
         self.touch_dir( dir_for_touched_file, opts ) unless dir_for_touched_file.directory?
         FileUtils.touch( touched, narrow_options( opts, FileUtils::OPT_TABLE["touch"] ) )
-        
+
         yield touched if block_given?
         return touched
       end
-      
+
       # Takes the options of both FileUtils.touch and FileUtils.mkdir_p
       # mkdir_p options will only matter if the directory is being created.
       def touch_dir( *args, &block )
         args, opts = extract_opts_from_args( args )
-        
+
         touched = self.join(*args)
         if touched.directory?
           FileUtils.touch( touched, narrow_options( opts, FileUtils::OPT_TABLE["touch"] ) )    # update access time
         else
           FileUtils.mkdir_p( touched, narrow_options( opts, FileUtils::OPT_TABLE["mkdir_p"] ) )  # create directory (and any needed parents)
         end
-        
+
         yield touched if block_given?
         return touched
       end
-      
-      def write( content = nil, &block )
-        File.open( self, "w" ) do |f|
-          f << content if content
-          if block_given?
-            yield f
+
+      def write( *args, &block )
+        args, opts = extract_opts_from_args( args )
+
+        content = args.first
+
+        if content == :random
+          self.write_random_data( opts )
+        else
+          File.open( self, "w" ) do |f|
+            f << content if content
+            if block_given?
+              yield f
+            end
           end
         end
       end
-      
+
+      # sz:  number of bytes to write to the file
+      # opts[:mode] => :overwrite or :append
+      # seed:  What number to seed the random number generator with
+      #
+      # FUTURE:  May perform slowly on large sz inputs?
+      def write_random_data( sz, opts = {} )
+        rng = Random.new( opts[:seed] || Random::new_seed )
+        mode = opts[:mode] || :overwrite
+
+        if mode == :overwrite
+          self.write( rng.bytes( sz ) )
+        elsif mode == :append
+          self.append( rng.bytes( sz ) )
+        end
+      end
+
       def append( content = nil, &block )
         File.open( self, "a" ) do |f|
           f << content if content
@@ -241,9 +273,9 @@ module FunWith
           end
         end
       end
-      
+
       # Returns a [list] of the lines in the file matching the given file.  Contrast with
-      
+
       def grep( regex, &block )
         return [] unless self.file?
         matching = []
@@ -251,8 +283,8 @@ module FunWith
           matching.push( line ) if line.match( regex )
           yield line if block_given?
         end
-        
-        
+
+
         matching
       end
 
@@ -261,23 +293,23 @@ module FunWith
       # must not have any data in it.
       def empty?
         raise Exceptions::FileDoesNotExist unless self.exist?
-        
+
         if self.file?
           File.size( self ) == 0
         elsif self.directory?
           self.glob( :all ).fwf_blank?
         end
       end
-            
+
       # Does not return a filepath
       def basename_no_ext
         self.basename.to_s.split(".")[0..-2].join(".")
       end
-      
+
       def without_ext
         self.gsub(/\.#{self.ext}$/, '')
       end
-      
+
       # Two separate modes.  With no arguments given, returns the current extension as a string (not a filepath)
       # With an argument, returns the path with a .(arg) tacked onto the end.  The leading period is wholly optional.
       # Does not return a filepath.
@@ -286,52 +318,58 @@ module FunWith
         if args.length == 0
           split_basename = self.basename.to_s.split(".")
           split_basename.length > 1 ? split_basename.last : ""
-        elsif args.length == 1
-          ext = args.first.to_s.gsub(/^\./,'')
-          self.class.new( @path.dup + ".#{ext}" )
+        else
+          
+          append_to_path = args.compact.map{ |ex|
+            ex.to_s.gsub( /^\./, '' )
+          }.compact.join( "." )
+          
+          appended_to_path = "." + "#{append_to_path}" unless append_to_path.fwf_blank?
+          
+          self.class.new( "#{@path}#{appended_to_path}" )
         end
       end
-      
+
       # base, ext =  @path.basename_and_ext
       def basename_and_ext
         [self.basename_no_ext, self.ext]
       end
-      
-      
-      
+
+
+
       def dirname_and_basename
         warn("FilePath#dirname_and_basename() is deprecated.  Pathname#split() already existed, and should be used instead.")
         [self.dirname, self.basename]
       end
-      
+
       def dirname_and_basename_and_ext
         [self.dirname, self.basename_no_ext, self.ext]
       end
-      
+
       # if it's a file, returns the immediate parent directory.
       # if it's not a file, returns itself
       def directory
         self.directory? ? self : self.dirname
       end
-      
+
       def original?
         !self.symlink?
       end
-      
+
       def original
         self.symlink? ? self.readlink.original : self
       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
-    
+
       def fwf_filepath
         self
       end
-      
+
       # Gives a sequence of files.  Examples:
       # file.dat --> file.000000.dat
       # file_without_ext --> file_without_ext.000000
@@ -341,7 +379,7 @@ module FunWith
       # 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.
-      # 
+      #
       # TODO: Need to get this relying on the specifier() method.
       def succ( opts = { digit_count: SUCC_DIGIT_COUNT, timestamp: false } )
         if timestamp = opts[:timestamp]
@@ -352,7 +390,7 @@ module FunWith
           timestamp = false
           digit_count = opts[:digit_count]
         end
-        
+
         chunks = self.basename.to_s.split(".")
         # not yet sequence stamped, no file extension.
         if chunks.length == 1
@@ -384,17 +422,17 @@ module FunWith
 
         self.up.join( chunks.join(".") )
       end
-    
-      
+
+
       def timestamp( format = true, &block )
         nxt = self.succ( :timestamp => format )
         yield nxt if block_given?
         nxt
       end
-    
+
       # puts a string between the main part of the basename and the extension
       # or after the basename if there is no extension.  Used to describe some
-      # file variant. 
+      # file variant.
       # Example "/home/docs/my_awesome_screenplay.txt".fwf_filepath.specifier("final_draft")
       #  => FunWith::Files::FilePath:/home/docs/my_awesome_screenplay.final_draft.txt
       #
@@ -402,16 +440,16 @@ module FunWith
       def specifier( str )
         str = str.to_s
         chunks = self.to_s.split(".")
-        
+
         if chunks.length == 1
           chunks << str
         else
           chunks = chunks[0..-2] + [str] + [chunks[-1]]
         end
-        
+
         chunks.join(".").fwf_filepath
       end
-    
+
       # TODO: succession : enumerates a sequence of files that get passed
       # to a block in order.
       def succession( opts = { digit_count: SUCC_DIGIT_COUNT, timestamp: false } )
@@ -423,10 +461,10 @@ module FunWith
           timestamp = false
           digit_count = opts[:digit_count]
         end
-      
+
         chunks = self.basename.to_s.split(".")
         glob_stamp_matcher = '[0-9]' * digit_count
-        
+
         # unstamped filename, no extension
         if chunks.length == 1
           original = chunks.first
@@ -444,15 +482,15 @@ module FunWith
           original = chunks.join(".")
           stamped = [ chunks[0..-2], glob_stamp_matcher, chunks[-1] ].flatten.join(".")
         end
-      
+
         [self.dirname.join(original), self.dirname.glob(stamped)].flatten
       end
 
 
-    
+
       # TODO: succ_last : find the last existing file of the given sequence.
       # TODO: succ_next : find the first free file of the given sequence
-    
+
       def load
         if self.directory?
           self.glob( :recursive => true, :ext => "rb" ).map(&:load)
@@ -460,12 +498,12 @@ module FunWith
           Kernel.load( self.expand )
         end
       end
-      
+
       # Require ALL THE RUBY!
       # This may be a bad idea...
-      # 
+      #
       # Sometimes it fails to require a file because one of the necessary prerequisites
-      # hasn't been required yet (NameError).  requir catches this failure and stores 
+      # hasn't been required yet (NameError).  requir catches this failure and stores
       # the failed requirement in order to try it later.  Doesn't fail until it goes through
       # a full loop where none of the required files were successful.
       def requir
@@ -474,12 +512,12 @@ module FunWith
           successfully_required = 1337  # need to break into initial loop
           failed_requirements = []
           error_messages = []
-          
+
           while requirements.length > 0 && successfully_required > 0
             successfully_required = 0
             failed_requirements = []
             error_messages = []
-            
+
             for requirement in requirements
               begin
                 requirement.requir
@@ -489,30 +527,30 @@ module FunWith
                 error_messages << "Error while requiring #{requirement} : #{e.message} (#{e.class})"
               end
             end
-            
+
             requirements = failed_requirements
           end
-          
+
           if failed_requirements.length > 0
             msg = "requiring directory #{self} failed:\n"
             for message in error_messages
               msg << "\n\terror message: #{message}"
             end
-            
+
             raise NameError.new(msg)
           end
         else
           require self.expand.gsub( /\.rb$/, '' )
         end
       end
-      
+
       def root?
         self == self.up
       end
-      
+
       def descend( &block )
         path = self.clone
-        
+
         if path.root?
           yield path
         else
@@ -520,10 +558,10 @@ module FunWith
           yield self
         end
       end
-      
+
       def ascend( &block )
         path = self.clone
-        
+
         if path.root?
           yield path
         else
@@ -531,7 +569,7 @@ module FunWith
           self.up.ascend( &block )
         end
       end
-    
+
       def to_pathname
         Pathname.new( @path )
       end
@@ -546,7 +584,7 @@ module FunWith
       #   end
       #   # otherwise we're installing a separator
       # end
-      
+
       protected
       # TODO: Need a separate API for user to call
       def _must_be_a_file
@@ -555,25 +593,25 @@ module FunWith
           raise Errno::EACCESS.new( "Can only call FunWith::Files::FilePath##{calling_method}() on an existing file.")
         end
       end
-      
+
       def _must_be_a_directory
         unless self.directory?
           calling_method = caller[0][/`.*'/][1..-2]
           raise Errno::EACCESS.new( "Can only call FunWith::Files::FilePath##{calling_method}() on an existing directory.")
         end
       end
-      
+
       def _must_be_writable
         unless self.writable?
           calling_method = caller[0][/`.*'/][1..-2]
           raise Errno::EACCESS.new( "Error in FunWith::Files::FilePath##{calling_method}(): #{@path} not writable.")
         end
       end
-      
+
       def narrow_options( opts, keys )
         opts.keep_if{ |k,v| keys.include?( k ) }
       end
-      
+
       def extract_opts_from_args( args )
         if args.last.is_a?( Hash )
           [args[0..-2], args.last ]
@@ -581,7 +619,7 @@ module FunWith
           [args, {}]
         end
       end
-      
+
       def yield_and_return( obj, &block )
         yield obj if block_given?
         obj

data/test/test_directory_builder.rb

@@ -29,12 +29,16 @@ class TestDirectoryBuilder < FunWith::Files::TestCase
         assert_equal DirectoryBuilder, b.class
         assert b.current_path
         assert b.current_path.exist?
+        
         b.file("widdershins.txt") do |f|
+          assert_empty_file( f.fwf_filepath )
+          
           f << "Hello World"
           f.flush
-        
-          assert b.current_file.exist?
-          assert_equal 11, b.current_file.size
+          
+          fil = b.current_file.fwf_filepath
+          assert_file_not_empty fil
+          assert_equal 11, fil.size
         end
       end
     end

data/test/test_file_manipulation.rb

@@ -85,7 +85,7 @@ class TestFileManipulation < FunWith::Files::TestCase
     
     should "symlink masterfully" do
       file = @dir.join( "original.txt" )
-      file.write( "This is the original file" )
+      file.write( "I AM SPARTACUS" )
       
       clone = file.symlink( "clone.txt" )
       clone_of_clone = clone.symlink( "clone_of_clone.txt" )
@@ -93,7 +93,14 @@ class TestFileManipulation < FunWith::Files::TestCase
       assert( clone_of_clone.symlink? )
       assert_equal( file, clone_of_clone.original )
       
-      assert_file_contents( clone_of_clone, /This is the/ )
+      assert_file_contents( clone_of_clone, /I AM SPARTACUS/ )
+      
+      subdir = @dir.join( "subdir" ).touch_dir
+      
+      subdir_clone = clone_of_clone.symlink( subdir.join( "clone.txt" ) )
+      subdir_clone_of_clone = subdir_clone.symlink( "clone_of_clone.txt" )
+      
+      assert_file_contents( subdir_clone_of_clone, /I AM SPARTACUS/ )
     end
     
     should "do nothing when opts[:noop]" do
@@ -101,5 +108,35 @@ class TestFileManipulation < FunWith::Files::TestCase
       file.touch( :noop => true, :this_invalid_option_is_ignored => true, :also_this_one => "also ignored" )
       assert_no_file file
     end
+    
+    should "pass exhaustive copypalooza" do
+      dir_abc = @dir.join( "A", "B", "C" ).touch_dir
+      dir_def = @dir.join( "D", "E", "F" ).touch_dir
+      
+      file_abc = dir_abc.join( "abc.txt" )
+      file_abc.write( "this space for rent" )
+      
+      assert_file_contents file_abc, /rent/
+      
+      file_def = file_abc.cp( dir_def )
+      
+      assert_match /abc\.txt/, file_def.path
+      assert_file_contents file_def, /rent/
+      
+      
+      # Examples:  @dir.cp( "~/tmp/dir" ) would use _find_destination_from_args() to select /Users/me/tmp/dir filepath
+      # If it's already a file, raise an error.  If the directory exists already, hmmm.... I want it to not matter, but 
+      # it matters.  And the issues raised by each operation are different.  I want them to behave as similarly as possible,
+      # but maybe it's okay to copy a directory's contents to an existing directory, but not okay to turn that existing directory
+      # into a symlink.  
+      # Assume file = "~/testdir/file.txt"
+      # 
+      # file.cp( "copy.txt" )  =>   Copies into the same directory.  
+      # file.cp( "../pouncer_of_destiny.epubforge") (an existing directory, despite the .ext)  ==>  copies into ../pouncer_of_destiny.epubforge/file.txt
+      # file.cp( "~/tmp/32fb768cd" ) (dest doesn't exist)
+      #
+      # Assume dir = "~/testdir/"  (existing directory with file.txt in it)
+      # dir.cp( "")
+    end
   end
 end

data/test/test_file_path.rb

@@ -207,7 +207,7 @@ class TestFilePath < FunWith::Files::TestCase
       @read_only_file = "/bin/bash".fwf_filepath   # This usually exists. I don't know enough Windows to think of a similarly ubiquitous file.
       
       if @read_only_file.file? && ! @read_only_file.writable?
-        assert_raises( Errno::EACCES ) do
+        assert_raises( Errno::EPERM ) do
           @read_only_file.touch
         end
       else
@@ -215,4 +215,35 @@ class TestFilePath < FunWith::Files::TestCase
       end
     end
   end
+  
+  context "test ext()" do
+    setup do
+      @path = "hello.txt".fwf_filepath
+    end
+    
+    should "not change path when sent nil as an argument" do
+      assert_equal @path.path, @path.ext( nil ).path
+    end
+    
+    should "append when given symbol" do
+      assert_equal @path.path + ".tgz", @path.ext( :tgz ).path
+    end
+    
+    should "append when given string" do
+      assert_equal @path.path + ".tgz", @path.ext( 'tgz' ).path
+    end
+    
+    should "append correctly when given leading ." do
+      assert_equal @path.path + ".tgz", @path.ext( '.tgz' ).path
+    end
+    
+    should "append multiple extensions as separate args" do
+      assert_equal @path.path + ".backup.tar.gz", @path.ext( :backup, "tar", nil, ".gz" ).path
+    end
+    
+    should "append multiple extensions as a single string" do
+      assert_equal @path.path + ".backup.tar.gz", @path.ext( ".backup.tar.gz" ).path
+    end
+    
+  end
 end

data/test/test_fun_with_files.rb

@@ -26,7 +26,7 @@ class TestFunWithFiles < FunWith::Files::TestCase
       assert_respond_to( FunWith::Files, :root )
       assert_respond_to( FunWith::Files, :version )
       
-      assert_equal "0.0.11", FunWith::Files.version   # Gotta change with every point release.  Ick.
+      assert_equal "0.0.13", FunWith::Files.version   # Gotta change with every point release.  Ick.
     end
   end
 end

data/test/test_symlinking.rb

@@ -19,5 +19,8 @@ class TestTouching < FunWith::Files::TestCase
       link = file.link( file.up.up.up.join( "hash.dat"), :soft => true )
       assert link.symlink?
     end
+
+    should "create a "
+
   end
 end

metadata

@@ -1,108 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_files
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Bryce Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: fun_with_testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-description: ! "  A more intuitive syntax for performing a variety of file actions.
-  Examples:\n    \"/\".fwf_filepath.join('usr', 'bin', 'bash').touch\n    FunWith::Files::FilePath.home(\"Music\").glob(:ext
-  => \"mp3\", :recurse => true)\n    home = FunWith::Files::FilePath.home\n    home.touch(
-  \"Music\", \"CDs\", \"BubbleBoyTechnoRemixxxx2011\", \"01-jiggypalooza.mp3\" )\n
-  \   home.touch_dir( \"Music\", \"CDs\", \"ReggaeSmackdown2008\" ) do |dir|\n      dir.touch(
-  \"liner_notes.txt\" )\n      dir.touch( \"cover.jpg\" )\n      dir.touch( \"01-tokin_by_the_sea.mp3\"
-  )\n      dir.touch( \"02-tourists_be_crazy_mon.mp3\" )\n    end\n"
+description: |2
+    A more intuitive syntax for performing a variety of file actions. Examples:
+      "/".fwf_filepath.join('usr', 'bin', 'bash').touch
+      FunWith::Files::FilePath.home("Music").glob(:ext => "mp3", :recurse => true)
+      home = FunWith::Files::FilePath.home
+      home.touch( "Music", "CDs", "BubbleBoyTechnoRemixxxx2011", "01-jiggypalooza.mp3" )
+      home.touch_dir( "Music", "CDs", "ReggaeSmackdown2008" ) do |dir|
+        dir.touch( "liner_notes.txt" )
+        dir.touch( "cover.jpg" )
+        dir.touch( "01-tokin_by_the_sea.mp3" )
+        dir.touch( "02-tourists_be_crazy_mon.mp3" )
+      end
 email: keeputahweird@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.markdown
 - LICENSE.txt
 - README.rdoc
 files:
-- ./lib/fun_with/files/core_extensions/array.rb
-- ./lib/fun_with/files/core_extensions/false.rb
-- ./lib/fun_with/files/core_extensions/hash.rb
-- ./lib/fun_with/files/core_extensions/nil.rb
-- ./lib/fun_with/files/core_extensions/object.rb
-- ./lib/fun_with/files/core_extensions/string.rb
-- ./lib/fun_with/files/digest_methods.rb
-- ./lib/fun_with/files/directory_builder.rb
-- ./lib/fun_with/files/downloader.rb
-- ./lib/fun_with/files/errors.rb
-- ./lib/fun_with/files/file_manipulation_methods.rb
-- ./lib/fun_with/files/file_orderer.rb
-- ./lib/fun_with/files/file_path.rb
-- ./lib/fun_with/files/file_path_class_methods.rb
-- ./lib/fun_with/files/file_permission_methods.rb
-- ./lib/fun_with/files/file_requirements.rb
-- ./lib/fun_with/files/gem_api.rb
-- ./lib/fun_with/files/pathname_extensions.rb
-- ./lib/fun_with/files/remote_path.rb
-- ./lib/fun_with/files/root_path.rb
-- ./lib/fun_with/files/string_behavior.rb
-- ./lib/fun_with/files/string_extensions.rb
-- ./lib/fun_with/files/xdg_extensions.rb
-- ./lib/fun_with_files.rb
-- ./test/data/empty.txt
-- ./test/data/grep1.txt
-- ./test/data/grep2.txt
-- ./test/data/gsub1.txt
-- ./test/data/gsub2.txt
-- ./test/helper.rb
-- ./test/loadable_dir/dir1/file1.rb
-- ./test/loadable_dir/dir2/file2.rb
-- ./test/loadable_dir/dir3/file3.rb
-- ./test/loadable_dir/dir4/file4.rb
-- ./test/loadable_dir/dir5/a.rb
-- ./test/loadable_dir/dir5/b.rb
-- ./test/loadable_dir/dir5/c.rb
-- ./test/loadable_dir/dir5/d.rb
-- ./test/test_copying.rb
-- ./test/test_core_extensions.rb
-- ./test/test_descent.rb
-- ./test/test_digest.rb
-- ./test/test_directory_builder.rb
-- ./test/test_file_manipulation.rb
-- ./test/test_file_path.rb
-- ./test/test_fun_with_files.rb
-- ./test/test_globbing.rb
-- ./test/test_loading.rb
-- ./test/test_root_path.rb
-- ./test/test_symlinking.rb
-- ./test/test_touching.rb
+- "./lib/fun_with/files/core_extensions/array.rb"
+- "./lib/fun_with/files/core_extensions/false.rb"
+- "./lib/fun_with/files/core_extensions/file.rb"
+- "./lib/fun_with/files/core_extensions/hash.rb"
+- "./lib/fun_with/files/core_extensions/nil.rb"
+- "./lib/fun_with/files/core_extensions/object.rb"
+- "./lib/fun_with/files/core_extensions/string.rb"
+- "./lib/fun_with/files/digest_methods.rb"
+- "./lib/fun_with/files/directory_builder.rb"
+- "./lib/fun_with/files/downloader.rb"
+- "./lib/fun_with/files/errors.rb"
+- "./lib/fun_with/files/file_manipulation_methods.rb"
+- "./lib/fun_with/files/file_orderer.rb"
+- "./lib/fun_with/files/file_path.rb"
+- "./lib/fun_with/files/file_path_class_methods.rb"
+- "./lib/fun_with/files/file_permission_methods.rb"
+- "./lib/fun_with/files/file_requirements.rb"
+- "./lib/fun_with/files/gem_api.rb"
+- "./lib/fun_with/files/pathname_extensions.rb"
+- "./lib/fun_with/files/remote_path.rb"
+- "./lib/fun_with/files/root_path.rb"
+- "./lib/fun_with/files/string_behavior.rb"
+- "./lib/fun_with/files/string_extensions.rb"
+- "./lib/fun_with/files/xdg_extensions.rb"
+- "./lib/fun_with_files.rb"
+- "./test/data/empty.txt"
+- "./test/data/grep1.txt"
+- "./test/data/grep2.txt"
+- "./test/data/gsub1.txt"
+- "./test/data/gsub2.txt"
+- "./test/helper.rb"
+- "./test/loadable_dir/dir1/file1.rb"
+- "./test/loadable_dir/dir2/file2.rb"
+- "./test/loadable_dir/dir3/file3.rb"
+- "./test/loadable_dir/dir4/file4.rb"
+- "./test/loadable_dir/dir5/a.rb"
+- "./test/loadable_dir/dir5/b.rb"
+- "./test/loadable_dir/dir5/c.rb"
+- "./test/loadable_dir/dir5/d.rb"
+- "./test/test_copying.rb"
+- "./test/test_core_extensions.rb"
+- "./test/test_descent.rb"
+- "./test/test_digest.rb"
+- "./test/test_directory_builder.rb"
+- "./test/test_file_manipulation.rb"
+- "./test/test_file_path.rb"
+- "./test/test_fun_with_files.rb"
+- "./test/test_globbing.rb"
+- "./test/test_loading.rb"
+- "./test/test_root_path.rb"
+- "./test/test_symlinking.rb"
+- "./test/test_touching.rb"
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -118,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A mashup of several File, FileUtils, and Dir class functions, with a peppy,