facets 1.8.8 → 1.8.20

data/lib/facets/more/openobject.rb

@@ -337,7 +337,7 @@ end
       p = lambda { |x|
         x.word = "Hello"
       }
-      o = p.to_openobjrct
+      o = p.to_openobject
       assert_equal( "Hello", o.word )
     end
 

data/lib/facets/more/pool.rb

@@ -1,6 +1,6 @@
 # = pool.rb
 #
-# == Copyright (c) 2004 Navel
+# == Copyright (c) 2004 George Moschovitis
 #
 #   Ruby License
 #
@@ -20,7 +20,7 @@
 #   TODO Could use the SizedQueue/Queue ?
 
 # Author::    George Moschovitis
-# Copyright:: Copyright (c) 2004 Navel
+# Copyright:: Copyright (c) 2004 George Moschovitis
 # License::   Ruby License
 
 require 'thread'

data/lib/facets/more/syncarray.rb

@@ -1,6 +1,6 @@
 # = syncarray.rb
 #
-# == Copyright (c) 2004 Navel
+# == Copyright (c) 2004 George Moschovitis
 #
 #   Ruby License
 #
@@ -15,8 +15,8 @@
 #
 # * George Moschovitis
 
-# Author::    George Moschovitis <gm@navel.gr>
-# Copyright:: Copyright (c) 2005 Navel
+# Author::    George Moschovitis 
+# Copyright:: Copyright (c) 2005 George Moschovitis
 # License::   Ruby License
 
 require 'sync'

data/lib/facets/more/synchash.rb

@@ -1,6 +1,6 @@
 # = synchash.rb
 #
-# == Copyright (c) 2004 Navel
+# == Copyright (c) 2004 George Moschovitis 
 #
 #   Ruby License
 #
@@ -15,8 +15,8 @@
 #
 # * George Moschovitis
 
-# Author::    George Moschovitis <gm@navel.gr>
-# Copyright:: Copyright (c) 2005 Navel
+# Author::    George Moschovitis
+# Copyright:: Copyright (c) 2005 George Moschovitis
 # License::   Ruby License
 
 # = SyncHash

data/lib/facets/more/uploadutils.rb

@@ -1,17 +1,16 @@
 # = uploadutils.rb
+# 
+# CREDIT Thomas Sawyer
 #
 # TODO Incorporate password into scp and ftp ?
-#
 # TODO rsync needs --delete option
-#++
 
 require 'openssl'
 require 'shellwords'
 require 'tmpdir'
-#require 'net/smtp'
 
-# <b>UPLOAD FILES TO A HOST</b>
-#
+require 'facets/more/openobject'
+
 # Upload files to host. These means of uploading are current 
 # supported: ftp, sftp, scp and rsync.
 #
@@ -61,7 +60,7 @@ module UploadUtils
   #
 
   def ftp( keys )
-    keys = keys.to_openhash
+    keys = upload_parameters(keys)
 
     # set transfer rules
     if keys.stage
@@ -99,7 +98,7 @@ module UploadUtils
   #
 
   def sftp( keys )
-    keys = keys.to_openobject
+    keys = upload_parameters(keys)
 
     # set transfer rules
     if keys.stage
@@ -137,7 +136,7 @@ module UploadUtils
   #
 
   def rsync( keys )
-    keys = keys.to_openobject
+    keys = upload_parameters(keys)
 
     flags = []
     flags << "-n" if keys.dryrun
@@ -147,7 +146,7 @@ module UploadUtils
     flags = flags.join(' ').strip
     flags = ' ' + flags unless flags.empty?
 
-    manfile = '.publish.mainfest'
+    manfile = 'Publish.txt'
 
     if keys.stage
       dir = stage_linkdir(keys.dir, keys.stage)
@@ -190,14 +189,13 @@ module UploadUtils
     #keys.pass = keys.pass || keys.password
 
     # validate
+    raise ArgumentError, "missing publish parameter -- dir" unless keys.dir
     raise ArgumentError, "missing publish parameter -- host" unless keys.host
     raise ArgumentError, "missing publish parameter -- user" unless keys.user
