facets 2.9.0 → 2.9.1

data/lib/core/facets/process.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/range.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/regexp.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/string.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/string/file.rb

@@ -4,8 +4,10 @@ class String
 
   # Use fluent notation for making file directives.
   #
-  #    'README.rdoc'.file.mtime
-  #  
+  # For instance, if we had a file 'foo.txt',
+  #
+  #    'foo.txt'.file.mtime
+  #
   def file
     Functor.new(&method(:file_send).to_proc)
   end

data/lib/core/facets/string/random_binary.rb

@@ -0,0 +1,10 @@
+class String
+
+  # Generate a random binary string of +n_bytes+ size.
+  #
+  # CREDIT: Guido De Rosa
+  def self.random_binary(n_bytes)
+    ( Array.new(n_bytes){ rand(0x100) } ).pack('c*') 
+  end
+
+end

data/lib/core/facets/string/unquote.rb

@@ -1 +1 @@
-require 'facets/string/unquote'
+require 'facets/string/quote'

data/lib/core/facets/struct.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/symbol.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/time.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/core/facets/unboundmethod.rb

@@ -1,6 +1,6 @@
 dir, base = *File.split(__FILE__)
 base = base.chomp('.rb')
-Dir[File.join(dir, base, '*')].each do |lib|
+Dir[File.join(dir, base, '*.rb')].each do |lib|
   require "facets/#{base}/#{File.basename(lib)}"
 end
 

data/lib/standard/facets/digest.rb

@@ -0,0 +1,2 @@
+require 'facets/digest/base64digest'
+require 'facets/digest/salted_digest'

data/lib/standard/facets/digest/base64digest.rb

@@ -0,0 +1,45 @@
+require 'digest'
+
+module Digest
+
+  module Instance
+
+    # For Ruby < 1.9.2
+   
+    unless instance_methods.include? :base64digest
+
+      # From Ruby 1.9.2 source
+      def base64digest(str = nil)
+        [str ? digest(str) : digest].pack('m0')
+      end
+
+    end
+
+    unless instance_methods.include? :base64digest!
+
+      # From Ruby 1.9.2 source
+      def base64digest!
+        [digest!].pack('m0')
+      end
+
+    end
+
+  end
+
+  class Class
+
+    # For Ruby < 1.9.2   
+
+    unless methods.include? :base64digest
+
+      # From Ruby 1.9.2 source
+      def self.base64digest(str, *args)
+        [self.digest(str, *args)].pack('m0') 
+      end
+
+    end
+
+  end
+
+end
+

data/lib/standard/facets/digest/salted_digest.rb

@@ -0,0 +1,44 @@
+require 'digest'
+require 'facets/string/random_binary'
+
+module Digest
+
+  module Instance
+    # CREDIT: Guido De Rosa
+    def salted_digest(str='', salt=:auto)
+      if salt == :auto
+        salt = String.random_binary(digest_length) 
+      end
+      digest(str + salt) + salt
+    end
+
+    # CREDIT: Guido De Rosa
+    def salted_hexdigest(str, salt)
+      Digest.hexencode(salted_digest(str, salt))
+    end
+
+    # CREDIT: Guido De Rosa
+    def salted_base64digest(str, salt)
+      [salted_digest(str, salt)].pack('m0')
+    end
+  end
+
+  class Class
+    # CREDIT: Guido De Rosa
+    def self.salted_digest(str, salt=:auto, *args)
+      new(*args).salted_digest(str, salt)
+    end 
+
+    # CREDIT: Guido De Rosa
+    def self.salted_hexdigest(str, salt=:auto, *args)
+      new(*args).salted_hexdigest(str, salt)
+    end
+
+    # CREDIT: Guido De Rosa
+    def self.salted_base64digest(str, salt=:auto, *args)
+      new(*args).salted_base64digest(str, salt)
+    end
+  end
+
+end
+

data/lib/{more → standard}/facets/fileutils.rb

@@ -1,8 +1,13 @@
 # TODO: Deprecate #safe_ln, if #ln has been fixed to do this.
 
 require 'fileutils'
