zucker 8 → 9

data/lib/zucker.rb

@@ -2,21 +2,21 @@
 
 module Zucker
   # version and date get modified by the :prepare_release rake task
-  VERSION = '8'
-  DATE = '2010-10-06'
+  VERSION = '9'
+  DATE = '2011-01-22'
   
   # cube list
   PACKAGES = {
     :control    => %w|egonil iterate tap sandbox kernel|,
     :env        => %w|engine info os version|,
-    :extensions => %w|array enumerable hash string unary union|,
+    :extensions => %w|array enumerable file hash string unary union|,
     :object     => %w|blank mcopy not|,
-    :to_proc    => %w|array2proc class2proc hash2proc regexp2proc|,
+    :to_proc    => %w|array_to_proc class_to_proc hash_to_proc regexp_to_proc|,
     :shortcuts  => %w|aliases alias_for square_brackets_for ivars|,
-    :debug      => %w|binding cc dd mm oo qq|,
+    :debug      => %w|binding cc dd mm oo qq regexp_visualize|,
   }
 
-  NON_1_8_CUBES = %w|not tap union|
+  NON_1_8_CUBES = %w|not|
 
   class << self
     # Zucker require helpers
@@ -50,7 +50,7 @@ module Zucker
       }.compact
     end
 
-    # these aliases 'pollute' the global namespace or may conflict with other codee
+    # these aliases 'pollute' the global namespace or may conflict with other code
     def activate_more_aliases!
       aliases = {
         :mcopy       => :copy,
@@ -62,18 +62,19 @@ module Zucker
       }
 
       loaded_aliases = []
+
       aliases.each{ |old, new|
         Object.class_eval "alias #{new} #{old}; loaded_aliases << :#{new}" rescue nil
       }
 
       #eval "::RV = RubyVersion; loaded_aliases << :RV" rescue nil
       (
-         Object.const_set '::RV', RubyVersion
+         Object.const_set 'RV', RubyVersion
          loaded_aliases << :RV
       ) rescue nil
       #eval "::RE = RubyEngine; loaded_aliases << :RE" rescue nil
       (
-         Object.const_set '::RE', RubyEngine
+         Object.const_set 'RE', RubyEngine
          loaded_aliases << :RE
       ) rescue nil
       

data/lib/zucker/array2proc.rb

@@ -1,18 +1,2 @@
-require 'zucker'
-
-class Array
-  def to_proc
-    Proc.new{ |obj|
-      if self.first.is_a? Array
-        self.inject(obj){ |result, nested_array|
-          nested_array.to_proc.call result
-        }
-      else
-        obj.send *self
-      end
-    }
-  end
-end
-
-# J-_-L
-
+warn 'Zucker: array2proc has been renamed. Please use array_to_proc!'
+require 'zucker/array_to_proc'

data/lib/zucker/binding.rb

@@ -7,17 +7,16 @@ class Binding
         ' - none'
       else
         array.map{|e|
-          val = self.eval "#{e}"
-          val = val.is_a?( Binding ) ? val.to_s : val.inspect
+          val = (self.eval "#{e}").inspect
           " - #{e}: #{ val }"
         }.join "\n"
       end
     }
 
-"#{self.to_s}
-local vars
+    puts "#{self.to_s}
+local variables
 #{ put_vars[ self.eval 'local_variables' ] }
-(instance vars)
+(instance variables)
 #{ put_vars[ self.eval 'instance_variables' ] }
 self
  - #{self.eval 'self'}

data/lib/zucker/cc.rb

@@ -9,14 +9,19 @@ module Kernel
       $2
     }.compact
     
-    if !show_irb && a = method_stack.index( 'irb_binding' )
-      method_stack = [ method_stack[0], '(irb)', *method_stack[a+1..-1] ]
+    if !show_irb
+      if a = method_stack.index( 'irb_binding' )
+        method_stack = [ method_stack[0], '(irb)', *method_stack[a+1..-1] ]
+      elsif a = method_stack[1..-1].index( '<main>' )
+        method_stack = [ method_stack[0], '(ripl)', *method_stack[a+2..-1] ]
+      end
     end
 
     # puts method_stack.map.with_index{ |m, i|
     method_stack.each_with_index{ |m, i|
       puts "  "*i + m
     }
