facets 2.0.5 → 2.1.0

data/task/clobber/package

@@ -0,0 +1,10 @@
+#!/usr/bin/env ratch
+
+# Remove package products.
+
+main :clobber_packaging do
+  glob("pkg/*").each do |f|
+    rm_r(f)
+  end
+end
+

data/task/config/general.yaml

@@ -1,8 +1,5 @@
 ---
 
-rdoc:
-  title : Facets
-
 methods:
   source  : lib/core/facets
   output  : lib/methods/facets
@@ -19,6 +16,27 @@ test:
     - lib/core
     - lib/more
 
+rdoc:
+  - title  : Facets
+    main   : README
+    chdir  : lib/core
+    output : doc/rdoc/core
+  - title  : Facets
+    chdir  : lib/more
+    output : doc/rdoc
+    groups :
+      - [ facets/annotations.rb, facets/settings.rb ]
+      - [ facets/aop.rb, facets/cut.rb ]
+      - [ facets/buildable.rb, facets/buildingblock.rb, facets/hashbuilder.rb ]
+      - [ facets/command.rb, facets/arguments.rb, facets/ansicode.rb ]  # facets/bbcode.rb
+      - [ facets/dictionary.rb, facets/orderedhash.rb ]
+      - [ facets/fileable.rb, facets/filelist.rb, facets/pathlist.rb, facets/fileshell.rb ]
+      - [ facets/heap.rb, facets/pqueue.rb ]
+      - [ facets/openobject.rb, facets/opencascade.rb, facets/opencollection.rb, facets/ostruct.rb ]
+      - [ facets/syncarray.rb, facets/synchash.rb ]
+
+ad_file: meta/google_ad.html
+
 # announce:
 #   template   : README
 #   to         : transfire@gmail.com  #ruby-talk@ruby-lang.org

data/task/isotest

@@ -1,6 +1,7 @@
 #!/usr/bin/env ratch
 
-#
+# run tests in separate processes
+
 require 'facets/hash/rekey'
 require 'facets/string/tabs'
 require 'facets/progressbar'

data/task/loadtest

@@ -1,5 +1,7 @@
 #!/usr/bin/env ratch
 
+# simple load test
+
 main :syntax do
   scripts = "lib/**/*.rb"
   libpath = [ 'lib/methods', 'lib/core', 'lib/more' ].join(':')

data/task/prepare

@@ -1,5 +1,7 @@
 #!/usr/bin/env ratch
 
-manifest "-u meta/manifest.txt"
-box
+# prepare package
+
+manifest 'update'
+box 'build'
 

data/task/rdoc

@@ -7,108 +7,157 @@
 
 # NOTE: THIS IS SPECIALLY WRITTEN FOR FACETS!!!
 
-# Load RDoc configuration.
-
-config = configuration['rdoc']
-config = {
-  'template'       => 'html',
-  'merge'          => true,
-  'inline-source'  => true
-}.update(config)
-
-site = config.delete('op') || 'doc/rdoc'
+main :rdoc => [ :rdoc_all ] do
+  puts "RDoc complete."
+end
 
-targets = configuration('rdoc.yaml')
+task :rdoc_all do
+  # Load RDoc configuration.
+  configs = configuration['rdoc']
+  configs = [configs] unless Array===configs
 
-targets.each do |name, files|
-  targets[name] = files.split(/\s+/) if String===files
+  configs.each do |config|
+    if config['groups']
+      rdoc_groups(config)
+    else
+      rdoc_target(config)
+    end
+  end
 end
 
+# Docuement groups of targets.
 
-# Build RDocs.
+def rdoc_groups(config)
+  site = config.delete('output') || config.delete('op') || 'doc/rdoc'
+  tdir = config['chdir']
 
-main :rdoc => [ :rdoc_targets, :insert_ads ]
+  groups = config.delete('groups')
+  groups = TrueClass===groups ? [] : groups
 
+  # the rest
+  rest = []
+  chdir(tdir){rest=glob('**/*').select{|f| File.file?(f)}}
+  rest = rest - groups.flatten
+  groups.concat(rest.collect{ |r| [r] })
 