-    raise ArgumentError, "missing publish parameter -- copy" unless keys.copy
+    #raise ArgumentError, "missing publish parameter -- copy" unless keys.copy
     #raise ArgumentError, "missing publish parameter -- root" unless keys.root
 
-    #keys.root = '' if keys.root.nil?
-    #keys.root = keys.root[1..-1] if keys.root[0,1] == '/'
-    keys.root = '' if opts.root.nil?
+    keys.root = '' if keys.root.nil?
     keys.root.sub!(/^\//,'')
 
     if String===keys.copy and File.directory?(keys.copy)
@@ -233,11 +231,11 @@ module UploadUtils
       del.collect!{ |f| f.sub(/^[-]/,'') }
       add.collect!{ |f| f.sub(/^[+]/,'') }
 
-      del.concat(must_exclude)
+      #del.concat(must_exclude)
 
       files = []
-      add.each{ |g| files += Dir.multiglob_recurse(g) }
-      del.each{ |g| files -= Dir.multiglob_recurse(g) }
+      add.each{ |g| files += Dir.multiglob(g) }
+      del.each{ |g| files -= Dir.multiglob(g) }
 
       files.collect!{ |f| f.sub(/^\//,'') }
 

data/lib/facets/yore/enumerable/cross.rb

@@ -0,0 +1,117 @@
+# Cross product adapted from code by Michael Neuman.
+#
+# CREDIT Michael Neuman
+
+require 'generator'
+
+module Enumerable
+
+  class << self
+
+    # Provides the cross-product of two or more Enumerables.
+    # This is the class-level method. The instance method
+    # calls on this.
+    #
+    #   Enumerable.cross([1,2], [4], ["apple", "banana"])
+    #   #=> [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+    #
+    #   Enumerable.cross([1,2], [3,4])
+    #   #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
+    #
+    #--
+    # TODO Make a more efficient version just for Array (?)
+    #++
+
+    def cross(*enums, &block)
+      raise if enums.empty?
+      gens = enums.map{|e| Generator.new(e)}
+      return [] if gens.any? {|g| g.end?}
+
+      sz = gens.size
+      res = []
+      tuple = Array.new(sz)
+
+      loop do
+        # fill tuple
+        (0 ... sz).each { |i|
+          tuple[i] = gens[i].current
+        }
+        if block.nil?
+          res << tuple.dup
+        else
+          block.call(tuple.dup)
+        end
+
+        # step forward
+        gens[-1].next
+        (sz-1).downto(0) do |i|
+          if gens[i].end?
+            if i > 0
+              gens[i].rewind
+              gens[i-1].next
+            else
+              return res
+            end
+          end
+        end
+      end #loop
+    end
+
+  end
+
+
+  # The instance level version of <tt>Enumerable::cartesian_product</tt>.
+  #
+  #   a = []
+  #   [1,2].cart([4,5]){|elem| a << elem }
+  #   a  #=> [[1, 4],[1, 5],[2, 4],[2, 5]]
+  #
+  #--
+  # TODO Make a more efficient version just for Array (?)
+  #++
+
+  def cross(*enums, &block)
+    Enumerable.cross(self, *enums, &block)
+  end
+
+end
+
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCEnumerableClass < Test::Unit::TestCase
+
+    def test_cross
+      i = [[1,2], [3,4]]
+      o = [[1, 3], [1, 4], [2, 3], [2, 4]]
+      assert_equal( o, Enumerable.cross(*i) )
+      i = [[1,2], [4], ["apple", "banana"]]
+      o = [[1, 4, "apple"], [1, 4, "banana"], [2, 4, "apple"], [2, 4, "banana"]]
+      assert_equal( o, Enumerable.cross(*i) )
+    end
+
+  end
+
+
+  class TCEnumerable < Test::Unit::TestCase
+
+    def test_cross
+      a = [1,2,3].cross([4,5,6])
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+      a = []
+      [1,2,3].cross([4,5,6]) {|elem| a << elem }
+      assert_equal( [[1, 4],[1, 5],[1, 6],[2, 4],[2, 5],[2, 6],[3, 4],[3, 5],[3, 6]], a )
+    end
+
+  end
+
+=end

data/test/lib/facets/core/array/test_at_rand.rb

@@ -0,0 +1,34 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/at_rand.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/at_rand.rb'
+
+
+  require 'test/unit'
+
+  class TCArray < Test::Unit::TestCase
+
+    def test_at_rand
+      a = [1,2,3,4,5]
+      20.times{ assert_nothing_raised{ a.at_rand } }
+      20.times{ assert( a.include?( a.at_rand ) ) }
+    end
+
+    def test_at_rand!
+      a = ['a','b','c']
+      assert_equal( 1, a.at_rand!.length )
+      assert_equal( 2, a.length )
+    end
+
+  end
+
+

data/test/lib/facets/core/array/test_delete_unless.rb

@@ -0,0 +1,28 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/delete_unless.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/delete_unless.rb'
+
+
+  require 'test/unit'
+
+  class TC_DELETE_UNLESS < Test::Unit::TestCase
+
+    def test_delete_unless
+      a = [1,2,3]
+      a.delete_unless{ |e| e == 2 }
+      assert_equal( [2], a )
+    end
+
+  end
+
+

data/test/lib/facets/core/array/test_delete_values.rb

@@ -0,0 +1,28 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/delete_values.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/delete_values.rb'
+
+
+  require 'test/unit'
+
+  class TCArray < Test::Unit::TestCase
+
+    def test_delete_values
+      a = [1,2,3,4]
+      assert_equal( [1,2], a.delete_values(1,2) )
+      assert_equal( [3,4], a )
+    end
+
+  end
+
+

data/test/lib/facets/core/array/test_delete_values_at.rb

@@ -0,0 +1,31 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/delete_values_at.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/delete_values_at.rb'
+
+
+  require 'test/unit'
+
+  class TCArray < Test::Unit::TestCase
+
+    def test_delete_values_at
+      a = [1,2,3,4]
+      assert_equal( [2,3], a.delete_values_at(1,2) )
+      assert_equal( [1,4], a )
+      a = [1,2,3,4]
+      assert_equal( [1,2,3], a.delete_values_at(0..2) )
+      assert_equal( [4], a )
+    end
+
+  end
+
+

data/test/lib/facets/core/array/test_first.rb

@@ -0,0 +1,46 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/first.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/first.rb'
+
+
+  require 'test/unit'
+
+  class TCArray < Test::Unit::TestCase
+
+    def test_first_eq
+      a = [1,2]
+      a.first = 0
+      assert_equal( [0,2], a )
+    end
+
+    def test_first!
+      a = [1,2,3]
+      assert_equal( 1, a.first! )
+      assert_equal( [2,3], a )
+    end
+
+    def test_last_eq
+      a = [1,2]
+      a.last = 3
+      assert_equal( [1,3], a )
+    end
+
+    def test_last!
+      a = [1,2,3]
+      assert_equal( 3, a.last! )
+      assert_equal( [1,2], a )
+    end
+
+  end
+
+

data/test/lib/facets/core/array/test_head.rb

@@ -0,0 +1,42 @@
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+# for lib/facets/core/array/head.rb
+#
+# Extracted Tue Feb 06 17:03:51 EST 2007
+# Project.rb Test Extraction
+#
+
+require 'facets/core/array/head.rb'
+
+
+  require 'test/unit'
+
+  class TCArray < Test::Unit::TestCase
+
+    def test_head
+      a = [1,2,3,4,5]
+      assert_equal( [1], a.head )
+    end
+
+    def test_tail
+      a = [1,2,3,4,5]
+      assert_equal( [2,3,4,5], a.tail )
+    end
+
+    def test_foot
+      a = [1,2,3,4,5]
+      assert_equal( [5], a.foot )
+    end
+
+    def test_body
+      a = [1,2,3,4,5]
+      assert_equal( [1,2,3,4], a.body )
+    end
+
+  end
+
+