epitools 0.5.59 → 0.5.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9003ca555f667ebc3547afdcbe332b0718cb3e0
-  data.tar.gz: 83d00e82dc95355773c1f34744c6a1f24290f808
+  metadata.gz: 1f76bdcc4911578c98d5b2ab7e37fb34f9033205
+  data.tar.gz: fd983d2ffc809874983ff153f8c87e31d65f39d0
 SHA512:
-  metadata.gz: 776eca2bf207c715ef1ec9a0fa213e216bc640b152b356841b6873a8ecf66c2e0d0d5ca7a786f38c4b16edca14676f29a73644b7b82d38df31145938623e8071
-  data.tar.gz: 5400b2ad213c76e4e297838143af5c43010bd8c485aee789479b530b89781d73303b21ed784ec4cae2e1c67c7937c818f11057dda6ab44129465e9aaf794f2d7
+  metadata.gz: 881360cb002b0d78c2c313dcb6465b417aa472d08f3a5686cec612fdd0892ede20b6daa22502ef643189618312d43b872d57437ab38ab93279ad4e52717bb6cf
+  data.tar.gz: 1853d1fd9df5a4ac19901a480b672d54888061e3843c302962326b819ea4cd4f43648dd5156b0d02410dadbfaa553ffce2c4effa17030e3180c0ae4a83b86815

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 .idea
+.tags*

data/VERSION

@@ -1 +1 @@
-0.5.59
+0.5.60

data/lib/epitools/core_ext/array.rb

@@ -1,6 +1,12 @@
 
 class Array
 
+  #
+  # Better names
+  #
+  alias_method :lpush, :unshift
+  alias_method :lpop,  :shift
+
   #
   # flatten.compact.uniq
   #
@@ -20,13 +26,13 @@ class Array
   #
   #   nums = [1,2,3,4,5,6,7,8,9,10,11,12]
   #   even = nums.remove_if { |n| n.even? }   # remove all even numbers from the "nums" array and return them
-  #   odd = nums                              # "nums" now only contains odd numbers
+  #   odd  = nums                             # "nums" now only contains odd numbers
   #
   def remove_if(&block)
     removed = []
 
     delete_if do |x|
-      if block.call(x)
+      if yield(x)
         removed << x
         true
       else
@@ -91,7 +97,7 @@ class Array
   #
   unless instance_methods.include? :shuffle
     def shuffle
-      sort_by{rand}
+      sort_by { rand }
     end
   end
 
@@ -181,6 +187,33 @@ class Array
 
   end
 
+
+  alias_method :old_multiply, :*
+  private :old_multiply
+
+  #
+  # Overridden multiplication operator. Now lets you multiply the Array by another Array or Enumerable.
+  #
+  # Array * Integer == a new array with <Integer> copies of itself inside
+  # Array * String == a new string containing the elements, joined by the <String>
+  # Array * {Array or Enumerable} == the cross product (aka. cartesian product) of both arrays
+  #
+  def *(other)
+    case other
+    when Integer, String
+      old_multiply(other)
+    when Enumerable
+      cross_product(other).to_a
+    end
+  end
+
+  #
+  # Multiply the array by itself `n` times.
+  #
+  def **(n)
+    super.to_a
+  end
+
 end
 
 

data/lib/epitools/core_ext/enumerable.rb

@@ -390,6 +390,34 @@ module Enumerable
   end
   alias_method :grouped, :groups
 
+
+  #
+  # Multiplies this Enumerable by something. (Same behaviour as Enumerator#*)
+  #
+  def *(other)
+    case other
+    when Integer, String
+      to_enum * other
+    when Enumerable
+      to_enum.cross_product(other)
+    end
+  end
+
+  #
+  # Multiplies this Enumerable by itself `n` times.
+  #
+  def **(n)
+    [self].cycle(n).reduce(:*)
+  end
+
+  #
+  # Same behaviour as Enumerator#cross_product
+  #
+  def cross_product(other)
+    to_enum.cross_product(other)
+  end
+  alias_method :cross, :cross_product
+
 end
 
 
@@ -419,4 +447,49 @@ class Enumerator
     end
   end
 
+
+  #
+  # Concatenates two Enumerators, returning a new Enumerator.
+  #
+  def +(other)
+    raise "Can only concatenate Enumerable things to Enumerators" unless Enumerable === other
+
+    Enumerator.new do |yielder|
+      each { |e| yielder << e }
+      other.each { |e| yielder << e }
+    end
+  end
+
+
+  #
+  # Multiplies this Enumerator by something else.
+  #
+  # Enumerator * Integer == a new Enumerator that repeats the original one <Integer> times
+  # Enumerator * String == joins the Enumerator's elements into a new string, with <String> in between each pair of elements
+  # Enumerator * Enumerable == the cross product (aka. cartesian product) of the Enumerator and the Enumerable
+  #
+  def *(other)
+    case other
+    when Integer
+      cycle(other)
+    when String
+      join(other)
+    when Enumerable
+      cross(other)
+    else
+      raise "#{other.class} is not something that can be multiplied by an Enumerator"
+    end
+  end
+
+  #
+  # Takes the cross product (aka. cartesian product) of the Enumerator and the argument,
+  # returning a new Enumerator. (The argument must be some kind of Enumerable.)
+  #
+  def cross_product(other)
+    Enumerator.new do |yielder|
+      each { |a| other.each { |b| yielder << [a,b] } }
+    end
+  end
+  alias_method :cross, :cross_product
+
 end

data/lib/epitools/hexdump.rb

@@ -20,9 +20,9 @@ module Hex
   ASCII_PRINTABLE = (33..126)
 
   DUMP_COLORS = Rash.new(
-    /\d/ => 13,
-    /\w/ => 3,
-    nil => 9,
+    /\d/     => 13,
+    /\w/     => 3,
+    nil      => 9,
     :default => 7
   )
 

data/lib/epitools/iter.rb

@@ -70,7 +70,7 @@ class Iter
   class Elem < BasicObject
   
     attr_accessor :val, :visited
-    
+
     def initialize(iter, val)
       @iter = iter
       @val  = val.is_a?(Elem) ? val.value : val
@@ -81,10 +81,6 @@ class Iter
       true
     end
     
-    def ==(other)
-      self.eql?(other)
-    end
-    
     def container
       @iter.container
     end
@@ -161,6 +157,19 @@ class Iter
     def inspect
       "<Elem: #{@val.inspect}>"
     end
+
+
+    include ::Comparable
+
+    def <=>(other)
+      case other
+      when Elem
+        @val <=> other.value
+      else
+        @val <=> other
+      end
+    end
+
   end
 
   

data/lib/epitools/path.rb

@@ -582,7 +582,7 @@ class Path
   #
   def []=(key, value)
     Path.setfattr(path, key, value)
-    @attrs = nil
+    @attrs = nil # clear cached xattrs
   end
 
   ###############################################################################

data/spec/autoreq_spec.rb

@@ -2,37 +2,37 @@ require 'epitools/minimal'
 
 describe "autoreq" do
 
-  it "should have Haml and Units installed" do
-    gems = Gem.source_index.to_a.map{|name, spec| spec.name}.uniq
-    gems.include?("haml").should == true
-    gems.include?("units").should == true
-  end
+  # it "should have Haml and Units installed" do
+  #   gems = Gem.source_index.to_a.map{|name, spec| spec.name}.uniq
+  #   gems.include?("haml").should == true
+  #   gems.include?("units").should == true
+  # end
 
-  it "autoreqs a gem" do
-    defined?(Haml).should == nil
+  # it "autoreqs a gem" do
+  #   defined?(Haml).should == nil
 
-    autoreq :Haml, 'haml'
-    !!defined?(Haml).should == false
-    lambda { Haml }.should_not raise_error
-  end
+  #   autoreq :Haml, 'haml'
+  #   !!defined?(Haml).should == false
+  #   lambda { Haml }.should_not raise_error
+  # end
     
-  it "autoreqs a regular ruby file" do
-    defined?(Net).should == nil
+  # it "autoreqs a regular ruby file" do
+  #   defined?(Net).should == nil
     
-    module Net
-      autoreq :HTTP, 'net/http'
-    end
-    lambda { Net::HTTP }.should_not raise_error
-  end
+  #   module Net
+  #     autoreq :HTTP, 'net/http'
+  #   end
+  #   lambda { Net::HTTP }.should_not raise_error
+  # end
     