-# Build RDoc's for each target,
+  title = config['title'].to_s
 
-task :rdoc_targets do
+  # rdoc each group
+  groups.each do |group|
+    gf1st  = File.basename(group.first)
+    gname  = gf1st.chomp(File.extname(gf1st))
+    gsite  = File.join(site,gname)
+    gtitle = "#{title} #{gname.capitalize}".strip
 
-  # Helps to ensure we're in the right place.
-  dir!(File.dirname(site))
-
-  single = ARGV[0]
-
-  # Just do the one requested.
-  if targets.keys.include?(single)
-    targets = { single => targets[single] }
-    single_site = File.join(site, single)
-    # Remove just the one doc directory.
-    rm_r(single_site) if dir?(single_site) and safe?(single_site)
-  else
-    # Remove all old rdocs.
-    rm_r(site) if dir?(site) and safe?(site)
+    gconfig = config.merge('title' => gtitle, 'op' => gsite, 'files' => group)
+
+    rdoc_target(gconfig)
   end
+end
 
-  # Document each target.
-  targets.each do |name, options|
-    tgdir = options.delete('chdir')
-    files = options.delete('files')
+# Document target.
 
-    #files.collect!{|f| "lib/more/facets/#{f}" }
+def rdoc_target(config)
+  config = {
+    'template'       => 'html',
+    'merge'          => true,
+    'inline-source'  => true,
+    'files'          => '**/*'
+  }.merge(config)
 
-    outdir = File.expand_path(File.join(site, name.gsub(' ','')))
-    title = "Facets #{name.capitalize}"
+  site  = config.delete('output') || config.delete('op') || 'doc/rdoc'
+  tgdir = config.delete('chdir')
+  files = config.delete('files')
 
-    config = config.merge(
-      'op'             => outdir,
-      'title'          => title
-    )
+  config['op'] = File.expand_path(site)
 
-    # Prepare command arguments.
-    vector = [files, config] #.flatten.compact
+  config['main'] = File.expand_path(config['main']) if config['main']
 
-    # Create Documentation.
-    cd(tgdir) do
-      rdoc(vector.to_params)
-    end
+  # Helps to ensure we're in the right place.
+  #dir!(File.dirname(site))
+
+  # Remove all old rdocs.
+  rm_r(site) if dir?(site) and safe?(site)
+
+  # Prepare command arguments.
+  vector = [files, config] #.flatten.compact
+
+  # Create Documentation.
+  cd(tgdir) do
+    rdoc(vector.to_console)
   end
 
+  insert_ads(site)
 end
 
+# Insert ads.
 
-GOOGLE_AD = <<-END
-    <div style="position: absolute; top: 5px; right: 10px;">
-      <script type="text/javascript"><!--
-      google_ad_client = "pub-1126154564663472";
-      google_ad_width = 234;
-      google_ad_height = 60;
-      google_ad_format = "234x60_as";
-      google_ad_type = "text_image";
-      //2007-08-31: facets
-      google_ad_channel = "2923120207";
-      //-->
-      </script>
-      <script type="text/javascript"
-        src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-      </script>
-    </div>
-END
-
-
-task :insert_ads do
-  puts
-  dirs = Dir.glob(File.join(site,'*'))
+def insert_ads(site)
+  adfile = configuration['ad_file'] || 'meta/site_ad.html'
+  return unless adfile && File.file?(adfile)
+  adtext = File.read(adfile)
+  #puts
+  dirs = Dir.glob(File.join(site,'*/'))
   dirs.each do |dir|
-    files = Dir.glob(File.join(dir,'classes', '**/*.html'))
-    files += Dir.glob(File.join(dir,'files', '**/*.html'))
+    files = Dir.glob(File.join(dir, '**/*.html'))
     files.each do |file|
       html = file_read(file)
       bodi = html.index('<body>')
-      html[bodi + 7] = "\n" + GOOGLE_AD
+      html[bodi + 7] = "\n" + adtext
       #print "Augmenting #{file}..."
       file_write(file, html) unless dryrun?
       #puts "[done]"
     end
   end
 end
