fingerpoken 0.2.20101217123250 → 0.2.20101227000817

data/bin/fingerpoken.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
 require "rubygems"
 require "em-websocket"
 require "json"
@@ -36,19 +37,25 @@ def main(args)
       case target.scheme
       when "xdo"
         require "fingerpoken/#{target.scheme}"
-        targets << [:Xdo, {}]
+        targets << [:Xdo, { }]
       when "vnc"
         require "fingerpoken/#{target.scheme}"
-        targets << [:VNC, {}]
+        targets << [:VNC, { 
+                      :host => target.host, :user => target.user,
+                      :password => target.password, :recenter => (target.query == "recenter") 
+                    }]
       when "tivo"
         require "fingerpoken/#{target.scheme}"
-        targets << [:Tivo, { :host => "192.168.0.134" }]
+        targets << [:Tivo, { :host => target.host }]
       end
     end
   end
   opts.parse(args)
 
-  puts targets
+  if targets.size == 0
+    $stderr.puts "No targets given. You should specify one with -t."
+    return 1
+  end
 
   EventMachine::run do
     $:.unshift(File.dirname(__FILE__) + "/lib")
@@ -56,13 +63,13 @@ def main(args)
 
     targets.each do |klass, args|
       args.merge!({ :channel => channel })
-      puts FingerPoken::Target.const_get(klass).new(args)
-    end
+      target = FingerPoken::Target.const_get(klass).new(args)
+      target.register
+    end # targets.each
 
     EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 5001) do |ws|
       ws.onmessage do |message|
         request = JSON.parse(message)
-        puts "Request: #{request.inspect}"
         channel.push(
           :request => request,
           :callback => proc { |message| ws.send(JSON.dump(message)) }
@@ -72,8 +79,8 @@ def main(args)
     
     Rack::Handler::Thin.run(
       Rack::CommonLogger.new( \
-          Rack::ShowExceptions.new( \
-                FingerPoken.new)), :Port => 5000)
+        Rack::ShowExceptions.new( \
+          FingerPoken.new)), :Port => 5000)
   end # EventMachine::run
 end
 

data/lib/fingerpoken/target.rb

@@ -4,12 +4,14 @@ class FingerPoken::Target
   def initialize(config)
     @channel = config[:channel]
     @logger = Logger.new(STDERR)
+    @logger.level = ($DEBUG ? Logger::DEBUG: Logger::WARN)
   end
 
   def register
     @channel.subscribe do |obj|
       request = obj[:request]
       callback = obj[:callback]
+      @logger.debug(request)
       response = case request["action"]
         when "mousemove_relative"
           mousemove_relative(request["rel_x"], request["rel_y"])
@@ -29,8 +31,9 @@ class FingerPoken::Target
           p ["Unsupported action", request]
       end
 
-      p [callback, response]
-      callback.call(response)
+      if response.is_a?(Hash)
+        callback.call(response)
+      end
     end
   end
 

data/lib/fingerpoken/tivo.rb

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
 # TODO(sissel): Refactor the protocol into an EM::Tivo module.
+# Commands
+# 
+#   IRCODE ...
+#   INFO
+#   WINDOW       - aspect ratio
 
 require "rubygems"
 require "fingerpoken/target"
@@ -11,7 +16,8 @@ class FingerPoken::Target::Tivo < FingerPoken::Target
     super(config)
     # TODO(sissel): Make this a config
     @host = config[:host]
-    @tivo = EventMachine::connect(@host, 31339, TivoClient, self)
+    @port = (config[:port] or 31339)
+    @tivo = EventMachine::connect(@host, @port, TivoClient, self)
 
     @state = OpenStruct.new # TODO(sissel): Make this not an open struct...
     
@@ -52,6 +58,7 @@ class FingerPoken::Target::Tivo < FingerPoken::Target
 
   def move_end
     @tivo.send_data("IRCODE PLAY\r\n")
+    @state.speed = 0
     return { "action" => "status", "status" => "\\u25b6" }
   end
 
