epitools 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "epitools"
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = "2012-07-08"
+  s.date = "2012-07-09"
   s.description = "Miscellaneous utility libraries to make my life easier."
   s.email = "chris@ill-logic.com"
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/epitools/core_ext/array.rb",
     "lib/epitools/core_ext/enumerable.rb",
     "lib/epitools/core_ext/hash.rb",
+    "lib/epitools/core_ext/misc.rb",
     "lib/epitools/core_ext/numbers.rb",
     "lib/epitools/core_ext/object.rb",
     "lib/epitools/core_ext/string.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/epitools/lcs.rb",
     "lib/epitools/mimemagic.rb",
     "lib/epitools/mimemagic_tables.rb",
+    "lib/epitools/minimal.rb",
     "lib/epitools/niceprint.rb",
     "lib/epitools/numwords.rb",
     "lib/epitools/path.rb",

data/lib/epitools.rb

@@ -1,120 +1,7 @@
 require 'pp'
+require File.join(File.dirname(__FILE__), "epitools", "minimal")
 
-class Object
-
-  unless defined?(__DIR__)
-    # 
-    # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
-    # (taken from Michael Fellinger's Ramaze... thanx, dood! :D)
-    #
-    def __DIR__(*args)
-      filename = caller[0][/^(.*):/, 1]
-      dir = File.expand_path(File.dirname(filename))
-      ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
-    end
-  end
-  
-  #
-  # 'autoreq' is a replacement for autoload that can load gems.
-  #
-  # Usage:
-  #    autoreq :Constant, 'thing-to-require'
-  #    autoreq :Constant, 'thing-to-require'
-  #    autoreq :OtherConstant do
-  #      gem 'somegem', '~> 1.2'
-  #      require 'somegem'
-  #    end
-  #
-  def autoreq(const, path=nil, &block)
-    raise "Error: autoreq must be supplied with a file to load, or a block." unless !!path ^ block_given?
-    
-    if block_given?
-      Module.autoreqs[const] = block
-    else
-      Module.autoreqs[const] = path
-    end
-  end
-
-  #
-  # Remove an object, method, constant, etc.
-  #
-  def del(x)
-    case x
-      when String
-        del(x.to_sym)
-      when Class, Module
-        Object.send(:remove_const, x.name)
-      when Method
-        x.owner.send(:undef_method, x.name)
-      when Symbol
-        if Object.const_get(x)
-          Object.send(:remove_const, x)
-        elsif method(x)
-          undef_method x
-        end
-      else
-        raise "Error: don't know how to 'del #{x.inspect}'"
-    end
-  end
-  
-  # The hidden singleton lurks behind everyone
-  def metaclass
-    class << self
-      self
-    end
-  end
-
-  def meta_eval &blk
-    metaclass.instance_eval &blk
-  end
-
-  # Adds methods to a metaclass
-  def meta_def name, &blk
-    meta_eval { define_method name, &blk }
-  end
-
-  # Defines an instance method within a class
-  def class_def name, &blk
-    class_eval { define_method name, &blk }
-  end
-
-end
-
-#
-# Patch 'Module#const_missing' to support 'autoreq' (which can autoload gems)
-#
-class Module
-
-  @@autoreq_is_searching_for = nil
-  
-  alias const_missing_without_autoreq const_missing
-  
-  def const_missing(const)
-    return if const == @@autoreq_is_searching_for
-    
-    if thing = autoreqs[const]
-      case thing
-      when String, Symbol
-        require thing
-      when Proc
-        Object.class_eval(&thing)
-      else
-        raise "Error: Don't know how to autoload a #{thing.class}: #{thing.inspect}"
-      end
-    end
-    
-    @@autoreq_is_searching_for = const
-    const_get(const) || const_missing_without_autoreq(const)
-  end
-  
-  def autoreqs
-    @@autoreqs ||= {}
-  end
-  
-end
-
-
-## Pretty error messages
+## Pretty loading messages
 require_wrapper = proc do |mod|
   #p [:loading, mod]
   begin