+
+
+
+
+# Build RDoc's for each target,
+
+# task :rdoc_targets do
+# 
+#   #targets.each do |name, files|
+#   #  targets[name] = files.split(/\s+/) if String===files
+#   #end
+# 
+# 
+# #  single = ARGV[0]
+# 
+# #   # Just do the one requested.
+# #   if targets.keys.include?(single)
+# #     targets = { single => targets[single] }
+# #     single_site = File.join(site, single)
+# #     # Remove just the one doc directory.
+# #     rm_r(single_site) if dir?(single_site) and safe?(single_site)
+# #   else
+# #     # Remove all old rdocs.
+# #     rm_r(site) if dir?(site) and safe?(site)
+# #   end
+# 
+#   # Document each target.
+#   targets.each do |name, options|
+#     tgdir = options.delete('chdir')
+#     files = options.delete('files')
+# 
+#     #files.collect!{|f| "lib/more/facets/#{f}" }
+# 
+#     outdir = File.expand_path(File.join(site, name.gsub(' ','')))
+#     title = "Facets #{name.capitalize}"
+# 
+#     config = config.merge(
+#       'op'             => outdir,
+#       'title'          => title
+#     )
+# 
+#     # Prepare command arguments.
+#     vector = [files, config] #.flatten.compact
+# 
+#     # Create Documentation.
+#     cd(tgdir) do
+#       rdoc(vector.to_params)
+#     end
+#   end
+# 
+# end

data/task/release

@@ -0,0 +1,12 @@
+#!/usr/bin/env ratch
+
+# release packages
+
+main :release do
+  fname = Dir.glob('meta/*.roll').first
+  pname = File.basename(fname).chomp('.roll')
+  name, version = *pname.split('-')
+
+  icli "rubyforge release --version=#{version}"
+end
+

data/task/special/quickopts

