facets 2.0.3 → 2.0.4

data/AUTHORS

@@ -10,10 +10,10 @@ The following developers have contributed significant
 amounts of time to the development of Facets. They are held
 in the highest regard for their efforts.
 
-* Noah Gibbs
 * Florian Gross
 * George Moschovitis
 * Tyler Rick
+* Noah Gibbs
 
 == Rubyists of Distinction
 

data/RELEASE

@@ -0,0 +1,6 @@
+This is a bug-fix release.
+
+  * Fixes bug with Dictionary#initialize
+  * Fixes bug with Hash#-
+  * Also improved changelog production
+

data/lib/core/facets/hash/op.rb

@@ -82,7 +82,7 @@ class Hash
     else
       other.each do |k,v|
         if h.key?(k)
-          h.delete(k) if value == h[k]
+          h.delete(k) if v == h[k]
         end
       end
     end

data/lib/more/facets/command.rb

@@ -91,7 +91,8 @@ module Console
       end
       alias_method :global_options, :global_option
 
-      # Options.
+      # Define a set of options. This can be a Command::Options subclass,
+      # or a block whihc will be used to create an Command::Options subclass.
 
       def options(name, klass=nil, &block)
         raise ArgumentError if klass && block
@@ -488,10 +489,20 @@ module Console
     #
 
     def to_h
-      #writers = public_methods.sellect{ |m| m =~ /=$/ }
-      instance_variables.inject({}) do |h, v|
-        h[v[1,-1]] = instance_variable_get(v); h
+      opts = @__self__.public_methods(true).select{ |m| m =~ /^[A-Za-z0-9]+[=!]$/ || m =~ /^[_][A-Za-z0-9]+$/ }
+      #opts.reject!{ |k| k =~ /_$/ }
+      opts.collect!{ |m| m.chomp('=').chomp('!') }
+      opts.inject({}) do |h, m|
+        k = m.sub(/^_+/, '')
+        v = @__self__.send(m)
+        h[k] = v if v
+        h
       end
+
+      #@__self__.instance_variables.inject({}) do |h, v|
+      #  next h if v == "@__self__"
+      #  h[v[1..-1]] = @__self__.instance_variable_get(v); h
+      #end
     end
 
     # Provides a very basic usage help string.

data/lib/more/facets/dictionary.rb

@@ -139,9 +139,13 @@ class Dictionary
   def initialize(*args, &blk)
     @order = []
     @order_by = nil
-    dict = self                                  # This ensure autmatic key entry effect the
-    oblk = lambda{ |hsh, key| blk[dict,key] }    # dictionary rather then just the interal hash.
-    @hash = Hash.new(*args, &oblk)
+    if blk
+      dict = self                                  # This ensure autmatic key entry effect the
+      oblk = lambda{ |hsh, key| blk[dict,key] }    # dictionary rather then just the interal hash.
+      @hash = Hash.new(*args, &oblk)
+    else
+      @hash = Hash.new
+    end
   end
 
   def order

data/meta/icli.yaml

@@ -0,0 +1,17 @@
+---
+rubyforge:
+  project  : facets
+  username : transami
+
+  release:
+    store     : pkg
+    package   : All of Facets
+    name      : facets
+    notelog   : RELEASE
+    changelog : doc/log/Changelog.txt
+
+  publish: {}
+
+  announce:
+    message: README
+

data/meta/manifest.txt

@@ -2,6 +2,7 @@
 AUTHORS
 LICENSE
 README
+RELEASE
 demo
 demo/bench
 demo/bench/enumerable
@@ -726,7 +727,8 @@ lib/more/facets/version.rb
 lib/more/facets/yaml.rb
 lib/more/facets/ziputils.rb
 meta
-meta/facets-2.0.3.roll
+meta/facets-2.0.4.roll
+meta/icli.yaml
 meta/manifest.txt
 task
 task/clean
@@ -734,11 +736,11 @@ task/config
 task/config/general.yaml
 task/config/rdoc.yaml
 task/crosstest
-task/extest
 task/groups
 task/install
 task/isotest
 task/loadtest
+task/log
 task/methods
 task/prepare
 task/publish

data/task/config/rdoc.yaml

@@ -105,11 +105,10 @@ Command:
   chdir: lib/more
   files:
     facets/command.rb
-    facets/command_options.rb
     facets/arguments.rb
 #    facets/bbcode.rb
 