+    nil
   end
 
   alias cc c

data/lib/zucker/class2proc.rb

@@ -1,12 +1,2 @@
-require 'zucker'
-
-class Class
-  def to_proc
-    Proc.new do |*args|
-      self.new *args
-    end
-  end
-end
-
-# J-_-L
-
+warn 'Zucker: class2proc has been renamed. Please use class_to_proc!'
+require 'zucker/class_to_proc'

data/lib/zucker/file.rb

@@ -0,0 +1,22 @@
+class << File
+  def gsub(filename, regex_hash)
+    data = File.read filename
+    File.open(filename,'w'){ |file|
+      regex_hash.each{ |regex, new_string|
+        regex = regex.to_s unless regex.is_a? Regexp
+
+        if new_string.is_a? Proc
+          data.gsub! regex, &new_string
+        else
+          data.gsub! regex, new_string
+        end
+      }
+      file.print data
+    }
+  end
+
+  def delete! filename
+    return nil if !File.exist?(filename)
+    File.delete filename
+  end
+end

data/lib/zucker/hash2proc.rb

@@ -1,16 +1,2 @@
-require 'zucker'
-
-class Hash
-  def to_proc
-    Proc.new{ |obj|
-      if self.member? obj
-        self[obj].to_proc.call obj
-      else
-        obj
-      end
-    }
-  end
-end
-
-# J-_-L
-
+warn 'Zucker: hash2proc has been renamed. Please use hash_to_proc!'
+require 'zucker/hash_to_proc'

data/lib/zucker/kernel.rb

@@ -21,13 +21,15 @@ module Kernel
     $PROGRAM_NAME == $` # __FILE__
   end
   alias standalone? executed_directly?
+  alias directly_executed? executed_directly?
 
   def irb?
-    !!(( IRB and $0 == 'irb' ) rescue nil)
+    (defined?(IRB) && $0 =~ /irb/) || (defined?(Ripl) && $0 =~ /ripl/)
   end
 
   def ignore_sigint! # ctrl+c
-     Signal.trap *%w|SIGINT IGNORE|
+    Signal.trap *%w|SIGINT IGNORE|
+    true
   end
 end
 

data/lib/zucker/mm.rb

@@ -2,28 +2,34 @@ require 'zucker'
 
 module Kernel
   def m(levels = 1)
+    # output helper
+    mputs = proc{ |e| puts e.map(&:to_s)*'  ' }
+
+    # how to get results
     if self.is_a? Module
       klass, method_function = self, :public_methods
     else
       klass, method_function = self.class, :public_instance_methods
+    end
 
-      eigen = self.singleton_methods
-      if !eigen.empty?
-        puts :Eigenclass # sorry for not being up to date, I just love the word
-        p self.singleton_methods
-      end
+    # eigenclass
+    eigen = self.singleton_methods
+    if !eigen.empty?
+      puts '= Eigenclass' # sorry for not being up to date, I just love the word
+      mputs[ self.singleton_methods ]
     end
 
+    # display
     levels.times{ |level|
       if cur = klass.ancestors[level]
-        p cur                               # put class name
-        p cur.send method_function, false   # put methods of the class
+        puts "= #{cur}"  # put class name
+        mputs[ cur.send method_function, false ] # put methods of the class
       else
         break
       end
     }
 
-    self # or whatever
+    nil
   end
 
   alias mm          m

data/lib/zucker/regexp2proc.rb

@@ -1,12 +1,2 @@
-require 'zucker'
-
-class Regexp
-  def to_proc
-    proc do |e|
-      e.to_s[self]
-    end
-  end
-end
-
-# J-_-L
-
+warn 'Zucker: regexp2proc has been renamed. Please use regexp_to_proc!'
+require 'zucker/regexp_to_proc'

data/lib/zucker/regexp_visualize.rb

@@ -0,0 +1,26 @@
+class Regexp
+  def visualize(string, groups = nil)
+    if self =~ string
+      if !groups
+        puts $` + ' >' + $& + '< ' + $'
+      else
+        Array( groups ).each{ |group|
+          begin
+            gr_string = string.dup
+            gr_string[ $~.end( group ),   0 ] = '< '
+            gr_string[ $~.begin( group ), 0 ] = ' >'
+            puts group.to_s + ': ' + gr_string
+          rescue IndexError
+            puts group.to_s + ': no match'
+          end
+        }
+      end
+    else
+      puts 'no match'
+    end
+
+    nil
+  end
+
+  alias vis visualize
+end

