zucker 4 → 5

data/lib/zucker/alias_for.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 def alias_for(m, *aliases)
   aliases.each{ |a|
     class_eval "alias #{a} #{m}"

data/lib/zucker/aliases.rb

@@ -1,4 +1,8 @@
-alias is_an? is_a?
+require 'zucker'
+
+class Object
+  alias is_an? is_a? # thanks to utility_belt
+end
 
 module Enumerable
   alias with zip
@@ -25,6 +29,20 @@ class Binding
   end
 end
 
+class << File
+  alias filename basename # thanks rdp :)
+end
+
+class << Dir
+  def join(*args)
+    File.join(*args)
+  end
+
+  def split(*args)
+    File.split(*args)
+  end
+end
+
 # constants - who would use these in real-world code for other things?
 Infinity = 1.0 / 0.0 # or 2*Float::MAX or Float::INFINITY
 NaN      = 0.0 / 0.0

data/lib/zucker/all.rb

@@ -1,6 +1,4 @@
-# require all the sugar ;)
-# see README for an explaination of what they do
-
-require 'zucker/default'
-require 'zucker/debug'
+require 'zucker'
+Zucker.require_all
 
+# J-_-L

data/lib/zucker/array.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Array
   def ^(other) # TODO: more efficient
     (self - other) +

data/lib/zucker/array2proc.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Array
   def to_proc
     Proc.new{ |obj|

data/lib/zucker/binding.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Binding
   def inspect
     put_vars = lambda { |array|
@@ -23,6 +25,9 @@ block_given?
  - #{self.eval 'block_given?'}"
 
   end
+
+  alias v  binding
+  alias vv binding
 end
 
 # J-_-L

data/lib/zucker/blank.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Object
   def blank?
     if respond_to? :empty? then empty? else !self end

data/lib/zucker/cc.rb

@@ -0,0 +1,25 @@
+require 'zucker'
+
+module Kernel
+  private
+
+  def c(show_irb = false)
+    method_stack = caller.reverse.map{ |m|
+      m.rindex( /:\d+(:in `(.*)')?$/ )
+      $2
+    }.compact
+    
+    if !show_irb && a = method_stack.index( 'irb_binding' )
+      method_stack = [ method_stack[0], '(irb)', *method_stack[a+1..-1] ]
+    end
+
+    # puts method_stack.map.with_index{ |m, i|
+    method_stack.each_with_index{ |m, i|
+      puts "  "*i + m
+    }
+  end
+
+  alias cc c
+end
+
+# J-_-L

data/lib/zucker/class2proc.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Class
   def to_proc
     Proc.new do |*args|

data/lib/zucker/control.rb

@@ -0,0 +1,4 @@
+require 'zucker'
+Zucker.require_this __FILE__
+
+# J-_-L

data/lib/zucker/dd.rb

@@ -0,0 +1,23 @@
+require 'zucker'
+
+module Kernel
+  def d(*args, &block)
+    if args.empty?
+      tap{
+        if block_given?
+          puts yield self
+        else
+          puts self.inspect
+        end
+      }
+    else
+      raise ArgumentError, ".d - The parser thought that the code after .d are method arguments... Please don't put a space after d or use .d() or .d{} in this case!"
+#      eval ...
+    end
+  end
+
+  alias dd d
+end
+
+# J-_-L
+

data/lib/zucker/debug.rb

@@ -1,6 +1,4 @@
 require 'zucker'
+Zucker.require_this __FILE__
 
-require 'zucker/D'
-require 'zucker/mm'
-require 'zucker/binding'
-require 'zucker/q'
+# J-_-L

data/lib/zucker/default.rb

@@ -1,38 +1,4 @@
 require 'zucker'
+Zucker.require_all
 
-# default
-zucker = %w|
-alias_for
-aliases
-array
-array2proc
-blank
-class2proc
-egonil
-engine
-enumerable
-hash
-hash2proc
-info
-iterate
-ivars
-kernel
-mcopy
-not
-os
-regexp2proc
-sandbox
-square_brackets_for
-string
-tap
-unary
-union
-version
-|
-
-# remove 1.9 if 1.8
-if RUBY_VERSION < '1.9'
-  zucker -= %w|not tap union|
-end
-
-zucker.each{|rb| require File.join( 'zucker', rb )}
+# J-_-L

data/lib/zucker/egonil.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 def egonil(nil_value = nil)
   yield
 rescue NoMethodError => e

data/lib/zucker/engine.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 module RubyEngine
     # try to guess the interpreter
     @interpreter = case
@@ -12,7 +14,7 @@ module RubyEngine
           'mri'
         end
       else
-        RUBY_ENGINE.to_sym # jruby, rbx, ironruby, macruby, etc.
+        RUBY_ENGINE.to_s # jruby, rbx, ironruby, macruby, etc.
       end
     else # probably 1.8
       'mri'

data/lib/zucker/enumerable.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 module Enumerable
   def mash
     ret = {}

data/lib/zucker/env.rb

@@ -0,0 +1,4 @@
+require 'zucker'
+Zucker.require_this __FILE__
+
+# J-_-L

data/lib/zucker/extensions.rb

@@ -0,0 +1,4 @@
+require 'zucker'
+Zucker.require_this __FILE__
+
+# J-_-L

data/lib/zucker/hash.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Hash
   def self.zip(keys,values)
     Hash[ *keys.zip( values ).flatten ]
@@ -13,6 +15,12 @@ class Hash
       raise TypeError, 'can only append other Hashs and Enumerables (or Classes that implement to_splat)'
     end
   end
+
+  def &(other)
+    Hash[ *select{ |k,v|
+      other[k] == v
+    }.flatten ]
+  end
 end
 
 # J-_-L

data/lib/zucker/hash2proc.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Hash
   def to_proc
     Proc.new{ |obj|

data/lib/zucker/info.rb

@@ -1,5 +1,7 @@
+require 'zucker'
+
 module Info
-  class << Info
+  class << self
     # hash like access
     def [](what)
       send what
@@ -13,15 +15,6 @@ module Info
 
   module_function
 
-  # current script file
-  def current_file
-    __FILE__
-  end
-
-  def current_file_directory
-    File.dirname(__FILE__)
-  end
-
   # input
   def last_input_file
     $FILENAME
@@ -83,12 +76,25 @@ module Info
   end
 
   # current
-  def current_line
-    __LINE__
+
+  def current_file #  __FILE__
+    return $` if caller[0].rindex(/:\d+(:in `.*')?$/)
   end
 
-  def current_method # 1.9
-    __method__
+  def current_file_directory
+    if current_file[0,1] == '(' && current_file[-1,1] == ')'
+      current_file
+    else
+      File.dirname(current_file)
+    end
+  end
+
+  def current_line # __LINE__
+    return $1.to_i if caller[0].rindex( /:(\d+)(:in `.*')?$/ )
+  end
+
+  def current_method # __method__ (except aliases)
+    return $1.to_sym if caller(1)[0].rindex( /\`([^\']+)\'/ )
   end
 
   def current_callstack
@@ -139,9 +145,9 @@ module Info
   end
 
   # encoding (1.9)
-  def source_encoding
-    __ENCODING__
-  end
+  #def source_encoding
+  #  __ENCODING__
+  #end
 
   def external_encoding
     Encoding.default_external

data/lib/zucker/iterate.rb

@@ -1,5 +1,8 @@
+require 'zucker'
+
 def iterate(*params)
   # params.shift.zip(*params).each{ |*elements| yield *elements }
+  raise ArgumentError, "wrong number of arguments (0)" if params.empty?
 
   first = params.shift
   if params.empty? # single param - like each

data/lib/zucker/ivars.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 def instance_variables_from(obj, *only)
   iter =
   if    obj.is_a? Binding

data/lib/zucker/kernel.rb

@@ -1,4 +1,8 @@
+require 'zucker'
+
 module Kernel
+  private
+
   def activate_warnings!
     $VERBOSE = true
   end
@@ -8,18 +12,23 @@ module Kernel
   end
 
   def library?
-    __FILE__ != $PROGRAM_NAME
+    caller[0].rindex(/:\d+(:in `.*')?$/)
+    $PROGRAM_NAME != $` # __FILE__
   end
 
   def executed_directly?
-    __FILE__ == $PROGRAM_NAME
+    caller[0].rindex(/:\d+(:in `.*')?$/)
+    $PROGRAM_NAME == $` # __FILE__
   end
   alias standalone? executed_directly?
 
+  def irb?
+    !!(( IRB and $0 == 'irb' ) rescue nil)
+  end
+
   def ignore_sigint! # ctrl+c
      Signal.trap *%w|SIGINT IGNORE|
   end
 end
 
 # J-_-L
-

data/lib/zucker/mcopy.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Object
   def mcopy
     Marshal.load Marshal.dump self

data/lib/zucker/mm.rb

@@ -1,5 +1,7 @@
+require 'zucker'
+
 module Kernel
-  def method_list(levels = 1)
+  def m(levels = 1)
     if self.is_a? Module
       klass, method_function = self, :public_methods
     else
@@ -24,7 +26,8 @@ module Kernel
     self # or whatever
   end
 
-  alias mm method_list
+  alias mm          m
+  alias method_list m
 end
 
 # J-_-L

data/lib/zucker/not.rb

@@ -1,3 +1,5 @@
+require 'zucker'
+
 class Object
   def not
     NotClass.new self

data/lib/zucker/object.rb

@@ -0,0 +1,4 @@
+require 'zucker'
+Zucker.require_this __FILE__
+
+# J-_-L

data/lib/zucker/oo.rb

@@ -0,0 +1,17 @@
+require 'zucker'
+
+module Kernel
+  private
+
+  def o(desc = nil)
+    caller[0].rindex( /:(\d+)(:in (`.*'))?$/ )
+    m = $3 ? "method #$3, " : ""
+    d = desc ? "#{desc}: r" : 'R'
+
+    puts ret = "#{d}eached #{m}line #$1 of file #$`"
+    # [$`, $1.to_i, $3.to_sym,  desc]
+  end 
+  alias oo o
+end
+
+# J-_-L