facets 2.9.0 → 2.9.1

data/lib/core/facets/applique/file_helpers.rb

@@ -23,11 +23,11 @@ end
 
 # Used for File extensions
 When "had a file '(((.*?)))'" do |name|
-  name = name.sub(/^tmp\//, '')
-  File.open("tmp/#{name}", 'w'){|f| f << "Hello World"}
+  name = name.sub(/^tmp\//, '')  # b/c QED now runs from tmp/qed
+  File.open(name, 'w'){|f| f << "Hello World"}
 end
 
 When "had a binary file '(((.*?)))'" do |name|
-  name = name.sub(/^tmp\//, '')
-  File.open("tmp/#{name}", 'wb'){|f| f << "Hello\nWorld\n"}
+  name = name.sub(/^tmp\//, '')  # b/c QED now runs from tmp/qed
+  File.open(name, 'wb'){|f| f << "Hello\nWorld\n"}
 end

data/lib/core/facets/array.rb

@@ -4,4 +4,3 @@ Dir[File.join(path, '*.rb')].each do |lib|
   #require lib # why is this so much slower?
   require "facets/#{base}/#{File.basename(lib)}"
 end
-

data/lib/core/facets/binding.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/class.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/comparable.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/dir.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/dir/recurse.rb

@@ -2,7 +2,7 @@ class Dir
 
   # Recursively scan a directory and pass each file to the given block.
   #
-  #   Dir.recurse('tmp') do |path|
+  #   Dir.recurse('.') do |path|
   #     # ...
   #   end
   #

data/lib/core/facets/enumerable.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/exception.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/file.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/file/create.rb

@@ -6,7 +6,7 @@ class File
   # string is writ.
   #
   #   str = 'The content for the file'
-  #   File.create('tmp/myfile.txt', str)
+  #   File.create('myfile.txt', str)
   #
   # CREDIT: George Moschovitis
 

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

@@ -2,9 +2,9 @@ class File
 
   # Read in a file as binary data.
   #
-  # Assuming we had a binary file 'tmp/binary.dat'.
+  # Assuming we had a binary file 'binary.dat'.
   #
-  #   File.read_binary('tmp/binary.dat')
+  #   File.read_binary('binary.dat')
   #
   # CREDIT: George Moschovitis
 

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

@@ -16,10 +16,10 @@ class File
   # Assuming we had a file 'message.txt' and had a binary file 'binary.dat'.
   #
   #   # Reverse contents of "message.txt"
-  #   File.rewrite("tmp/message.txt") { |str| str.reverse }
+  #   File.rewrite("message.txt") { |str| str.reverse }
   #
   #   # Replace "foo" by "bar" in "binary.dat".
-  #   File.rewrite("tmp/binary.dat", "b") { |str| str.gsub("foo", "bar") }
+  #   File.rewrite("binary.dat", "b") { |str| str.gsub("foo", "bar") }
   #
   # IMPORTANT: The old version of this method required in place modification
   # of the file string. The new version will write whatever the block
@@ -56,10 +56,10 @@ class File
   # string be modified in place within the block.
   #
   #   # Reverse contents of "message"
-  #   File.rewrite("tmp/message.txt") { |str| str.reverse! }
+  #   File.rewrite("message.txt") { |str| str.reverse! }
   #
   #   # Replace "foo" by "bar" in "binary"
-  #   File.rewrite("tmp/binary.dat", "b") { |str| str.gsub!("foo", "bar") }
+  #   File.rewrite("binary.dat", "b") { |str| str.gsub!("foo", "bar") }
   #
   def self.rewrite!(name, mode = "") #:yield:
     unless block_given?

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

@@ -6,7 +6,7 @@ class File
     # done in binary mode, complementing <tt>IO.read</tt> in standard Ruby.
     #
     #   str = 'The content for the file'
-    #   File.write('tmp/write.txt', str)
+    #   File.write('write.txt', str)
     #
     # Returns the number of bytes written.
     #

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

@@ -10,7 +10,7 @@ class File
   # +writelines+ are not exact opposites.
   #
   #   data = ['The content', ['for the file']]
-  #   File.writelines('tmp/writelines.txt', data)
+  #   File.writelines('writelines.txt', data)
   #
   # Returns number of lines written.
   #

data/lib/core/facets/filetest.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/filetest/absolute.rb

@@ -0,0 +1 @@
+require 'facets/filetest/relative'

data/lib/core/facets/filetest/contains.rb

@@ -0,0 +1,12 @@
+module FileTest
+
+  module_function
+
+  # Does the +parent+ contain the +child+?
+  def contains?(child, parent=Dir.pwd)
+    parent = File.expand_path(parent)
+    child = File.expand_path(child)
+    child.sub(parent,'') != child
+  end
+
+end

data/lib/core/facets/filetest/relative.rb

@@ -0,0 +1,38 @@
+require 'facets/filetest/separator_pattern'
+
+module FileTest
+
+  module_function
+
+  # Predicate method for testing whether a path is absolute.
+  # It returns +true+ if the pathname begins with a slash.
+  def absolute?(path)
+    !relative?(path)
+  end
+
+  # The opposite of #absolute?
+  def relative?(path)
+    while r = chop_basename(path.to_s)
+      path, basename = r
+    end
+    path == ''
+  end
+
+  # List File.split, but preserves the file separators.
+  #
+  #   FileTest.chop_basename('/usr/lib') #=> ['/usr/', 'lib']
+  #   FileTest.chop_basename('/') #=> nil
+  #
+  # Returns Array of `[pre-basename, basename]` or `nil`.
+  #
+  # This method is here simply to support the #relative? and #absolute? methods.
+  def chop_basename(path)
+    base = File.basename(path)
+    if /\A#{SEPARATOR_PATTERN}?\z/ =~ base
+      return nil
+    else
+      return path[0, path.rindex(base)], base
+    end
+  end
+
+end

data/lib/core/facets/filetest/safe.rb

@@ -0,0 +1,20 @@
+require 'facets/filetest/separator_pattern'
+
+module FileTest
+
+  module_function
+
+    # Is a path considered reasonably "safe"?
+    #
+    # Do not mistake this for a perfect solution!
+    def safe?(path)
+      case path
+      when /\A(#{SEPARATOR_PATTERN}|\~)(#{SEPARATOR_PATTERN}|\*)+/
+        false
+      else
+        true
+      end
+    end
+
+end
+

data/lib/core/facets/filetest/separator_pattern.rb

@@ -0,0 +1,19 @@
+module FileTest
+
+  #
+  SEPARATOR_PATTERN = (
+    if File::ALT_SEPARATOR
+      /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/
+    else
+      /#{Regexp.quote File::SEPARATOR}/
+    end
+  ).freeze
+
+  #module_function
+  #
+  #  #
+  #  def separator_pattern
+  #    SEPARATOR_PATTERN
+  #  end
+
+end

data/lib/core/facets/float.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/hash.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/integer.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/kernel.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/kernel/no.rb

@@ -0,0 +1 @@
+require 'facets/kernel/yes'

data/lib/core/facets/kernel/object_hexid.rb

@@ -1,6 +1,8 @@
 module Kernel
 
-  if RUBY_VERSION < '1.9'
+  arch_size = (['a'].pack('P').length > 4 ? 64 : 32)
+
+  if arch_size == 64
 
     # Returns the object id as a string in hexideciaml,
     # which is how Ruby reports them with inspect...

data/lib/core/facets/kernel/yes.rb

@@ -0,0 +1,25 @@
+require 'facets/kernel/ask'
+
+module Kernel
+
+  # Ask a question expecting a yes answer.
+  def yes?(question)
+    case ask(question).downcase
+    when 'y', 'yes'
+      true
+    else
+      false
+    end
+  end
+
+  # Ask a question expecting a no answer.
+  def no?(question)
+    case ask(question).downcase
+    when 'n', 'no'
+      true
+    else
+      false
+    end
+  end
+
+end

data/lib/core/facets/matchdata.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/method.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/module.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/module/redefine_method.rb

@@ -24,10 +24,10 @@ class Module
   # CREDIT: Trans
 
   def redefine_method(sym, aka=nil, &blk)
-    raise ArgumentError, "method does not exist" unless method_defined?( sym )
-    alias_method( aka, sym ) if aka
-    undef_method( sym )
-    define_method( sym, &blk )
+    #raise ArgumentError, "method does not exist" unless method_defined?( sym )
+    alias_method(aka, sym) if aka
+    undef_method(sym)
+    define_method(sym, &blk)
   end
 
   alias_method :redef, :redefine_method

data/lib/core/facets/nilclass.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/numeric.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/object.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/object/replace.rb

@@ -25,7 +25,7 @@ class Object
   # This is very similar to <code>instance.update</code>, but it is limited
   # by the class of objects, in the same manner as Array#replace.
   def replace(source)
-    raise ArgumentError, "not a #{self.class}" unless source.is_a?(self.class)
+    raise ArgumentError, "not a #{self.class} -- #{source}" unless source.is_a?(self.class)
     instance_variables.each do |iv|
       instance_variable_set(iv, source.instance_variable_get(iv))
     end
@@ -35,7 +35,7 @@ end
 
 class Struct
 
-  # Struct#replace can take a hash.
+  # Struct#replace can take any +source+ that responds to #each_pair.
   def replace(source)
     source.each_pair{ |k,v| send(k.to_s + "=", v) }
   end

data/lib/core/facets/objectspace.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/proc.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