-Compare On:
+CompareOn:
   chdir: lib/more
   files:
     facets/compare_on.rb

data/task/groups

@@ -5,10 +5,10 @@
 main :groups do
   dir = 'lib/core/facets'
 
-  Dir.chdir(dir) do
-    dirs = Dir.glob('*').select{ |f| File.directory?(f) }
+  cd(dir) do
+    dirs = glob('*').select{ |f| File.directory?(f) }
     dirs.each do |d|
-      files = Dir.glob("#{d}/**/*.rb")
+      files = glob("#{d}/**/*.rb")
       code = files.collect { |f| "require 'facets/#{f}'" }.join("\n")
       if noharm?
         puts "#{d}.rb"

data/task/log

@@ -0,0 +1,17 @@
+#!/usr/bin/env ratch
+
+# produce changelog
+
+main :changelog do
+  text = `svn log --xml`
+  i = text.index("?>\n")
+  text.insert(i+2, "\n" + '<?xml-stylesheet href="changelog.xsl" type="text/xsl" ?>')
+
+  if dryrun?
+    puts text
+  else
+    File.open('doc/log/changelog.xml') do |f|
+      f << text
+    end
+  end
+end

data/task/prepare

@@ -1,5 +1,5 @@
 #!/usr/bin/env ratch
 
-manifest -u meta/manifest.txt
+manifest "-u meta/manifest.txt"
 box
 

data/test/unit/hash/test_op.rb

@@ -1,52 +1,57 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/hash/op.rb
-  #
-  # Extracted Mon Sep 03 16:23:07 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
-
- require 'facets/hash/op.rb'
-
-
-
-  require 'test/unit'
-
-  class TestHashOperate < Test::Unit::TestCase
-
-    def test_op_and_hash
-      a = { :a => 1, :b => 2 }
-      b = { :a => 1 }
-      r = { :a => 1 }
-      assert_equal( r, a & b )
-    end
-
-    def test_op_and_hash_subarray
-      a = { :a => [1], :b => [2] }
-      b = { :a => [1] }
-      r = { :a => [1] }
-      assert_equal( r, a & b )
-    end
-
-    def test_op_and_array
-      a = { :a => 1, :b => 2 }
-      b = [ :a ]
-      r = { :a => 1 }
-      assert_equal( r, a & b )
-    end
-
-    def test_shift_update
-      a = { :a => 1, :b => 2, :c => 3 }
-      b = { :a => 0, :d => 4 }
-      e = { :a => 0, :b => 2, :c => 3, :d => 4 }
-      assert_equal( e, a << b )
-    end
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |
+#   |_|\___||___/\__|
+#
+# for facets/hash/op.rb
 
+require 'facets/hash/op.rb'
+
+require 'test/unit'
+
+class TestHashOperate < Test::Unit::TestCase
+
+  def test_op_and_hash
+    a = { :a => 1, :b => 2 }
+    b = { :a => 1 }
+    r = { :a => 1 }
+    assert_equal( r, a & b )
   end
 
+  def test_op_and_hash_subarray
+    a = { :a => [1], :b => [2] }
+    b = { :a => [1] }
+    r = { :a => [1] }
+    assert_equal( r, a & b )
+  end
+
+  def test_op_and_array
+    a = { :a => 1, :b => 2 }
+    b = [ :a ]
+    r = { :a => 1 }
+    assert_equal( r, a & b )
+  end
 
+  def test_shift_update
+    a = { :a => 1, :b => 2, :c => 3 }
+    b = { :a => 0, :d => 4 }
+    e = { :a => 0, :b => 2, :c => 3, :d => 4 }
+    assert_equal( e, a << b )
+  end
+
+  def test_op_minus_array
+    a = { :a => 1, :b => 2, :c => 3 }
+    b = [ :a ]
+    e = { :b => 2, :c => 3 }
+    assert_equal( e, a - b )
+  end
+
+  def test_op_minus_hash
+    a = { :a => 1, :b => 2, :c => 3 }
+    b = { :a => 1, :d => 4 }
+    e = { :b => 2, :c => 3 }
+    assert_equal( e, a - b )
+  end
 
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: facets
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
-date: 2007-11-02 00:00:00 -04:00
+  version: 2.0.4
+date: 2007-11-04 00:00:00 -04:00
 summary: Premium Core Extensions and Standard Additions
 require_paths: 
 - lib/methods
@@ -34,6 +34,7 @@ files:
 - AUTHORS
 - LICENSE
 - README