data/lib/zucker/sandbox.rb

@@ -3,21 +3,11 @@ require 'zucker'
 module Kernel
   private
 
-  def sandbox(rescueblock_or_default=nil)
+  def sandbox
     Thread.start do
       $SAFE = 4
       yield
     end.value
-  rescue SecurityError => e
-    if !rescueblock_or_default.nil?
-      if rescueblock_or_default.is_a? Proc
-        rescueblock_or_default.call e
-      else
-        rescueblock_or_default
-      end
-    else
-      raise e
-    end
   end
 end
 

data/spec/alias_for_spec.rb

@@ -0,0 +1,117 @@
+require 'zucker/alias_for'
+
+describe 'alias_for' do
+  it 'should create an alias for global methods' do
+    # rspec bug? 
+    # def m1
+    #   1
+    # end
+    # alias_for :m1, :a1
+    #
+    # proc do
+    #   a1.should == 1
+    # end.should_not raise_exception
+  end
+
+  it 'should create an alias for instance methods' do
+    class Array
+      def m2
+        2
+      end
+      alias_for :m2, :a2
+    end
+    proc do
+
+      [1,2,3].a2.should == 2
+    end.should_not raise_exception
+  end
+
+  it 'should create an alias for class (singleton) methods' do
+    class Array
+      class << Array
+        def m3
+          3
+        end
+        alias_for :m3, :a3
+      end
+    end
+
+    proc do
+      Array.a3.should == 3
+    end.should_not raise_exception
+  end
+
+
+  it 'should create aliases for the first argument with all other arguments' do
+    class Object
+      def m4
+        4
+      end
+    alias_for :m4, :ma, :mb, :mc
+    end
+    proc do
+      1.ma.should   == 4
+      "1".mb.should == 4
+      [1].mc.should == 4
+    end.should_not raise_exception
+  end
+end
+
+# alias_method
+module Blip
+  def blip
+    'blip'
+  end
+  alias_methods_for :blip, :blap, :blup
+  
+  class << self
+    def self_blip
+      'blip'
+    end
+    alias_methods_for :self_blip, :self_blap, :self_blup
+  end
+end
+
+class Hello
+  include Blip
+  
+  def hello
+    'hello'
+  end
+  alias_methods_for :hello, :hi, :howdy
+  
+  class << self
+    def self_hello
+      'hello'
+    end
+    alias_methods_for :self_hello, :self_hi, :self_howdy
+  end
+end
+
+describe 'alias_methods_for' do
+  let(:h) { Hello.new }
+
+  context "module context" do
+    it "should alias instance methods" do
+      h.blap.should == h.blip
+      h.blup.should == h.blip
+    end
+
+    it "should alias class methods" do
+      Blip.self_blap.should == Blip.self_blip
+      Blip.self_blup.should == Blip.self_blip
+    end
+  end
+
+  context "class context" do
+    it "should alias instance methods" do
+      h.hi.should == h.hello
+      h.howdy.should == h.hello
+    end
+
+    it "should alias class methods" do
+      Hello.self_hi.should == Hello.self_hello
+      Hello.self_howdy.should == Hello.self_hello
+    end
+  end
+end

data/spec/aliases_spec.rb

@@ -0,0 +1,13 @@
+require 'zucker/aliases'
+
+describe '(aliases)' do
+  it 'should create these aliases' do
+    # see aliases.rb for aliase list
+  end
+
+  it 'should define these constants' do
+    Infinity.finite?.should == false
+    NaN.nan?.should         == true
+  end
+end
+