@@ -0,0 +1,15 @@
+#!/usr/bin/env ratch
+
+# generate quick options .html part
+
+main :quickopts do
+  str = ''
+  cd('doc/rdoc') do
+    dirs = Dir.glob('*') - ['core']
+    dirs.each do |f|
+      str << %{ <option value="#{f}"> #{f.capitalize} </option> \n}
+    end
+  end
+  File.open('doc/siteparts/quickopts.html', 'w'){ |f| f << str }
+end
+

data/task/syntax

@@ -1,5 +1,7 @@
 #!/usr/bin/env ratch
 
+# check syntax
+
 main :syntax do
   scripts = "lib/**/*.rb"
   libpath = [ 'lib/methods', 'lib/core', 'lib/more' ].join(':')

data/task/test

@@ -21,6 +21,8 @@ main :test do
 
   Dir.glob(find).each do |file|
     next if dir?(file)
-    load file
+    puts "Loading: #{file}"
+    load(file)
   end
 end
+

data/test/unit/enumerable/test_collect.rb

@@ -40,6 +40,18 @@ class TestEnumerable < Test::Unit::TestCase
     assert_equal( [1,2,4], a )
   end
 
+  def test_injecting
+    r = [1,2,3,4,5].injecting([]){ |a,i| a << i % 2 }
+    e = [1,0,1,0,1]
+    assert_equal(e, r)
+  end
+
+  def test_injecting_equal
+    r = [].injecting([]){ |a,i| a << i % 2 }
+    e = []
+    assert_equal(e, r)
+  end
+
 #     def test_op_mod
 #       a = [:A,:B,:C]
 #       assert_equal( a[1], a/1 )
@@ -79,6 +91,11 @@ class TestEnumerable < Test::Unit::TestCase
     assert_equal(r, h.cluster_by{|k, v| v%2}.each{|a| a.sort!})
   end
 
+  def test_cluster_by_empty
+    r = [].cluster_by{ |a| a }
+    assert_equal([], r)
+  end
+
   def test_each_by_01
     x = []
     [1,2,3,4].each_by{ |a,b| x << [a,b] }

data/test/unit/enumerable/test_permutation.rb

@@ -1,32 +1,22 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/enumerable/permutation.rb
-  #
-  # Extracted Mon Sep 03 16:23:07 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
-
- require 'facets/enumerable/permutation.rb'
-
-
-
-  require 'test/unit'
-  require 'set'
-
-  class TestEnumerablePermutation < Test::Unit::TestCase
-
-    def test_permutation
-      o = Set.new
-      %w[a b c].each_permutation { |x| o << x.join('') }
-      r = Set.new(['abc','acb','bac','bca','cab','cba'])
-      assert_equal( r, o )
-    end
-
+#      _____         _
+#    |_   _|__  ___| |_
+#     | |/ _ \/ __| __|
+#    | |  __/\__ \ |
+#   |_|\___||___/\__|
+#
+# for facets/enumerable/permutation.rb
+
+require 'facets/enumerable/permutation.rb'
+require 'test/unit'
+require 'set'
+
+class TestEnumerablePermutation < Test::Unit::TestCase
+
+  def test_permutation
+    o = Set.new
+    %w[a b c].each_permutation { |x| o << x.join('') }
+    r = Set.new(['abc','acb','bac','bca','cab','cba'])
+    assert_equal( r, o )
   end
 
-
-
+end

data/test/unit/test_crypt.rb

@@ -1,48 +1,41 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/crypt.rb
-  #
-  # Extracted Mon Sep 03 16:23:07 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |
+#   |_|\___||___/\__|
+#
+# for facets/crypt.rb
 
- require 'facets/crypt.rb'
+require 'facets/crypt.rb'
 
+require "test/unit"
 
+class CryptTest < Test::Unit::TestCase
 
-  require "test/unit"
-
-  class CryptTest < Test::Unit::TestCase
-
-    def array_test(arr, algo)
-      arr.each do |password, hash|
-        assert(Crypt.check(password, hash, algo))
-      end
+  def array_test(arr, algo)
+    arr.each do |password, hash|
+      assert(Crypt.check(password, hash, algo))
     end
+  end
 
-    def test_md5
-      a = [ [' ', '$1$yiiZbNIH$YiCsHZjcTkYd31wkgW8JF.'],
-        ['pass', '$1$YeNsbWdH$wvOF8JdqsoiLix754LTW90'],
-        ['____fifteen____', '$1$s9lUWACI$Kk1jtIVVdmT01p0z3b/hw1'],
-        ['____sixteen_____', '$1$dL3xbVZI$kkgqhCanLdxODGq14g/tW1'],
-        ['____seventeen____', '$1$NaH5na7J$j7y8Iss0hcRbu3kzoJs5V.'],
-        ['__________thirty-three___________', '$1$HO7Q6vzJ$yGwp2wbL5D7eOVzOmxpsy.'],
-        ['apache', '$apr1$J.w5a/..$IW9y6DR0oO/ADuhlMF5/X1']
-      ]
-      array_test(a, :md5)
-    end
+  def test_md5
+    a = [ [' ', '$1$yiiZbNIH$YiCsHZjcTkYd31wkgW8JF.'],
+      ['pass', '$1$YeNsbWdH$wvOF8JdqsoiLix754LTW90'],
+      ['____fifteen____', '$1$s9lUWACI$Kk1jtIVVdmT01p0z3b/hw1'],
+      ['____sixteen_____', '$1$dL3xbVZI$kkgqhCanLdxODGq14g/tW1'],
+      ['____seventeen____', '$1$NaH5na7J$j7y8Iss0hcRbu3kzoJs5V.'],
+      ['__________thirty-three___________', '$1$HO7Q6vzJ$yGwp2wbL5D7eOVzOmxpsy.'],
+      ['apache', '$apr1$J.w5a/..$IW9y6DR0oO/ADuhlMF5/X1']
+    ]
+    array_test(a, :md5)
+  end
 
-    def test_bad_algo
-      assert_raise(ArgumentError) do
-        Crypt.crypt("qsdf", :qsdf)
-      end
+  def test_bad_algo
+    assert_raise(ArgumentError) do
+      Crypt.crypt("qsdf", :qsdf)
     end
-
   end
 
+end