+require 'facets/fileutils/amass'
+require 'facets/fileutils/cp_rx'
+require 'facets/fileutils/ln_r'
+require 'facets/fileutils/outofdate'
 require 'facets/fileutils/safe_ln'
 require 'facets/fileutils/slice'    # includes head and tail
+require 'facets/fileutils/stage'
 require 'facets/fileutils/wc'
 require 'facets/fileutils/whereis'
 require 'facets/fileutils/which'

data/lib/standard/facets/fileutils/amass.rb

@@ -0,0 +1,33 @@
+module FileUtils
+
+  module_function
+
+  # An intergrated glob like method that take a set of include globs,
+  # exclude globs and ignore globs to produce a collection of paths.
+  # 
+  # The ignore_globs differ from exclude_globs in that they match by
+  # the basename of the path rather than the whole pathname.
+  #
+  # TODO: Should ignore be based on any portion of the path, not just the basename?
+  #
+  def amass(include_globs, exclude_globs=[], ignore=[])
+    include_files = include_globs.flatten.map{ |g| Dir.glob(g) }.flatten.uniq
+    exclude_files = exclude_globs.flatten.map{ |g| Dir.glob(g) }.flatten.uniq
+
+    include_globs = include_globs.map{ |f| File.directory?(f) ? File.join(f, '**/*') : f } # Recursive!
+    exclude_globs = exclude_globs.map{ |f| File.directory?(f) ? File.join(f, '**/*') : f } # Recursive!
+
+    include_files = include_globs.flatten.map{ |g| Dir.glob(g) }.flatten.uniq
+    exclude_files = exclude_globs.flatten.map{ |g| Dir.glob(g) }.flatten.uniq
+
+    files = include_files - exclude_files
+
+    files = files.reject{ |f| ignore.any?{ |x| File.fnmatch?(x, File.basename(f)) } }
+
+    files
+  end
+
+  # Make public (for all submodules too).
+  public :amass
+
+end

data/lib/{more → standard}/facets/fileutils/cp_rx.rb

@@ -1,11 +1,13 @@
 module FileUtils
 
+  module_function
+
   # Both of these are modified from the implementations in fileutils.rb from Ruby 1.9.1p378.
 
   # Like FileUtils.cp_r, but takes a filter proc that can return false to skip a file:
   #
   #   cp_rx "bigDirectoryTree", "dest", {:noop => true} do |name|
-	#     /dontCopyThis$/.match(name)
+  #      /dontCopyThis$/.match(name)
   #   end
   #
   # Note that if the filter rejects a subdirectory then everything within that

data/lib/standard/facets/fileutils/ln_r.rb

@@ -0,0 +1,92 @@
+module FileUtils
+  #
+  # Options: noop verbose dereference_root remove_destination
+  #
+  # Hard link +src+ to +dest+. If +src+ is a directory, this method links
+  # all its contents recursively. If +dest+ is a directory, links
+  # +src+ to +dest/src+.
+  #
+  # +src+ can be a list of files.
+  #
+  #   # Installing ruby library "mylib" under the site_ruby
+  #   FileUtils.rm_r site_ruby + '/mylib', :force
+  #   FileUtils.ln_r 'lib/', site_ruby + '/mylib'
+  #
+  #   # Examples of copying several files to target directory.
+  #   FileUtils.ln_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
+  #   FileUtils.ln_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop => true, :verbose => true
+  #
+  #   # If you want to copy all contents of a directory instead of the
+  #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
+  #   # use following code.
+  #   FileUtils.ln_r 'src/.', 'dest'     # cp_r('src', 'dest') makes src/dest,
+  #                                      # but this doesn't.
+  #
+  # TODO: Why --remove-destination and not just --force?
+  def ln_r(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['ln_r']
+    fu_output_message "ln -r#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    options = options.dup
+    options[:dereference_root] = true unless options.key?(:dereference_root)
+    fu_each_src_dest(src, dest) do |s, d|
+      link_entry s, d, options[:dereference_root], options[:remove_destination]
+    end
+  end
+  module_function :ln_r
+
+  OPT_TABLE = {} unless const_defined?(:OPT_TABLE)
+  OPT_TABLE['ln_r'] = [:noop, :verbose, :dereference_root, :remove_destination]
+
+  #
+  # Hard links a file system entry +src+ to +dest+.
+  # If +src+ is a directory, this method links its contents recursively.
+  #
+  # Both of +src+ and +dest+ must be a path name.
+  # +src+ must exist, +dest+ must not exist.
+  #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  def link_entry(src, dest, dereference_root = false, remove_destination = false)
+    Entry_.new(src, nil, dereference_root).traverse do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      File.unlink destent.path if remove_destination && File.file?(destent.path)
+      ent.link destent.path
+    end
+  end
+  module_function :link_entry
+
+  class Entry_ #:nodoc:
+    def link(dest)
+      case
+      when directory?
+        if !File.exist?(dest) and descendant_diretory?(dest, path)
+          raise ArgumentError, "cannot link directory %s to itself %s" % [path, dest]
+        end
+        begin
+          Dir.mkdir dest
+        rescue
+          raise unless File.directory?(dest)
+        end
+      else file?
+        File.link path(), dest
+      end
+    end
+
+    unless method_defined?(:descendant_diretory?)
+      if File::ALT_SEPARATOR
+        DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)".freeze
+      else
+        DIRECTORY_TERM = "(?=/|\\z)".freeze
+      end
+      SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
+
+      def descendant_diretory?(descendant, ascendant)
+        /\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant)
+      end
+    end
+  end
+
+end