-  it "autoreqs a gem with a block" do
-    defined?(Units).should == nil
+  # it "autoreqs a gem with a block" do
+  #   defined?(Units).should == nil
     
-    autoreq :Units do
-      gem 'units', '~> 1.0'
-      require 'units'
-    end
-    lambda { Units }.should_not raise_error
-  end
+  #   autoreq :Units do
+  #     gem 'units', '~> 1.0'
+  #     require 'units'
+  #   end
+  #   lambda { Units }.should_not raise_error
+  # end
     
 end

data/spec/core_ext_spec.rb

@@ -445,24 +445,24 @@ end
 
 describe Enumerable do
 
-  # it "maps deeply" do
-  #   [["a\n", "b\n"], ["c\n", "d\n"]].map_recursively(&:strip).should == [ %w[a b], %w[c d] ]
+  it "maps deeply" do
+    [["a\n", "b\n"], ["c\n", "d\n"]].map_recursively(&:strip).should == [ %w[a b], %w[c d] ]
     
-  #   [[1,2],[3,4]].deep_map {|e| e ** 2}.should == [[1,4],[9,16]] 
-  #   [1,2,3,4].deep_map {|e| e ** 2}.should == [1,4,9,16] 
-  #   [[],[],1,2,3,4].deep_map {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
+    [[1,2],[3,4]].deep_map {|e| e ** 2}.should == [[1,4],[9,16]] 
+    [1,2,3,4].deep_map {|e| e ** 2}.should == [1,4,9,16] 
+    [[],[],1,2,3,4].deep_map {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
 
-  #   {1=>2, 3=>{4=>5, 6=>7}}.deep_map {|k,v| [k, v**2] }.should == [ [1,4], [3, [[4,25], [6,49]]] ]
-  # end
+    {1=>2, 3=>{4=>5, 6=>7}}.deep_map {|k,v| [k, v**2] }.should == [ [1,4], [3, [[4,25], [6,49]]] ]
+  end
   
-  # it "selects deeply" do
-  #   [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [[2],[4]]
-  #   puts
+  it "selects deeply" do
+    [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [[2],[4]]
+    puts
 
-  #   {1=>2, 3=>{4=>5, 6=>7}}.deep_select {|k,v| k == 1 }.should == {1=>2} 
-  #   #[1,2,3,4].deep_select {|e| e ** 2}.should == [1,4,9,16] 
-  #   #[[],[],1,2,3,4].deep_select {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
-  # end
+    {1=>2, 3=>{4=>5, 6=>7}}.deep_select {|k,v| k == 1 }.should == {1=>2} 
+    #[1,2,3,4].deep_select {|e| e ** 2}.should == [1,4,9,16] 
+    #[[],[],1,2,3,4].deep_select {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
+  end
   
   it "splits" do
     [1,2,3,4,5].split_at     {|e| e == 3}.should == [ [1,2], [4,5] ]
@@ -540,6 +540,13 @@ describe Enumerable do
     result.should == 10.times.permutation(2).to_a
   end
 
+  it "cartesian products" do
+    a = [1,2]
+    b = [3,4]
+
+    (a * b).to_a.should == [[1,3],[1,4],[2,3],[2,4]]
+  end
+
 end
 
 describe Enumerator do
@@ -550,6 +557,36 @@ describe Enumerator do
     }.should_not raise_error
   end
 
+  it "concatenates" do
+    e = [1,2,3].to_enum + [4,5,6].to_enum
+    e.to_a.should == [1,2,3,4,5,6]
+
+    e = [1,2,3].to_enum + [4,5,6]
+    e.to_a.should == [1,2,3,4,5,6]
+  end
+
+  it "multiplies" do
+    e = [1,2,3].to_enum * 3 
+    e.to_a.should == [1,2,3]*3
+
+    e = [1,2].to_enum * [3,4].to_enum
+    e.to_a.should == [[1,3],[1,4],[2,3],[2,4]]
+
+    lambda { [].old_multiply }.should raise_error(NoMethodError)
+  end
+
+  it "exponentiates" do
+    e = [1,2].to_enum ** 2
+    squared = [[1,1], [1,2], [2,1], [2,2]]
+
+    e.to_a.should == squared
+
+    e = [1,2].to_enum ** 3
+
+    e.to_a.should == squared * [1,2]
+    e.to_a.should == ([1,2]**3)
+  end
+
 end
 
 

data/spec/path_spec.rb

@@ -542,7 +542,7 @@ describe Path do
     attrs = file.attrs
     attrs["user.diff_element"] = "newtest"
     file.attrs = attrs
-    file["user.newtest"].should == "newtest"
+    file["user.diff_element"].should == "newtest"
   end
 
   it "changes mtime/atime" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.59
+  version: 0.5.60
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -61,7 +61,6 @@ files:
 - lib/epitools/core_ext/range.rb
 - lib/epitools/core_ext/string.rb
 - lib/epitools/core_ext/truthiness.rb
-- lib/epitools/ezdb.rb
 - lib/epitools/hexdump.rb
 - lib/epitools/iter.rb
 - lib/epitools/its.rb
@@ -90,7 +89,6 @@ files:
 - spec/clitools_spec.rb
 - spec/colored_spec.rb
 - spec/core_ext_spec.rb
-- spec/ezdb_spec.rb
 - spec/histogram_spec.rb
 - spec/iter_spec.rb
 - spec/lcs_spec.rb

data/lib/epitools/ezdb.rb

@@ -1,100 +0,0 @@
-require 'epitools'
-require 'dbm'
-require 'delegate'
-
-class Ezdc < DelegateClass(Hash)
-
-  attr_reader :db, :path, :dirty
-
-  @@dirty = Set.new
-  
-  def initialize(filename)
-    @path = Path[filename]
-    
-    if @path.ext.nil?
-      @path.ext = "db"
-    else
-      @path.ext += ".db" if @path.ext != 'db'
-    end
-    
-    @db = DBM::open(@path.with(:ext=>nil))
-    
-    super
-  end
-  
-  class Observed < BasicObject
-    MUTATORS = ::Set.new [
-      :<<, :push, :pop, :slice, :[]=
-    ]
-  
-    def __send__(meth, *args)
-      if MUTATORS.include? meth
-        @@dirty.add self
-      end
-      
-    end
-  end
-  
-  def observed(obj)
-    obj.using(Observed)
-  end
-  
-  def [](key)
-    observed(super[key])
-  end
-  
-  def []=(key, val)
-  end
-  
-  def keys
-    db.keys.map(&:unmarshal)
-  end
-  
-  def delete!
-    @path.rm
-  end
-  
-  def flush!
-    dirty.each do |key|
-      db[key.marshal] = super[key].marshal
-    end
-  end
-  
-end
-
-
-class Ezdb
-
-  attr_reader :db, :path
-
-  def initialize(filename)
-    @path = Path[filename]
-    
-    if @path.ext.nil?
-      @path.ext = "db"
-    else
-      @path.ext += ".db" if @path.ext != 'db'
-    end
-    
-    @db = DBM::open(@path.with(:ext=>nil))
-  end
-  
-  def [](key)
-    val = db[key.marshal]
-    val = val.unmarshal if val
-    val
-  end
-  
-  def []=(key, val)
-    db[key.marshal] = val.marshal
-  end
-  
-  def keys
-    db.keys.map(&:unmarshal)
-  end
-  
-  def delete!
-    @path.rm
-  end
-  
-end

data/spec/ezdb_spec.rb

@@ -1,47 +0,0 @@
-require 'epitools/ezdb'
-require 'epitools/path'
-
-class Test < Struct.new(:a, :b); end
-
-describe Ezdb do
-
-  attr_accessor :db
-
-  before :each do
-    @dbfile = Path["test.db"]
-    @dbfile.rm if @dbfile.exists?
-    @db = Ezdb.new @dbfile
-  end
-  
-  after :each do
-    @db.delete!
-  end
-  
-  it "stores/retrieves" do
-    db[1].should == nil
-    db[1] = :blah
-    db[1].should == :blah
-    db.keys.should == [1]
-    
-    s = Test.new("what", true)
-    db[s] = false
-    db[s].should == false
-  end
-  
-  it "handles nil extensions" do
-    x = Ezdb.new "testdb"
-    x[1].should == nil
-    x.delete!
-  end
-  
-  it "pushes" do
-    db[:a] ||= []
-    db[:a].should == []
-    db[:a] << 1
-    db[:a] << 2
-    db[:a] << 3
-    db[:a] << 4
-    db[:a].should == [1,2,3,4]
-  end
-  
-end