+- RELEASE
 - demo
 - demo/bench
 - demo/bench/enumerable
@@ -758,7 +759,8 @@ files:
 - lib/more/facets/yaml.rb
 - lib/more/facets/ziputils.rb
 - meta
-- meta/facets-2.0.3.roll
+- meta/facets-2.0.4.roll
+- meta/icli.yaml
 - meta/manifest.txt
 - task
 - task/clean
@@ -766,11 +768,11 @@ files:
 - task/config/general.yaml
 - task/config/rdoc.yaml
 - task/crosstest
-- task/extest
 - task/groups
 - task/install
 - task/isotest
 - task/loadtest
+- task/log
 - task/methods
 - task/prepare
 - task/publish

data/task/extest

@@ -1,129 +0,0 @@
-#!/usr/bin/env ratch
-
-# Extract embedded tests.
-
-# Extract unit tests. This task scans every package script
-# looking for sections of the form:
-#
-#     =begin test
-#       ...
-#     =end
-#
-# With appropriate headers, it copies these sections to files
-# in your project's test/ dir, which then can be run using the
-# Ratchet test task. The exact directory layout of the files to
-# be tested is reflected in the test directory. You can then
-# use project.rb's test task to run the tests.
-#
-#     files      Files to extract ['lib/**/*.rb']
-#     output     Test directory   ['test/']
-
-main :extest do
-  extract_tests # Deal with arg once rathc has better support fot it.
-end
-
-# Extract tests for scripts.
-
-def extract_tests(files=nil)
-  output = 'test/embedded'     # Don't think output should be setable.
-
-  files  = files || 'lib/**/*.rb'
-  files = 'lib/**/*.rb' if TrueClass == files
-  files = [files].flatten.compact
-
-  filelist = files.collect{ |f| Dir.glob(f) }
-  filelist.flatten!
-  if filelist.empty?
-    puts "No scripts found from which to extract tests."
-    return
-  end
-
-  mkdir_p(output) unless directory?(output)
-
-  #vrunner = VerbosityRunner.new("Extracting", verbosity?)
-  #vrunner.setup(filelist.size)
-
-  filelist.each do |file|
-    #vrunner.prepare(file)
-
-    testing = extract_test_from_file( file )
-    if testing.strip.empty?
-      status = "[NONE]"
-    else
-      complete_test = create_test(testing, file)
-      libpath = File.dirname(file)
-      testfile = "test_" + File.basename(file)
-      fp = File.join(output, libpath, testfile)
-      unless directory?( File.dirname(fp))
-        mkdir_p(File.dirname(fp))
-      end
-      if dryrun?
-        puts "write #{fp}"
-      else
-        File.open(fp, "w"){ |fw| fw << complete_test }
-      end
-      status = "[TEST]"
-    end
-
-    #vrunner.complete(file, status)
-  end
-
-  #vrunner.finish(
-  #  :normal => "#{filelist.size} files had tests extracted.",
-  #  :check => false
-  #)
-end
-
-private
-
-# Extract test from a file's testing comments.
-
-def extract_test_from_file( file )
-  return nil if ! File.file?( file )
-  tests = ""; inside = false
-  fstr = File.read( file )
-  fstr.split(/\n/).each do |l|
-    if l =~ /^=begin[ ]*test/i
-      tests << "\n"
-      inside = true
-      next
-    elsif inside and l =~ /^=[ ]*end/
-      inside = false
-      next
-    end
-    if inside
-      tests << l << "\n"
-    end
-  end
-  tests
-end
-
-# Generate the test.
-
-def create_test( testing, file )
-  fp = file.split(/[\/]/)
-  if fp[0] == 'lib'
-    reqf = "require '#{fp[1..-1].join('/')}'"
-  else
-    reqf = ''
-  end
-  str = []
-  str << "  #  _____         _"
-  str << "  # |_   _|__  ___| |_"
-  str << "  #   | |/ _ \\/ __| __|"
-  str << "  #   | |  __/\\__ \\ |"
-  str << "  #   |_|\\___||___/\\__|"
-  str << "  #"
-  str << "  # for #{file}"
-  str << "  #"
-  str << "  # Extracted #{Time.now}"
-  str << "  # w/ Test Extraction Ratchet"
-  str << "  #"
-  str << ""
-  str << " #{reqf}"
-  str << ""
-  str << testing
-  str << "\n"
-  str = str.join("\n")
-  str
-end