data/lib/standard/facets/fileutils/outofdate.rb

@@ -0,0 +1,38 @@
+require 'fileutils'
+
+module FileUtils
+  module_function
+
+  # The opposite of #uptodate?
+  def outofdate?(path, *sources)
+    #return true unless File.exist?(path)
+    ! uptodate?(path, sources.flatten)
+  end
+
+  # Alias for #outofdate?
+  alias_method :out_of_date?, :outofdate?
+
+  # Alias for #uptodate?
+  alias_method :up_to_date?, :uptodate?
+
+  # # TODO: Does a path need updating, based on given +sources+?
+  # # This compares mtimes of give paths. Returns false
+  # # if the path needs to be updated.
+  # #
+  # # DEPRECATE: Is this in any way better than `! uptodate?` ?
+  # def out_of_date?(path, *sources)
+  #   return true unless File.exist?(path)
+  # 
+  #   sources = sources.collect{ |source| Dir.glob(source) }.flatten
+  #   mtimes  = sources.collect{ |file| File.mtime(file) }
+  # 
+  #   return true if mtimes.empty?  # TODO: This the way to go here?
+  # 
+  #   File.mtime(path) < mtimes.max
+  # end
+
+  # Make public (for all submodules too).
+  public :outofdate?
+  public :out_of_date?
+  public :up_to_date?
+end

data/lib/{more → standard}/facets/fileutils/slice.rb

@@ -2,6 +2,20 @@ require 'fileutils'
 
 module FileUtils
 
+  module_function
+
+  # In block form, yields lines +from+-+to+.  In non-block form, returns
+  # an array of lines +from+-+to+:
+  #
+  #   # Returns lines 8-12 of 'myfile'
+  #   FileUtils.body("myfile",8,12)
+  #
+  # CREDIT Shashank Date, via Daniel Berger.
+
+  def slice(filename,from,to) #:yield:
+    IO.readlines(filename)[from-1..to-1]
+  end
+
   # In block form, yields the first number of +lines+ of file +filename+.
   # In non-block form, it returns an array of the first number of +lines+:
   #
@@ -37,17 +51,5 @@ module FileUtils
     IO.readlines(filename).reverse[0..lines-1].reverse
   end
 
-  # In block form, yields lines +from+-+to+.  In non-block form, returns
-  # an array of lines +from+-+to+:
-  #
-  #   # Returns lines 8-12 of 'myfile'
-  #   FileUtils.body("myfile",8,12)
-  #
-  # CREDIT Shashank Date, via Daniel Berger.
-
-  def slice(filename,from,to) #:yield:
-    IO.readlines(filename)[from-1..to-1]
-  end
-
 end