facets 2.1.1 → 2.1.2

data/CHANGES

@@ -0,0 +1,5 @@
+facets 2.1.2 / 2007-11-22
+
+* Dir::multiglob no longer handels -/+ modifiers. Use FileList instead.
+* Fixed task/install script.
+* Improved task/changes.

data/{LICENSE → COPYING}

@@ -1,3 +1,7 @@
+                                Ruby Facets
+
+                 Copyright (c) 2005,2006,2007 Thomas Sawyer
+
 
                               THE RUBY LICENSE
                   (http://www.ruby-lang.org/en/LICENSE.txt)

data/{WHATSNEW → NOTES}

@@ -1,4 +1,8 @@
-Facets 2.1.0 is in the wild!
+Facets 2.1.2 has been released!
+
+This release fixes then manual install script (task/install).
+
+As of 2.1.0: 
 
 Major changes include a new and much-improved
 command.rb, a new BiCrypt class for simple two-way
@@ -9,3 +13,4 @@ alias_xxx methods for all attr_xxx methods.
 Enjoy!
 
 http://facets.rubyforge.org
+

data/README

@@ -14,6 +14,11 @@ The core extensions is a large collection of methods which extend the core capab
 The "more" additions are a collection of classes, modules and light meta-systems which constitutes an ever improving source of reusable components. Some very nice additions are provided, from the simple Functor class to a full-blown annotations system.
 
 
+== Documentation
+
+Note that Facets has special documentation needs due to it's extensive bredth. For this reason, rdocs are not automatically built by RubyGems on install. To find documentation, please see http://facets.rubyforge.org/learn.html. If you need off-line docs, there is a separate package available on the Files page of the Facets RubyForge project site.
+
+
 == Installation
 
 The easiest way to install is via RubyGems.

data/lib/core/facets.rb

@@ -1 +1 @@
-require 'facets/facets.rb'
+require 'facets/main.rb'

data/lib/core/facets/dir/multiglob.rb

@@ -58,29 +58,12 @@ class Dir
 
     patterns = [patterns].flatten.compact
 
-    if options[:default]
-      default = [options[:default]].flatten.compact
-      #if patterns.empty?
-      #  patterns = default
-      if patterns.first =~ /^[+-]/ || patterns.empty?
-        patterns = default + patterns
-      end
-    end
-
-    patterns_include = patterns.select{ |f| f !~ /^[-]/ }
-    patterns_exclude = patterns.select{ |f| f =~ /^[-]/ }
-
-    patterns_include.collect!{ |f| f =~ /^[+]/ ? f[1..-1] : f }
-    patterns_exclude.collect!{ |f| f =~ /^[-]/ ? f[1..-1] : f }
-
     if options[:recurse]
-      patterns_include += patterns_include.collect{ |f| File.join(f, '**', '*') }
-      patterns_exclude += patterns_exclude.collect{ |f| File.join(f, '**', '*') }
+      patterns += patterns.collect{ |f| File.join(f, '**', '*') }
     end
 
     files = []
-    files += patterns_include.collect{ |pattern| Dir.glob(pattern, bitflags) }.flatten.uniq
-    files -= patterns_exclude.collect{ |pattern| Dir.glob(pattern, bitflags) }.flatten.uniq
+    files += patterns.collect{ |pattern| Dir.glob(pattern, bitflags) }.flatten.uniq
 
     return files
   end
@@ -97,58 +80,11 @@ class Dir
   #
   #   Dir.multiglob( 'folder', 'folder/**/*' )
 
-  def self.multiglob_r( *patterns )
+  def self.multiglob_r(*patterns)
     options = (Hash === patterns.last ? patterns.pop : {})
     options[:recurse] = true
     patterns << options
     multiglob(*patterns)
   end
 
-  # This is just like multiglob but handles a base pattern such that
-  # if the +patterns+ list starts with a '+' or '-' entry, then the base
-  # will be included in the result, otherwise it will be omitted.
-  #
-  #   Dir.multiglob_with_default('*.yaml', '-*.rb')  #=> [ 'foo.yaml' ]
-  #   Dir.multiglob_with_default('*.yaml', '+*.rb')  #=> [ 'foo.yaml', 'foo.rb' ]
-  #   Dir.multiglob_with_default('*.yaml', '*.rb')   #=> [ 'foo.rb' ]
-  #
-  # This is useful when a configuration option needs to supply a file list
-  # that may include files, exclude files or append files to a default list.
-  #
-  # TODO Deprecate this and replace with :default option on regular multiglob?
-
-  def self.multiglob_with_default(default, *patterns)
-    default = [default].flatten.compact
-    patterns = patterns.flatten.compact
-
-    if patterns.empty?
-      patterns = default
-    elsif patterns.first =~ /^[+-]/
-      patterns = default + patterns
-    end
-
-    multiglob(*patterns)
-  end
-
 end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-# TODO Need to mock file system.
-
-=begin #no test yet
-
-  require 'test/unit'
-
-  class TestDir < Test::Unit::TestCase
-
-  end
-
-=end

data/lib/core/facets/exception.rb

@@ -0,0 +1 @@
+require 'facets/exception/detail.rb'

data/lib/core/facets/exception/detail.rb

@@ -0,0 +1,20 @@
+
+class Exception
+
+  # Pretty string output of exception/error
+  # object useful for helpful debug messages.
+  #
+  # Input:
+  # The Exception/StandardError object
+  #
+  # Output:
+  # the pretty printed string
+  #
+  #   CREDIT: George Moschovitis
+
+  def detail
+    return %{#{message}\n  #{backtrace.join("\n  ")}\n  LOGGED FROM: #{caller[0]}}
+  end
+
+end
+

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

@@ -24,6 +24,19 @@ module Kernel
     self
   end
 
+#   require 'facets/functor'
+#
+#   # Yield self -and- return self.
+#
+#   def tap(&b)
+#     if block_given?
+#       b.arity == 1 ? yield(self) : instance_eval(&b)
+#       self
+#     else
+#       Functor.new{ |op, *args| self.send(op, *args); self }
+#     end
+#   end
+
   # A Ruby-ized realization of the K combinator.
   #
   #   returning Book.new do |book|

data/lib/core/facets/{facets.rb → main.rb}

@@ -15,6 +15,7 @@ module Facets
    require "facets/curry"
    require "facets/dir"
    require "facets/enumerable"
+   require "facets/exception"
    require "facets/file"
    require "facets/filetest"
    require "facets/float"
@@ -44,3 +45,4 @@ end
 
 # Bring it on-line!
 Facets.require_core
+

data/lib/methods/facets/facets/require_core.rb

@@ -1 +1 @@
-require 'facets/facets.rb'
+require 'facets/main.rb'

data/lib/more/facets/logger.rb

@@ -58,16 +58,16 @@ class Logger
   alias_method :devel, :debug
   alias_method :fine, :debug
 
-  # Prints a trace message to DEBUGLOG (at debug level).  
-  # Useful for emitting the value of variables, etc.  Use 
+  # Prints a trace message to DEBUGLOG (at debug level).
+  # Useful for emitting the value of variables, etc.  Use
   # like this:
   #
   #   x = y = 5
   #   trace 'x'        # -> 'x = 5'
   #   trace 'x ** y'   # -> 'x ** y = 3125'
   #
-  # If you have a more complicated value, like an array of 
-  # hashes, then you'll probably want to use an alternative 
+  # If you have a more complicated value, like an array of
+  # hashes, then you'll probably want to use an alternative
   # output format.  For instance:
   #
   #   trace 'value', :yaml
@@ -119,9 +119,9 @@ class Logger
     :inspect => :inspect, :to_yaml => :to_yaml
   )
 
-  # Dictate the way in which this logger should format the 
-  # messages it displays. This method requires a block. The 
-  # block should return formatted strings given severity, 
+  # Dictate the way in which this logger should format the
+  # messages it displays. This method requires a block. The
+  # block should return formatted strings given severity,
   # timestamp, msg, progname.
   #
   # === Example
@@ -136,6 +136,10 @@ class Logger
     @format_proc = format_proc
   end
 
+  def format_procedure
+    @format_proc
+  end
+
 private
 
   attr_accessor :format_proc

data/lib/more/facets/registerable.rb

@@ -0,0 +1,36 @@
+# TITLE:
+#
+#   Registerable
+#
+# COPYING:
+#
+#   Copyright (c) 2007 Psi T Corp.
+#
+
+module Registerable
+
+  # Register format names.
+
+  def register(*names)
+    names.each do |name|
+      registry[name.to_s] = self
+    end
+  end
+
+  # Access registry.
+
+  def registry
+    @@registry ||= {}
+  end
+
+  #
+
+  def registry_invalid?(*types)
+    bad = []
+    types.each do |type|
+      bad << type unless @@registry[type]
+    end
+    return bad.empty? ? false : bad
+  end
+
+end

data/log/{history.txt → history.rd}

@@ -1,8 +1,14 @@
 = Facets Revision History
 
+== 2.1.2 / 2007-11-22
+
+* Dir::multiglob no longer handels -/+ modifiers. Use FileList instead.
+* Fixed task/install script.
+* Improved task/changes.
+
 == 2.1.1 / 2007-11-16
 
-* Fixed bug in command.rb that clobber options.
+* Fixed bug in command.rb that clobbered options.
 * Added kernel/ergo.rb.
 
 == 2.1.0 / 2007-11-10

data/meta/{manifest.txt → MANIFEST}

@@ -1,8 +1,9 @@
 # -x dev -x pkg -x doc
 AUTHORS
-LICENSE
+CHANGES
+COPYING
+NOTES
 README
-WHATSNEW
 demo
 demo/bench
 demo/bench/enumerable
@@ -64,7 +65,9 @@ lib/core/facets/enumerable/count.rb
 lib/core/facets/enumerable/permutation.rb
 lib/core/facets/enumerable/probability.rb
 lib/core/facets/enumerable.rb
-lib/core/facets/facets.rb
+lib/core/facets/exception
+lib/core/facets/exception/detail.rb
+lib/core/facets/exception.rb
 lib/core/facets/file
 lib/core/facets/file/read.rb
 lib/core/facets/file/topath.rb
@@ -123,6 +126,7 @@ lib/core/facets/kernel/tap.rb
 lib/core/facets/kernel/val.rb
 lib/core/facets/kernel/withattr.rb
 lib/core/facets/kernel.rb
+lib/core/facets/main.rb
 lib/core/facets/matchdata
 lib/core/facets/matchdata/matchset.rb
 lib/core/facets/matchdata.rb
@@ -721,6 +725,7 @@ lib/more/facets/recorder.rb
 lib/more/facets/recursive.rb
 lib/more/facets/reference.rb
 lib/more/facets/reflection.rb
+lib/more/facets/registerable.rb
 lib/more/facets/rwdelegator.rb
 lib/more/facets/semaphore.rb
 lib/more/facets/settings.rb
@@ -742,26 +747,22 @@ lib/more/facets/yaml.rb
 lib/more/facets/ziputils.rb
 log
 log/changelog.txt
-log/history.txt
-log/release.txt
-log/todo.txt
+log/history.rd
+log/todo.rd
 meta
-meta/facets-2.1.1.roll
+meta/MANIFEST
 meta/google_ad.html
 meta/icli.yaml
-meta/manifest.txt
+meta/project.yaml
+meta/rollrc
 task
+task/changes
 task/clean
 task/clobber
 task/clobber/package
-task/config
-task/config/general.yaml
-task/config/rdoc.yaml
-task/crosstest
+task/config.yaml
 task/groups
 task/install
-task/isotest
-task/loadtest
 task/log
 task/methods
 task/prepare
@@ -772,11 +773,16 @@ task/special
 task/special/quickopts
 task/stats
 task/svn
+task/svn/changelog
 task/svn/tag
-task/syntax
 task/test
-task/testeach
-task/testpairs
+task/test/cross
+task/test/each
+task/test/general
+task/test/isotest
+task/test/loadtest
+task/test/pairs
+task/test/syntax
 test
 test/lib
 test/lib/rq.rb

data/meta/icli.yaml

@@ -7,11 +7,11 @@ rubyforge:
     store     : pkg
     package   : All of Facets
     name      : facets
-    notelog   : WHATSNEW
-    changelog : log/release.txt
+    notelog   : NOTES
+    changelog : CHANGES
 
   publish: {}
 
   post:
-    file: WHATSNEW
+    file: NOTES
 

data/meta/{facets-2.1.1.roll → project.yaml}

@@ -20,23 +20,16 @@ email    : facets-universal@rubyforge.org
 homepage : 'http://facets.rubyforge.org'
 download : 'http://rubyforge.org/projects/facets'
 
-index_file: facets.rb
-
-load_paths:
-  - lib/core/facets
-  - lib/more/facets
-  - lib/methods/facets
+# Packaging Information
 
 gem_paths:
   - lib/core
   - lib/more
   - lib/methods
 
-# Packaging information
-
-formats     : [ gem, tgz ]
 document    : false
+formats     : [ gem, zip ]  #tgz
 
-#manifest    : meta/manifest.txt
-#distribute  : [ -dev, -doc, -pkg ]
+manifest    : meta/MANIFEST
+exclude     : [ dev, doc, pkg ]
 

data/meta/rollrc

@@ -0,0 +1,5 @@
+facets 2.1.2 stable 2007-11-22
+lib/core/facets
+lib/more/facets
+lib/methods/facets
+

data/task/changes

@@ -0,0 +1,29 @@
+#!/usr/bin/env ratch
+
+# generate changes from history
+
+config = configuration['changes']
+
+history_file = config['history'] || 'log/history.rd'
+changes_file = config['changes'] || 'CHANGES'
+
+history_file.to_actual_filename!
+
+name, version = rollrc.name, rollrc.version
+
+main :changes do
+  build changes_file
+end
+
+file changes_file => [ history_file ] do
+  history = File.read(history_file)
+  matches = /^==\s*#{version}(.*?)(\n==|\Z)/m.match(history)
+  changes = matches[0]
+  changes = changes.chomp('==').strip.sub(/^==\s+/, "#{name} ")
+  if dryrun?
+    puts "#{changes_file} would have been updated (dryrun mode)."
+  else
+    File.open(changes_file, 'w'){ |f| f << changes }
+    puts "#{changes_file} updated."
+  end
+end