@@ -82,6 +89,7 @@ class FingerPoken::Target::Tivo < FingerPoken::Target
     when "Return"
       @tivo.send_data("IRCODE SELECT\r\n")
     end
+    return nil
   end
 
   class TivoClient < EventMachine::Connection

data/lib/fingerpoken/vnc.rb

@@ -9,10 +9,19 @@ class FingerPoken::Target::VNC < FingerPoken::Target
 
   def initialize(config)
     super(config)
-    # TODO(sissel): Make this configurable
-    @password = ENV["VNCPASS"]
-    @host = "sadness"
-    @port = 5900
+    # TODO(sissel): eventmachine-vnc needs to suppore more auth mechanisms
+    @user = config[:user]
+    @password = (config[:password] or config[:user])
+    @host = config[:host]
+    @port = (config[:port] or 5900)
+    @recenter = config[:recenter]
+
+    # For eventmachine-vnc
+    ENV["VNCPASS"] = @password
+
+    if @host == nil
+      raise "#{self.class.name}: No host given to connect to"
+    end
 
     @vnc = EventMachine::connect(@host, @port, VNCClient, self)
     @x = 0
@@ -21,13 +30,12 @@ class FingerPoken::Target::VNC < FingerPoken::Target
   end
 
   def update
-    p [@x, @y, @buttonmask]
     @vnc.pointerevent(@x, @y, @buttonmask)
 
     # TODO(sissel): Hack to make it work in TF2.
     # Mouse movement is always "from center"
     # So after each move, center the cursor.
-    if ENV["RECENTER"]
+    if @recenter
       @x = (@vnc.screen_width / 2).to_i
       @y = (@vnc.screen_height / 2).to_i
     end
@@ -37,6 +45,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     @x += x
     @y += y
     update
+    return nil
   end
 
   def mousedown(button)
@@ -44,6 +53,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     return if @buttonmask & button != 0
     @buttonmask |= button
     update
+    return nil
   end
 
   def mouseup(button)
@@ -51,6 +61,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     return if @buttonmask & button == 0
     @buttonmask &= (~button)
     update
+    return nil
   end
 
   class VNCClient < EventMachine::Connection

data/lib/fingerpoken/xdo.rb

@@ -25,32 +25,29 @@ class FingerPoken::Target::Xdo < FingerPoken::Target
     if @xdo.null?
        raise "xdo_new failed"
     end
-    register
   end
 
   def mousemove_relative(x, y)
-    @logger.info("move #{x},#{y}")
     return LibXdo::xdo_mousemove_relative(@xdo, x, y)
   end
 
   def click(button)
-    LibXdo::xdo_click(@xdo, 0, button.to_i)
+    return LibXdo::xdo_click(@xdo, 0, button.to_i)
   end
 
   def mousedown(button)
-    LibXdo::xdo_mousedown(@xdo, 0, button.to_i)
+    return LibXdo::xdo_mousedown(@xdo, 0, button.to_i)
   end
 
   def mouseup(button)
-    LibXdo::xdo_mouseup(@xdo, 0, button.to_i)
+    return LibXdo::xdo_mouseup(@xdo, 0, button.to_i)
   end
 
   def type(string)
-    LibXdo::xdo_type(@xdo, 0, string, 12000)
+    return LibXdo::xdo_type(@xdo, 0, string, 12000)
   end
 
   def keypress(key)
-    p "Pressing: #{key}"
     if key.is_a?(String)
       if key.length == 1
         # Assume letter
@@ -74,5 +71,6 @@ class FingerPoken::Target::Xdo < FingerPoken::Target
           end # case key
       end # if 32.upto(127).include?(key)
     end # if key.is_a?String
+    return nil
   end # def keypress
 end # class FingerPoken::Target::Xdo 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerpoken
 version: !ruby/object:Gem::Version 
-  hash: 40202434246515
+  hash: 40202454001653
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101217123250
-  version: 0.2.20101217123250
+  - 20101227000817
+  version: 0.2.20101227000817
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -08:00
+date: 2010-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency