epitools 0.5.73 → 0.5.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec37ccba9b3b090251f5a096ed57ef7ee4c4e769
-  data.tar.gz: 9abd4684561e30e28bb23094fd2606e9ef1d8a24
+  metadata.gz: aa961c91eff30c2d7caa3240c9e13c3357f56ccb
+  data.tar.gz: 9cb7a50ae1a80cd54305c1c182fa45d1d576f0f6
 SHA512:
-  metadata.gz: 80a9d929bd6fda00c1fa766af8cee4ebbbfc92dc0fba752c772976ed412c3a5fa1707f64944ebdb5bb2ff1ccb2f7977a9c00b5ddaaddc7de272ad796f6f3c1a4
-  data.tar.gz: c2d51d16d96359830af2ea2532708ed6362dff0b60610a709641e66d6718dcfadfafb6f28ba06ce7b4f7dde23bc6ad67fb8b741e04eb0e91cfc24cb3a160dcbe
+  metadata.gz: 9e51e7eed16a96a82c2ae58589152623157d069f5e7fa096a14985b2cc5a2fb7960ecf3e10ca183ed55c953efd85f3cd414218d514de8800055387fe01b6cf66
+  data.tar.gz: 31a6dbe284c4c0544a093ce2d2937ca8751bf9f71e241911e0ca65e3536ed2fca4216dd20b42021b7e714190d930465fdc86ccc10a462a2d69ebb940c71df08c

data/VERSION

@@ -1 +1 @@
-0.5.73
+0.5.74

data/lib/epitools/autoloads.rb

@@ -27,6 +27,16 @@ module Digest
   autoload :MD5,      'digest/md5'
 end
 
+# Network Sockets
+['IP', 'Basic', 'TCP', 'UDP', 'UNIX', ''].each do |type|
+  autoload :"#{type}Socket", 'socket'
+end
+
+# Network Servers
+['TCP', 'UNIX'].each do |type|
+  autoload :"#{type}Server", 'socket'
+end
+
 if RUBY_VERSION["1.8.7"]
   autoload :Prime,      'mathn'
 else
@@ -58,6 +68,7 @@ autoreq  :Mechanize,    'mechanize'
 autoreq  :ANSI,         'ansi'
 autoreq  :BSON,         'bson'
 autoreq  :JSON,         'json'
+autoreq  :GeoIP,        'geoip'
 
 autoreq :AwesomePrint do
   require 'awesome_print'
@@ -68,19 +79,6 @@ autoreq :AwesomePrint do
   end
 end
 
-## Network stuff
-
-# Sockets
-['IP', 'Basic', 'TCP', 'UDP', 'UNIX', ''].each do |type|
-  autoload :"#{type}Socket", 'socket'
-end
-
-# Servers
-['TCP', 'UNIX'].each do |type|
-  autoload :"#{type}Server", 'socket'
-end
-
-
 ## YAML hacks (sometimes the module is loaded improperly)
 
 if defined? YAML and not defined? YAML.parse

data/lib/epitools/clitools.rb

@@ -169,3 +169,25 @@ def sudoifnotroot
     exit system("sudo", $PROGRAM_NAME, *ARGV)
   end
 end
+
+
+GEOIP_COUNTRY_DATA = '/usr/share/GeoIP/GeoIP.dat'
+GEOIP_CITY_DATA    = '/usr/share/GeoIP/GeoIPCity.dat'
+
+def geoip(addr)
+  $geoip ||= begin
+    if File.exists? GEOIP_CITY_DATA
+      geo = GeoIP.new GEOIP_CITY_DATA
+      proc { |addr| geo.city(addr) }
+
+    elsif File.exists? GEOIP_COUNTRY_DATA
+      geo = GeoIP.new GEOIP_COUNTRY_DATA
+      proc { |addr| geo.country(addr) }
+
+    else
+      raise "Can't find GeoIP data in /usr/share/GeoIP."
+    end
+  end
+
+  $geoip.call(addr)
+end

data/lib/epitools/wm.rb

@@ -49,7 +49,7 @@ module WM
       current
     end
 
-    alias_method :active?, :current?    
+    alias_method :active?, :current?
 
     def windows
       @windows ||= WM.windows.select { |w| w.desktop_id == num }
@@ -102,8 +102,17 @@ module WM
     end
 
     def activate!
-      #system "wmctrl", "-i", "-a", window_id
-      system "xdotool", "windowactivate", window_id
+      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)
     end
 
     #
@@ -309,8 +318,8 @@ module WM
     # thorn                         0x00fe  /* U+00FE LATIN SMALL LETTER THORN */
     # ydiaeresis                    0x00ff  /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
     #
+    if Path.which("xse")
 
-    if Path.which("xdotool")
       KEYMAP = {
         "`" => "grave",
         " " => "space",
@@ -319,49 +328,63 @@ module WM
         "\[" => "Escape",
         '"' => "quotedbl",
       }
+      def keys_to_events(keys)
 
-      def string_to_keys(s)
+        tokens = keys.scan(/(<[^>]+>|.+?)/)
 
-        tokens = s.scan(/(<[^>]+>|.)/).flatten
+        tokens.flatten.map do |key|
+          mods = []
+
+          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
+            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
 
+          mods << "Shift" if key =~ /^[A-Z\~\!\@\#\$\%\^\&\*\(\)\_\+]$/
+
           if key =~ /^[A-Z0-9]$/i or key.size > 1
-            # key is good!
+            keyname = key
           else
-            key = KEYMAP[key] || ("0x%x" % key.ord)
+            keyname = KEYMAP[key] || ("0x%x" % key.ord)
           end
 
-          [*mods, key].join("+")
+          "#{mods.join(" ")}<Key>#{keyname}"
         end
       end
 
-      #
-      # 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)
+      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?)"
+        end
       end
-    end
 
-  end
+    end # Path.which('xse')
+
+  end # class Window
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.73
+  version: 0.5.74
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec