zucker 3 → 4

data/CHANGELOG

@@ -1,3 +1,11 @@
+2010-09-01 | Zucker 4
+
+* added RubyEngine constant
+* added RubyVersion constant
+* added OS constant
+* added q debug method (like p but on one line)
+* added String#-
+
 2010-08-14 | Zucker 3
 * added tap cube
 * added Object#not
@@ -24,3 +32,4 @@
 
 2010-08-05 | Zucker 0
 * pre-release for rug-b talk
+

data/Rakefile

@@ -26,10 +26,10 @@ spec = Gem::Specification.new do |s|
   s.name = 'zucker'
   s.version = Zucker::VERSION
   s.date = Zucker::DATE
-  s.authors = ['Based on the thoughts of many people ;)', 'Jan Lelis']
+  s.authors = ['Jan Lelis','and many others']
   s.email = 'mail@janlelis.de'
-  s.summary = "Make your Ruby code even sweeter with syntactic sugar :)
-Adds lots of little helpers that you never want to miss again.
+  s.summary = "Sweeten your Ruby code with this syntactic sugar :).
+Adds a lot of little helpers that you do not want to miss again.
 See http://rubyzucker.info"
   s.homepage = 'http://rubyzucker.info'
   s.files = PKG_FILES.to_a

data/lib/zucker.rb

@@ -1,6 +1,8 @@
+# documentation at http://rubyzucker.info or doc/zucker_doc.html
+
 module Zucker
-  VERSION = '3'
-  DATE    = '2010-08-14'
+  VERSION = '4'
+  DATE    = '2010-09-01' # version 3
 end
 
 # nothing further is done here

data/lib/zucker/aliases.rb

@@ -7,6 +7,11 @@ end
 
 class Array
   alias ** product
+  alias contains? include?
+end
+
+class String
+  alias contains? include?
 end
 
 class Hash
@@ -21,7 +26,7 @@ class Binding
 end
 
 # constants - who would use these in real-world code for other things?
-Infinity = 1.0 / 0.0 # or 2*Float::MAX
+Infinity = 1.0 / 0.0 # or 2*Float::MAX or Float::INFINITY
 NaN      = 0.0 / 0.0
 
 # J-_-L

data/lib/zucker/binding.rb

@@ -4,7 +4,11 @@ class Binding
       if array.empty?
         ' - none'
       else
-        array.map{|e| " - #{e}: #{ self.eval '#{e}'}"}*"\n"
+        array.map{|e|
+          val = self.eval "#{e}"
+          val = val.is_a?( Binding ) ? val.to_s : val.inspect
+          " - #{e}: #{ val }"
+        }.join "\n"
       end
     }
 

data/lib/zucker/debug.rb

@@ -3,4 +3,4 @@ require 'zucker'
 require 'zucker/D'
 require 'zucker/mm'
 require 'zucker/binding'
-
+require 'zucker/q'

data/lib/zucker/default.rb

@@ -9,6 +9,7 @@ array2proc
 blank
 class2proc
 egonil
+engine
 enumerable
 hash
 hash2proc
@@ -18,6 +19,7 @@ ivars
 kernel
 mcopy
 not
+os
 regexp2proc
 sandbox
 square_brackets_for
@@ -25,6 +27,7 @@ string
 tap
 unary
 union
+version
 |
 
 # remove 1.9 if 1.8

data/lib/zucker/engine.rb

@@ -0,0 +1,67 @@
+module RubyEngine
+    # try to guess the interpreter
+    @interpreter = case
+    when RUBY_PLATFORM == 'parrot'
+      'cardinal'
+    when Object.constants.include?( :RUBY_ENGINE ) ||
+         Object.constants.include?( 'RUBY_ENGINE'  )
+      if RUBY_ENGINE == 'ruby'
+        if RUBY_DESCRIPTION =~ /Enterprise/
+          'ree'
+        else
+          'mri'
+        end
+      else
+        RUBY_ENGINE.to_sym # jruby, rbx, ironruby, macruby, etc.
+      end
+    else # probably 1.8
+      'mri'
+    end
+
+  class << self
+    def is?(what)
+      what === @interpreter
+    end
+    alias is is?
+
+    def to_s
+      @interpreter.to_s
+    end
+
+    # ask methods
+
+    def mri?
+      RubyEngine.is? 'mri'
+    end
+    alias official_ruby? mri?
+    alias ruby? mri?
+
+    def jruby?
+      RubyEngine.is? 'jruby'
+    end
+    alias java? jruby?
+
+    def rubinius?
+      RubyEngine.is? 'rbx'
+    end
+    alias rbx? rubinius?
+
+    def ree?
+      RubyEngine.is? 'ree'
+    end
+    alias enterprise? ree?
+
+    def ironruby?
+      RubyEngine.is? 'ironruby'
+    end
+    alias iron_ruby? ironruby?
+
+    def cardinal?
+      RubyEngine.is? 'cardinal'
+    end
+    alias parrot? cardinal?
+    alias perl? cardinal?
+  end
+end
+
+# J-_-L