@@ -128,7 +15,6 @@ end
 # Make all the modules autoload, and require all the monkeypatches
 #
 %w[
-  autoloads
   core_ext 
   zopen
   colored

data/lib/epitools/core_ext.rb

@@ -1,32 +1,6 @@
 require 'epitools'
 
-## Alias "Enumerator" to "Enum"
-
-if RUBY_VERSION["1.8"]
-  require 'enumerator'
-  Enumerator = Enumerable::Enumerator unless defined? Enumerator
-end
-
-unless defined? Enum
-  if defined? Enumerator
-    Enum = Enumerator
-  else
-    $stderr.puts "WARNING: Couldn't find the Enumerator class. Enum will not be available."
-  end
-end
-
-RbConfig = Config unless defined? RbConfig
-
-
-class Object
-  #
-  # Slightly gross hack to add a class method.
-  #
-  def self.alias_class_method(dest, src)
-    metaclass.send(:alias_method, dest, src)
-  end
-
-end
+##############################################################################
 
 require 'epitools/core_ext/object'
 require 'epitools/core_ext/string'
@@ -35,223 +9,7 @@ require 'epitools/core_ext/enumerable'
 require 'epitools/core_ext/hash'
 require 'epitools/core_ext/numbers'
 require 'epitools/core_ext/truthiness'
+require 'epitools/core_ext/misc'
 
+##############################################################################
 
-class MatchData
-
-  #
-  # Return a hash of named matches
-  #
-  def to_hash
-    Hash[ names.zip(captures) ]
-  end
-
-end
-
-
-class Binding
-
-  #
-  # Get a variables in this binding
-  #
-  def [](key)
-    eval(key.to_s)
-  end
-
-  #
-  # Set a variable in this binding
-  #
-  def []=(key, val)
-    Thread.current[:_alter_binding_local_] = val
-    eval("#{key} = Thread.current[:_alter_binding_local_]")
-    Thread.current[:_alter_binding_local_] = nil
-  end
-
-  #
-  # Return all the local variables in the binding
-  #
-  def local_variables
-    eval("local_variables")
-  end
-  alias_method :keys, :local_variables
-
-end
-
-
-class Proc
-
-  #
-  # Chain two procs together, returning a new proc. Each proc is executed one after the other,
-  # with the same input arguments. The return value is an array of all the procs' return values.
-  #
-  # You can use either the .join method, or the overloaded & operator.
-  #
-  # Examples:
-  #   joined = proc1 & proc2
-  #   joined = proc1.join proc2
-  #   newproc = proc { 1 } & proc { 2 }
-  #   newproc.call #=> [1, 2]
-  #
-  def join(other=nil, &block)
-    other ||= block
-    proc { |*args| [self.call(*args), other.call(*args)] }
-  end
-  alias_method :&, :join
-
-  #
-  # Chains two procs together, returning a new proc. The output from each proc is passed into
-  # the input of the next one.
-  #
-  # Example:
-  #   chain = proc { 1 } | proc { |input| input + 1 }
-  #   chain.call #=> 2
-  #
-  def chain(other=nil, &block)
-    other ||= block
-    proc { |*args| other.call( self.call(*args) ) }
-  end
-  alias_method :|, :chain
-
-end
-
-
-unless defined?(BasicObject)
-  #
-  # Backported BasicObject for Ruby 1.8
-  #
-  class BasicObject
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-  end
-end
-
-
-
-class Object
-
-  #
-  # Negates a boolean, chained-method style.
-  #
-  # Example:
-  #   >> 10.even?
-  #   => true
-  #   >> 10.not.even?
-  #   => false
-  #
-  def not
-    NotWrapper.new(self)
-  end
-
-end
-
-class NotWrapper < BasicObject # :nodoc:
-  def initialize(orig)
-    @orig = orig
-  end
-
-  def inspect
-    "{NOT #{@orig.inspect}}"
-  end
-
-  def is_a?(other)
-    other === self
-  end
-
-  def method_missing(meth, *args, &block)
-    result = @orig.send(meth, *args, &block)
-    if result.is_a? ::TrueClass or result.is_a? ::FalseClass
-      !result
-    else
-      raise "Sorry, I don't know how to invert #{result.inspect}"
-    end
-  end
-end
-
-
-
-unless IO.respond_to? :copy_stream
-
-  class IO
-
-    #
-    # IO.copy_stream backport
-    #
-    def self.copy_stream(input, output)
-      while chunk = input.read(8192)
-        output.write(chunk)
-      end
-    end
-
-  end
-
-end
-
-
-class Range
-
-  #
-  # Pick a random number from the range.
-  #
-  def rand
-    Kernel.rand(self)
-  end
-
-end
-
-
-class Struct
-
-  #
-  # Transform this struct into a JSON hash
-  #
-  def to_hash
-    hash = {}
-    each_pair { |k,v| hash[k] = v }
-    hash
-  end
-
-  #
-  # Transform the struct into a simple JSON hash.
-  #
-  def to_json(*args)
-    to_hash.to_json
-  end
-
-end
-
-
-module URI
-
-  #
-  # Return a Hash of the variables in the query string
-  #
-  def params
-    query.to_params
-  end
-
-end
-
-
-class Time
-
-  #
-  # Which "quarter" of the year does this date fall into?
-  #
-  def quarter
-    (month / 3.0).ceil
-  end
-
-end
-
-
-#
-# Give ObjectSpace Enumerable powers (select, map, etc.)
-#
-module ObjectSpace
-
-  include Enumerable
-
-  alias_method :each, :each_object
-
-  extend self
-
-end

data/lib/epitools/core_ext/misc.rb

@@ -0,0 +1,224 @@
+class MatchData
+
+  #
+  # Return a hash of named matches
+  #
+  def to_hash
+    Hash[ names.zip(captures) ]
+  end
+
+end
+
+class Binding
+
+  #
+  # Get a variables in this binding
+  #
+  def [](key)
+    eval(key.to_s)
+  end
+
+  #
+  # Set a variable in this binding
+  #
+  def []=(key, val)
+    Thread.current[:_alter_binding_local_] = val
+    eval("#{key} = Thread.current[:_alter_binding_local_]")
+    Thread.current[:_alter_binding_local_] = nil
+  end
+
+  #
+  # Return all the local variables in the binding
+  #
+  def local_variables
+    eval("local_variables")
+  end
+  alias_method :keys, :local_variables
+
+end
+
+
+
+class Proc
+
+  #
+  # Chain two procs together, returning a new proc. Each proc is executed one after the other,
+  # with the same input arguments. The return value is an array of all the procs' return values.
+  #
+  # You can use either the .join method, or the overloaded & operator.
+  #
+  # Examples:
+  #   joined = proc1 & proc2
+  #   joined = proc1.join proc2
+  #   newproc = proc { 1 } & proc { 2 }
+  #   newproc.call #=> [1, 2]
+  #
+  def join(other=nil, &block)
+    other ||= block
+    proc { |*args| [self.call(*args), other.call(*args)] }
+  end
+  alias_method :&, :join
+
+  #
+  # Chains two procs together, returning a new proc. The output from each proc is passed into
+  # the input of the next one.
+  #
+  # Example:
+  #   chain = proc { 1 } | proc { |input| input + 1 }
+  #   chain.call #=> 2
+  #
+  def chain(other=nil, &block)
+    other ||= block
+    proc { |*args| other.call( self.call(*args) ) }
+  end
+  alias_method :|, :chain
+
+end
+
+
+
+unless defined?(BasicObject)
+  #
+  # Backported BasicObject for Ruby 1.8
+  #
+  class BasicObject
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+  end
+end
+
+
+
+class Object
+
+  #
+  # Negates a boolean, chained-method style.
+  #
+  # Example:
+  #   >> 10.even?
+  #   => true
+  #   >> 10.not.even?
+  #   => false
+  #
+  def not
+    NotWrapper.new(self)
+  end
+
+end
+
+class NotWrapper < BasicObject # :nodoc:
+  def initialize(orig)
+    @orig = orig
+  end
+
+  def inspect
+    "{NOT #{@orig.inspect}}"
+  end
+
+  def is_a?(other)
+    other === self
+  end
+
+  def method_missing(meth, *args, &block)
+    result = @orig.send(meth, *args, &block)
+    if result.is_a? ::TrueClass or result.is_a? ::FalseClass
+      !result
+    else
+      raise "Sorry, I don't know how to invert #{result.inspect}"
+    end
+  end
+end
+
+
+
+unless IO.respond_to? :copy_stream
+
+  class IO
+
+    #
+    # IO.copy_stream backport
+    #
+    def self.copy_stream(input, output)
+      while chunk = input.read(8192)
+        output.write(chunk)
+      end
+    end
+
+  end
+
+end
+
+
+
+class Range
+
+  #
+  # Pick a random number from the range.
+  #
+  def rand
+    Kernel.rand(self)
+  end
+
+end
+
+
+
+class Struct
+
+  #
+  # Transform this struct into a JSON hash
+  #
+  def to_hash
+    hash = {}
+    each_pair { |k,v| hash[k] = v }
+    hash
+  end
+
+  #
+  # Transform the struct into a simple JSON hash.
+  #
+  def to_json(*args)
+    to_hash.to_json
+  end
+
+end
+
+
+
+module URI
+
+  #
+  # Return a Hash of the variables in the query string
+  #
+  def params
+    query.to_params
+  end
+
+end
+
+
+
+class Time
+
+  #
+  # Which "quarter" of the year does this date fall into?
+  #
+  def quarter
+    (month / 3.0).ceil
+  end
+
+end
+
+
+
+#
+# Give ObjectSpace Enumerable powers (select, map, etc.)
+#
+module ObjectSpace
+
+  include Enumerable
+
+  alias_method :each, :each_object
+
+  extend self
+
+end

data/lib/epitools/minimal.rb

@@ -0,0 +1,143 @@
+# Alias "Enumerator" to "Enum"
+if RUBY_VERSION["1.8"]
+  require 'enumerator'
+  Enumerator = Enumerable::Enumerator unless defined? Enumerator
+end
+
+unless defined? Enum
+  if defined? Enumerator
+    Enum = Enumerator
+  else
+    $stderr.puts "WARNING: Couldn't find the Enumerator class. Enum will not be available."
+  end
+end
+
+RbConfig = Config unless defined? RbConfig
+
+
+class Object
+
+  unless defined?(__DIR__)
+    # 
+    # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
+    # (taken from Michael Fellinger's Ramaze... thanx, dood! :D)
+    #
+    def __DIR__(*args)
+      filename = caller[0][/^(.*):/, 1]
+      dir = File.expand_path(File.dirname(filename))
+      ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
+    end
+  end
+  
+  #
+  # 'autoreq' is a replacement for autoload that can load gems.
+  #
+  # Usage:
+  #    autoreq :Constant, 'thing-to-require'
+  #    autoreq :Constant, 'thing-to-require'
+  #    autoreq :OtherConstant do
+  #      gem 'somegem', '~> 1.2'
+  #      require 'somegem'
+  #    end
+  #
+  def autoreq(const, path=nil, &block)
+    raise "Error: autoreq must be supplied with a file to load, or a block." unless !!path ^ block_given?
+    
+    if block_given?
+      Module.autoreqs[const] = block
+    else
+      Module.autoreqs[const] = path
+    end
+  end
+
+  #
+  # Remove an object, method, constant, etc.
+  #
+  def del(x)
+    case x
+      when String
+        del(x.to_sym)
+      when Class, Module
+        Object.send(:remove_const, x.name)
+      when Method
+        x.owner.send(:undef_method, x.name)
+      when Symbol
+        if Object.const_get(x)
+          Object.send(:remove_const, x)
+        elsif method(x)
+          undef_method x
+        end
+      else
+        raise "Error: don't know how to 'del #{x.inspect}'"
+    end
+  end
+  
+  # The hidden singleton lurks behind everyone
+  def metaclass
+    class << self
+      self
+    end
+  end
+
+  def meta_eval &blk
+    metaclass.instance_eval &blk
+  end
+
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+
+  #
+  # Slightly gross hack to add a class method.
+  #
+  def self.alias_class_method(dest, src)
+    metaclass.send(:alias_method, dest, src)
+  end
+
+end
+
+#
+# Patch 'Module#const_missing' to support 'autoreq' (which can autoload gems)
+#
+class Module
+
+  @@autoreq_is_searching_for = nil
+  
+  alias const_missing_without_autoreq const_missing
+  
+  def const_missing(const)
+    return if const == @@autoreq_is_searching_for
+    
+    if thing = autoreqs[const]
+      case thing
+      when String, Symbol
+        require thing
+      when Proc
+        Object.class_eval(&thing)
+      else
+        raise "Error: Don't know how to autoload a #{thing.class}: #{thing.inspect}"
+      end
+    end
+    
+    @@autoreq_is_searching_for = const
+    const_get(const) || const_missing_without_autoreq(const)
+  end
+  
+  def autoreqs
+    @@autoreqs ||= {}
+  end
+  
+end
+
+
+####################################################################
+
+require 'epitools/autoloads'
+
+####################################################################

data/lib/epitools/path.rb

@@ -5,7 +5,9 @@
 #   tmp bugs
 #
 
-require 'epitools'
+require 'epitools/minimal'
+require 'epitools/core_ext/enumerable'
+require 'epitools/core_ext/string'
 
 #
 # Path: An object-oriented wrapper for files. (Combines useful methods from FileUtils, File, Dir, and more!)

data/lib/epitools/sys.rb

@@ -1,4 +1,4 @@
-require 'epitools'
+require 'epitools/minimal'
 
 #
 # Cross-platform operating system functions.

data/lib/epitools/typed_struct.rb

@@ -1,5 +1,10 @@
 #
+# Like a Stuct, but automatically casts input to specific types.
 #
+# Example:
+#
+#   class SomeRecord < TypedStruct["some_id:int amount:float x:string a,b,c:bool"]; end
+#   record = SomeRecord.new(69, 12348.871, "stringy", true, 1, "no")
 #
 class TypedStruct < Struct
 
@@ -11,11 +16,12 @@ class TypedStruct < Struct
   # A perhaps-too-clever table of { "typename" => convert_proc } mappings.
   #
   CONVERTERS = Hash[ *{
-
-    ["str", "string"]  => :passthru,
-    ["int", "integer"] => proc { |me| me.to_i },
-    ["hex"]            => proc { |me| me.to_i(16) },
-    ["bool", "boolean"] => proc { |me| 
+    ["str", "string"]            => :passthru,
+    ["int", "integer"]           => proc { |me| me.to_i },
+    ["hex"]                      => proc { |me| me.to_i(16) },
+    ["date", "time", "datetime"] => proc { |me| DateTime.parse me },
+    ["timestamp"]                => proc { |me| Time.at me },
+    ["bool", "boolean"]          => proc do |me| 
       case me
       when false, 0, "0", "off", "no",  "false", nil
         false
@@ -24,10 +30,7 @@ class TypedStruct < Struct
       else
         raise "Invalid boolean type: #{me.inspect}"
       end
-    },
-    ["date", "time", "datetime"] => proc { |me| DateTime.parse me },
-    ["timestamp"] => proc { |me| Time.at me },
-
+    end
   }.map { |names, converter| names.map { |n| [n, converter] } }.flatten ]
 
   #

data/lib/epitools/wm.rb

@@ -1,3 +1,6 @@
+require 'epitools/path'
+require 'epitools/typed_struct'
+
 module WM
 
   raise "Error: wmctrl not found." unless Path.which("wmctrl")
@@ -332,8 +335,10 @@ module WM
           specials = $1.split("-")
           key = specials.pop
 
+          key.downcase! if key =~ /^[A-Z]$/
+
           specials.each do |special|
-            if special =~ /^(Ctrl|Shift|Alt)$/
+            if special =~ /^(Ctrl|Shift|Alt)$/i
               mods << $1
             else
               raise "Error: unknown modifier #{special}"
@@ -363,8 +368,12 @@ module WM
 
       temp.write eventstring 
       temp.flush
+      temp.seek 0
+      p [:temp, temp.read]
 
-      unless system("xse", "-window", window_id, "-file", temp.path)
+      cmd = "xse", "-window", window_id, "-file", temp.path
+      p [:cmd, cmd]
+      unless system(*cmd)
         raise "Error: couldn't send key commands to 'xse'. (Is xsendevents installed?)"
       end
     end

data/spec/autoreq_spec.rb

@@ -1,4 +1,4 @@
-require 'epitools'
+require 'epitools/minimal'
 
 describe "autoreq" do
 

data/spec/path_spec.rb

@@ -288,7 +288,7 @@ describe Path do
     Path.which("ruby").should_not be_nil
     Path.which("asdfasdfhkajlsdhfkljashdf").should be_nil
     Path.which("ruby").class.should == Path
-    Path.which("gzip", "ls", "rm").should == ["/bin/gzip", "/bin/ls", "/bin/rm"]
+    Path.which("cat", "ls", "rm").should == ["/bin/cat", "/bin/ls", "/bin/rm"]
   end
 
   it "Path[]s another path" do

data/spec/wm_spec.rb

@@ -11,9 +11,16 @@ describe WM do
     WM.current_desktop.nil? == false
   end    
 
+  def to_events(keys)
+  	WM::Window.new.keys_to_events(keys)
+  end
+
   it "parses X keys-string" do
-  	events = WM::Window.new.keys_to_events "Hello<Ctrl-T><Ctrl-L><Return>!!!"
-  	events.should == ["<Shift><Key>H", "<Key>e", "<Key>l", "<Key>l", "<Key>o", "Ctrl<Key>T", "Ctrl<Key>L", "<Key>Return", "<Shift><Key>!", "<Shift><Key>!", "<Shift><Key>!"]
+  	events = to_events "Hello<Ctrl-T><Ctrl-L><Return>!!!"
+  	events.should == ["Shift<Key>H", "<Key>e", "<Key>l", "<Key>l", "<Key>o", "Ctrl<Key>t", "Ctrl<Key>l", "<Key>Return", "Shift<Key>0x21", "Shift<Key>0x21", "Shift<Key>0x21"]
+  end
+
+  it "handles something weird" do
   end
 
   it "sends keys to this window" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -87,6 +87,7 @@ files:
 - lib/epitools/core_ext/array.rb
 - lib/epitools/core_ext/enumerable.rb
 - lib/epitools/core_ext/hash.rb
+- lib/epitools/core_ext/misc.rb
 - lib/epitools/core_ext/numbers.rb
 - lib/epitools/core_ext/object.rb
 - lib/epitools/core_ext/string.rb
@@ -98,6 +99,7 @@ files:
 - lib/epitools/lcs.rb
 - lib/epitools/mimemagic.rb
 - lib/epitools/mimemagic_tables.rb
+- lib/epitools/minimal.rb
 - lib/epitools/niceprint.rb
 - lib/epitools/numwords.rb
 - lib/epitools/path.rb