epitools 0.5.51 → 0.5.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4080136a8e85e82ad9f3013e5e83c1222b3a820
-  data.tar.gz: 0b0ab04564fc8cfc3843dd1597ec20be6251d485
+  metadata.gz: fcddb5cf0745cf3cbedb55debe44c07d22447cdb
+  data.tar.gz: 8bdb45f8597932ab24e74624932257d6674c9199
 SHA512:
-  metadata.gz: 9ace65895484af23d118109ea0ef2fe434e0793096616e936e3d4f2fb8f1e41891ca5e2f84a447db911f63e265e2391b22db2b06d9d74952ebfaa9ecb1d18e90
-  data.tar.gz: bfb16df6b8f7f4d6feed1d6f56f8d1a8ddf1208bf29e960a2e0b677e87688de43817af39845881c4d715e8d432bb8930122df243abab06544e3cfd1641dda572
+  metadata.gz: dbee97e02411f51380fbc21ba849d257a0bbb44eb932b72e22ac9d9610db4d9183ca4a3179919d85b5e61375900cf736d81549390278d0d4d2c3ce4ccad12fe3
+  data.tar.gz: ed5a46223323cadb816d17ef137a176a0429c4637d225efcca647adecd5f3357e7e000c44f9aa1cfaf9dbdc253d4e6aa21d33eab9d4c4d89e61206c9dc162b09

data/README.rdoc

@@ -12,7 +12,7 @@ Enhanced base classes: {Enumerable}[http://rdoc.info/github/epitron/epitools/mas
 
 Extras:
 
-* {Path}[http://rdoc.info/github/epitron/epitools/master/Path] (a better Pathname)
+* {Path}[http://rdoc.info/github/epitron/epitools/master/Path] (an object-oriented interface to the filessytem -- like File, Dir, Pathname, and FileUtils all rolled into one)
 * {TypedStruct}[http://rdoc.info/github/epitron/epitools/master/TypedStruct] (like Struct, but setters always coerce input to a certain type, eg: boolean, integer, etc.)
 * {WM}[http://rdoc.info/github/epitron/epitools/master/WM] (control/query desktop windows in X. Note: `wmctrl` must be installed)
 * {Sys}[http://rdoc.info/github/epitron/epitools/master/Sys] (system tools -- determine operating system, list processes, view network statistics, etc.)

data/VERSION

@@ -1 +1 @@
-0.5.51
+0.5.54

data/lib/epitools/core_ext/hash.rb

@@ -109,6 +109,23 @@ class Hash
     new(0)
   end
 
+  #
+  # Returns a new Hash which automatically assigns each unique key to an increasing counter.
+  #
+  # eg:
+  #   > h = Hash.of_unique_ids
+  #   => {}
+  #   > h["Person"]               #=> 0
+  #   > h["Another Person"]       #=> 1
+  #   > h["Yet Another Person"]   #=> 2
+  #   > h["Person"]               #=> 0
+  #   > h
+  #   => {"Person"=>0, "Another Person"=>1, "Yet Another Person"=>2}
+  #
+  def self.of_unique_ids
+    new { |h,k| h[k] = h.size }
+  end
+
   #
   # Hash keys become methods, kinda like OpenStruct. These methods have the lowest priority,
   # so be careful. They will be overridden by any methods on Hash.
@@ -155,7 +172,7 @@ class Hash
     result = []
     dent = indent * level
     each do |key, val|
-      result << dent+key
+      result << dent+key.to_s
       result += val.tree(level+1) if val.any?
     end
     result
@@ -164,9 +181,13 @@ class Hash
   #
   # Print the result of `tree`
   #
-  def print_tree
-    tree.each { |row| puts row }
-    nil
+  def print_tree(level=0, indent="  ", &block)
+    dent = indent * level
+
+    each do |key, val|
+      puts block_given? ? yield(key, level) : "#{dent}#{key}"
+      val.print_tree(level+1, indent, &block) if val.any?
+    end
   end  
   
   #

data/lib/epitools/path.rb

@@ -844,6 +844,11 @@ class Path
     dest
   end
 
+  def cp(dest)
+    FileUtils.cp(path, dest)
+    dest
+  end
+
   def ln_s(dest)
     dest = Path[dest]
     FileUtils.ln_s(self, dest)

data/lib/epitools/term.rb

@@ -87,6 +87,12 @@ module Term
       @columns  = options[:columns]
       @padding  = options[:padding] || 1
 
+      if (options.keys & [:horiz, :horizontal, :horizontally]).any?
+        @direction = :horizontal
+      else
+        @direction = :vertical
+      end
+
       # Update the terminal size
       @width, @height = Term.size
     end
@@ -129,15 +135,26 @@ module Term
       elems
     end
 
-    def by_columns
+    def in_columns
       return '' if @data.empty?
       render sliced_into(num_rows).transpose
     end
+    alias_method :by_columns, :in_columns
 
-    def by_rows
+    def in_rows
       return '' if @data.empty?
       render sliced_into(num_columns)
     end
+    alias_method :by_rows, :in_rows
+
+    def display #(opts={})
+      case @direction
+      when :horizontal
+        puts in_rows
+      when :vertical
+        puts in_columns
+      end
+    end
 
     def to_s
       by_rows

data/lib/epitools/wm.rb

@@ -102,17 +102,8 @@ module WM
     end
 
     def activate!
-      system "wmctrl", "-i", "-a", window_id
-    end
-
-    #
-    # string is made up of regular text, plus <>'d keypresses
-    # eg: "Hello<Ctrl-T><Ctrl-L><Ctrl-Shift-K><Return>!!!"
-    #
-    # TODO: add `xdotool` support
-    #
-    def send_keys(keys)
-      xse(keys)
+      #system "wmctrl", "-i", "-a", window_id
+      system "xdotool", "windowactivate", window_id
     end
 
     #
@@ -318,9 +309,9 @@ module WM
     # thorn                         0x00fe  /* U+00FE LATIN SMALL LETTER THORN */
     # ydiaeresis                    0x00ff  /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
     #
-    def keys_to_events(keys)
 
-      keymap = {
+    if Path.which("xdotool")
+      KEYMAP = {
         "`" => "grave",
         " " => "space",
         "~" => "asciitilde",
@@ -329,71 +320,45 @@ module WM
         '"' => "quotedbl",
       }
 
-      tokens = keys.scan(/(<[^>]+>|.+?)/)
+      def string_to_keys(s)
 
-      tokens.flatten.map do |key|
-        mods = []
+        tokens = s.scan(/(<[^>]+>|.)/).flatten
 
-        if key =~ /^<(.+)>$/
-
-          specials = $1.split("-")
-          key = specials.pop
-
-          key.downcase! if key =~ /^[A-Z]$/
-
-          specials.each do |special|
-            if special =~ /^(Ctrl|Shift|Alt)$/i
-              mods << $1
-            else
-              raise "Error: unknown modifier #{special}"
-            end
+        tokens.map do |token|
+          if token =~ /^<(.+)>$/
+            mods = $1.split(/[-+]/)
+            key  = mods.pop
+            # mods.each { |mod| raise "Error: unknown modifier #{mod}" unless mod =~ /^(Ctrl|Shift|Alt)$/i }
+          else
+            mods = []
+            key  = token
           end
 
-        end
-
-        mods << "Shift" if key =~ /^[A-Z\~\!\@\#\$\%\^\&\*\(\)\_\+]$/
+          if key =~ /^[A-Z0-9]$/i or key.size > 1
+            # key is good!
+          else
+            key = KEYMAP[key] || ("0x%x" % key.ord)
+          end
 
-        if key =~ /^[A-Z0-9]$/i or key.size > 1
-          keyname = key
-        else
-          keyname = keymap[key] || ("0x%x" % key.ord)
+          [*mods, key].join("+")
         end
-
-        "#{mods.join(" ")}<Key>#{keyname}"
       end
-    end
-
-    def xdotool_keys(keys)
-      # --window windowid
-      #    Send keystrokes to a specific window id. See "SENDEVENT NOTES" below. The default, if no
-      #    window is given, depends on the window stack. If the window stack is empty the current
-      #    window is typed at using XTEST. Otherwise, the default is "%1" (see "WINDOW STACK").
-
-      # --delay milliseconds
-      #    Delay between keystrokes. Default is 12ms.
-
-      # --clearmodifiers
-      #    Clear modifiers before sending keystrokes. See CLEARMODIFIERS below.
-      # xdotool key k1 k2 k3
-      # xdotool type string
-    end
-
-    def xse(keys)
-      temp   = Tempfile.new("xse")
-      events = keys_to_events(keys)
-
-      # p events
-      eventstring = events.map { |e| e + "\n" }.join("")
-
-      temp.write eventstring 
-      temp.flush
-      temp.seek 0
-      # p [:temp, temp.read]
 
-      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?)"
+      #
+      # Send keypresses to this window, using xdotool.
+      # (`delay` specifies how long to pause between each keystroke, default: 12ms)
+      #
+      # Examples:
+      #   > window.send_keys("Hello Everybo<Ctrl-W>World!<Return>!!!")
+      #   > browser.send_keys("<Ctrl-T>http://google.com/<Return>")
+      #
+      def send_keys(keystring, delay=nil)
+        keys = string_to_keys(keystring)
+        cmd  = ["xdotool", "key", "--clearmodifiers", "--window", window_id] 
+        cmd += ["--delay", delay.to_s] if delay
+        cmd += keys
+
+        system(*cmd)
       end
     end
 

data/spec/wm_spec.rb

@@ -12,7 +12,7 @@ describe WM do
   end    
 
   def to_events(keys)
-  	WM::Window.new.keys_to_events(keys)
+    WM::Window.new.keys_to_events(keys)
   end
 
   it "parses X keys-string" do
@@ -24,8 +24,8 @@ describe WM do
   end
 
   it "sends keys to this window" do
-	sublime_window = WM.current_desktop.windows.select{|w| w.title =~ /wm_spec\.rb.+Sublime/ }.first
-	sublime_window.send_keys('<Ctrl-`>print "Hello from send_keys()!"<Return>')
+  	sublime_window = WM.current_desktop.windows.select{|w| w.title =~ /wm_spec\.rb.+Sublime/ }.first
+  	sublime_window.send_keys('<Ctrl-`>print("Hello from send_keys()!")<Return>')
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.51
+  version: 0.5.54
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -99,7 +99,6 @@ files:
 - spec/permutations_spec.rb
 - spec/rash_spec.rb
 - spec/ratio_spec.rb
-- spec/spec_helper.rb
 - spec/sys_spec.rb
 - spec/term_spec.rb
 - spec/typed_struct_spec.rb
@@ -130,3 +129,4 @@ signing_key:
 specification_version: 3
 summary: Not utils... METILS!
 test_files: []
+has_rdoc: 

data/spec/spec_helper.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'spork'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'epitools'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-p $:
-
-
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However, 
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-  
-  require 'rspec'
-  require 'epitools'
-
-  Rspec.configure do |c|
-    c.mock_with :rspec
-  end
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  
-end
-
-# --- Instructions ---
-# - Sort through your spec_helper file. Place as much environment loading 
-#   code that you don't normally modify during development in the 
-#   Spork.prefork block.
-# - Place the rest under Spork.each_run block
-# - Any code that is left outside of the blocks will be ran during preforking
-#   and during each_run!
-# - These instructions should self-destruct in 10 seconds.  If they don't,
-#   feel free to delete them.
-#
-
-
-
-
-
-