data/lib/zucker/info.rb

@@ -70,6 +70,10 @@ module Info
     ::RUBY_PLATFORM
   end
 
+  def os
+    RbConfig::CONFIG['host_os']
+  end
+
   def process_id
     $$
   end

data/lib/zucker/kernel.rb

@@ -2,46 +2,23 @@ module Kernel
   def activate_warnings!
     $VERBOSE = true
   end
-  
+
   def deactivate_warnings!
     $VERBOSE = false
   end
-  
+
   def library?
     __FILE__ != $PROGRAM_NAME
   end
-  
+
   def executed_directly?
     __FILE__ == $PROGRAM_NAME
   end
   alias standalone? executed_directly?
-  
+
   def ignore_sigint! # ctrl+c
      Signal.trap *%w|SIGINT IGNORE|
   end
-
-  # version getter  
-  def ruby_1_9?
-    RUBY_VERSION[2,1] == '9'
-  end
-
-  def ruby_1_8?
-    RUBY_VERSION[2,1] == '8'
-  end
-
-  def ruby_1_9!
-    if RUBY_VERSION[2,1] != '9'
-      fail NotImplementedError, "Sorry, this script requires Ruby 1.9, but was executed with a different Ruby version!"
-    end
-    true
-  end
-
-  def ruby_1_8!
-    if RUBY_VERSION[2,1] != '8'
-      fail NotImplementedError, "Sorry, this script requires Ruby 1.8, but was executed with a different Ruby version!"
-    end
-    true
-  end
 end
 
 # J-_-L

data/lib/zucker/os.rb

@@ -0,0 +1,46 @@
+require 'rbconfig'
+
+module OS
+  class << OS
+    def is?(what)
+      what === RbConfig::CONFIG['host_os']
+    end
+    alias is is?
+
+    def to_s
+      RbConfig::CONFIG['host_os']
+    end
+  end
+
+module_function
+
+  def linux?
+    OS.is? /linux|cygwin/
+  end
+
+  def mac?
+    OS.is? /mac|darwin/
+  end
+
+  def bsd?
+    OS.is? /bsd/
+  end
+
+  def windows?
+    OS.is? /mswin|win|mingw/
+  end
+
+  def solaris?
+    OS.is? /solaris|sunos/
+  end
+
+  def posix?
+    linux? or mac? or bsd? or solaris? or Process.respond_to?(:fork)
+  end
+
+  #def symbian?
+    #TODO who knows what symbian returns?
+  #end
+end
+
+# J-_-L

data/lib/zucker/q.rb

@@ -0,0 +1,5 @@
+module Kernel
+  def q(*args)
+    puts args.map( &:inspect ).join '  '
+  end
+end

data/lib/zucker/sandbox.rb

@@ -1,17 +1,19 @@
-def sandbox(rescueblock_or_default=nil)
-  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
+module Kernel
+  def sandbox(rescueblock_or_default=nil)
+    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
-      rescueblock_or_default
+      raise e
     end
-  else
-    raise e
   end
 end
 

data/lib/zucker/string.rb

@@ -1,4 +1,8 @@
 class String
+  def -(rem)
+    gsub( Regexp === rem ? rem : rem.to_s, '' )
+  end
+
   def ^(pos)
     pos = pos.to_i
     if pos >= 0
@@ -9,15 +13,16 @@ class String
   end
 
   def lchomp(arg = $/)
-    self.reverse.chomp(arg).reverse
+    reverse.chomp(arg).reverse
   end
 
   def lchomp!(arg = $/)
-    self.reverse.chomp!(arg).reverse
+    reverse.chomp!(arg).reverse
   end
 
   def ords
-    self.unpack 'C*'
+    unpack 'C*'
+   # bytes.to_a
   end
 
   def constantize(default_value = nil) # always uses global scope as in AS... is this good?

data/lib/zucker/version.rb

@@ -0,0 +1,113 @@
+module RubyVersion
+  class << self
+    def to_s
+      RUBY_VERSION
+    end
+
+    def is?(other_version = nil)
+      compare other_version
+    end
+    alias is is?
+
+    # accessors
+
+    def major
+      RUBY_VERSION.to_i
+    end
+    alias main major
+
+    def minor
+      RUBY_VERSION.split('.')[1].to_i
+    end
+    alias mini minor
+
+    def tiny
+      RUBY_VERSION.split('.')[2].to_i
+    end
+    alias teeny tiny
+
+    def patchlevel
+      RUBY_PATCHLEVEL
+    end
+
+    def platform
+      RUBY_PLATFORM
+    end
+
+    def release_date
+      Date.parse RUBY_RELEASE_DATE
+    end
+    alias date release_date
+
+    def description
+      RUBY_DESCRIPTION
+    end
+
+  private
+
+    def compare(other_version)
+      case other_version
+      when nil
+        matcher
+      when Float
+        other_version == RUBY_VERSION.to_f
+      else
+        other_version.to_s == RUBY_VERSION
+      end
+    end
+
+
+    def matcher
+      return @ruby if @ruby
+
+      @ruby = RUBY_VERSION.dup
+      @ruby.instance_eval do
+        alias below     <
+        alias below?    <
+        alias at_most   <=
+        alias at_most?  <=
+        alias above     >
+        alias above?    >
+        alias at_least  >=
+        alias at_least? >=
+        alias exactly   ==
+        alias exactly?  ==
+        def not(other)
+          self != other
+        end
+        alias not?     not
+        alias between between?
+
+        def newer_than(other)
+          case other.class
+          when Date, Time
+            other.class.parse(RUBY_RELEASE_DATE) > other
+          else
+            RUBY_RELEASE_DATE > other.to_s
+          end
+        end
+        alias newer_than? newer_than
+
+        def older_than(other)
+          case other.class
+          when Date, Time
+            other.class.parse(RUBY_RELEASE_DATE) < other
+          else
+            RUBY_RELEASE_DATE < other.to_s
+          end
+        end
+        alias older_than? older_than
+
+        def released_today
+          RubyVersion.date == Date.today
+        end
+        alias released_today? released_today
+      end
+
+      @ruby.freeze
+    end
+
+  end
+end
+
+# J-_-L

metadata

@@ -3,17 +3,17 @@ name: zucker
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 3
-  version: "3"
+  - 4
+  version: "4"
 platform: ruby
 authors: 
-- Based on the thoughts of many people ;)
 - Jan Lelis
+- and many others
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 +02:00
+date: 2010-09-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -89,9 +89,12 @@ files:
 - lib/zucker/1/mcopy.rb
 - lib/zucker/1/debug.rb
 - lib/zucker/1/sandbox.rb
+- lib/zucker/os.rb
 - lib/zucker/array.rb
+- lib/zucker/engine.rb
 - lib/zucker/all.rb
 - lib/zucker/array2proc.rb
+- lib/zucker/q.rb
 - lib/zucker/default.rb
 - lib/zucker/D.rb
 - lib/zucker/string.rb
@@ -132,6 +135,7 @@ files:
 - lib/zucker/2/sandbox.rb
 - lib/zucker/regexp2proc.rb
 - lib/zucker/square_brackets_for.rb
+- lib/zucker/version.rb
 - lib/zucker/aliases.rb
 - lib/zucker/mm.rb
 - lib/zucker/enumerable.rb
@@ -173,6 +177,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Make your Ruby code even sweeter with syntactic sugar :) Adds lots of little helpers that you never want to miss again. See http://rubyzucker.info
+summary: Sweeten your Ruby code with this syntactic sugar :). Adds a lot of little helpers that you do not want to miss again. See http://rubyzucker.info
 test_files: []