qcmd 0.1.16.pre → 0.1.16.pre2

data/lib/qcmd.rb

@@ -11,8 +11,7 @@ require 'qcmd/commands'
 require 'qcmd/input_completer'
 require 'qcmd/core_ext/array'
 require 'qcmd/core_ext/string'
-require 'qcmd/core_ext/osc/message'
-require 'qcmd/core_ext/osc/tcp_client'
+require 'qcmd/core_ext/osc'
 
 module Qcmd
   autoload :Configuration, 'qcmd/configuration'

data/lib/qcmd/context.rb

@@ -50,7 +50,7 @@ module Qcmd
     def connect_to_qlab handler=nil
       # get an open connection with the default handler
       handler ||= Qcmd::Handler
-      self.qlab = OSC::TCPClient.new(machine.address, machine.port, handler)
+      self.qlab = OSC::TCP::Client.new(machine.address, machine.port, handler)
     end
   end
 end

data/lib/qcmd/core_ext/osc.rb

@@ -0,0 +1,6 @@
+require 'qcmd/core_ext/osc/tcp'
+require 'qcmd/core_ext/osc/sending_socket'
+require 'qcmd/core_ext/osc/tcp_client'
+require 'qcmd/core_ext/osc/tcp_server'
+require 'qcmd/core_ext/osc/message'
+

data/lib/qcmd/core_ext/osc/message.rb

@@ -3,5 +3,14 @@ module OSC
     def has_arguments?
       to_a.size > 0
     end
+
+    # attachable responder, for use with TCP::Server
+    def responder
+      @responder
+    end
+
+    def responder=(val)
+      @responder = val
+    end
   end
 end

data/lib/qcmd/core_ext/osc/sending_socket.rb

@@ -0,0 +1,47 @@
+module OSC
+  module TCP
+    class SendingSocket
+      def initialize socket
+        @socket = socket
+      end
+
+      def send msg
+        @socket_buffer = []
+
+        enc_msg = msg.encode
+
+        send_char CHAR_END
+
+        enc_msg.bytes.each do |b|
+          case b
+          when CHAR_END
+            send_char CHAR_ESC
+            send_char CHAR_ESC_END
+          when CHAR_ESC
+            send_char CHAR_ESC
+            send_char CHAR_ESC_ESC
+          else
+            send_char b
+          end
+        end
+
+        send_char CHAR_END
+
+        flush
+
+        # puts "[TCP::SendingSocket] sent message: #{ enc_msg.inspect }"
+      end
+
+      private
+
+      def flush
+        @socket.send @socket_buffer.join, 0
+      end
+
+      def send_char c
+        @socket_buffer << [c].pack('C')
+        # @socket.send [c].pack('C'), 0
+      end
+    end
+  end
+end

data/lib/qcmd/core_ext/osc/tcp.rb

@@ -0,0 +1,14 @@
+module OSC
+  module TCP
+    CHAR_END     = 0300 # indicates end of packet
+    CHAR_ESC     = 0333 # indicates byte stuffing
+    CHAR_ESC_END = 0334 # ESC ESC_END means END data byte
+    CHAR_ESC_ESC = 0335 # ESC ESC_ESC means ESC data byte
+
+    CHAR_END_ENC     = [0300].pack('C') # indicates end of packet
+    CHAR_ESC_ENC     = [0333].pack('C') # indicates byte stuffing
+    CHAR_ESC_END_ENC = [0334].pack('C') # ESC ESC_END means END data byte
+    CHAR_ESC_ESC_ENC = [0335].pack('C') # ESC ESC_ESC means ESC data byte
+  end
+end
+

data/lib/qcmd/core_ext/osc/tcp_client.rb

@@ -4,155 +4,125 @@
 # http://www.ietf.org/rfc/rfc1055.txt
 
 module OSC
-  class TCPClient
-
-    CHAR_END     = 0300 # indicates end of packet
-    CHAR_ESC     = 0333 # indicates byte stuffing
-    CHAR_ESC_END = 0334 # ESC ESC_END means END data byte
-    CHAR_ESC_ESC = 0335 # ESC ESC_ESC means ESC data byte
-
-    CHAR_END_ENC     = [0300].pack('C') # indicates end of packet
-    CHAR_ESC_ENC     = [0333].pack('C') # indicates byte stuffing
-    CHAR_ESC_END_ENC = [0334].pack('C') # ESC ESC_END means END data byte
-    CHAR_ESC_ESC_ENC = [0335].pack('C') # ESC ESC_ESC means ESC data byte
-
-    def initialize host, port, handler=nil
-      @host = host
-      @port = port
-      @handler = handler
-      @so   = TCPSocket.new host, port
-    end
-
-    def close
-      @so.close unless closed?
-    end
-
-    def closed?
-      @so.closed?
-    end
-
-    # send an OSC::Message
-    def send msg
-      enc_msg = msg.encode
-
-      send_char CHAR_END
-
-      enc_msg.bytes.each do |b|
-        case b
-        when CHAR_END
-          send_char CHAR_ESC
-          send_char CHAR_ESC_END
-        when CHAR_ESC
-          send_char CHAR_ESC
-          send_char CHAR_ESC_ESC
-        else
-          send_char b
-        end
+  module TCP
+    class Client
+      def initialize host, port, handler=nil
+        @host = host
+        @port = port
+        @handler = handler
+        @socket = TCPSocket.new host, port
+        @sending_socket = SendingSocket.new @socket
       end
 
-      send_char CHAR_END
+      def close
+        @socket.close unless closed?
+      end
 
-      # puts "[TCPClient] sent message: #{ enc_msg.inspect }"
+      def closed?
+        @socket.closed?
+      end
 
-      if block_given? || @handler
-        messages = response
-        if !messages.nil?
-          messages.each do |message|
-            # puts "[TCPClient] got message #{ message }"
-            if block_given?
-              yield message
-            else
-              @handler.handle message
+      # send an OSC::Message
+      def send msg
+        @sending_socket.send msg
+
+
+        if block_given? || @handler
+          messages = response
+          if !messages.nil?
+            messages.each do |message|
+              # puts "[TCP::Client] got message #{ message }"
+              if block_given?
+                yield message
+              else
+                @handler.handle message
+              end
             end
+          else
+            # puts "[TCP::Client] response is nil"
           end
+        end
+      end
+
+      def response
+        if received_messages = receive_raw
+          received_messages.map do |message|
+            OSCPacket.messages_from_network(message)
+          end.flatten
         else
-          # puts "[TCPClient] response is nil"
+          nil
         end
       end
-    end
 
-    def response
-      if received_messages = receive_raw
-        received_messages.map do |message|
-          OSCPacket.messages_from_network(message)
-        end.flatten
-      else
-        nil
+      def to_s
+        "#<OSC::TCP::Client:#{ object_id } @host:#{ @host.inspect }, @port:#{ @port.inspect }, @handler:#{ @handler.to_s }>"
       end
-    end
 
-    def to_s
-      "#<OSC::TCPClient:#{ object_id } @host:#{ @host.inspect }, @port:#{ @port.inspect }, @handler:#{ @handler.to_s }>"
-    end
+      private
 
-    private
+      def receive_raw
+        received = 0
+        messages = []
+        buffer   = []
+        failed   = false
+        received_any = false
 
-    def send_char c
-      @so.send [c].pack('C'), 0
-    end
+        loop do
+          begin
+            # get a character from the socket, fail if nothing is available
+            c = @socket.recv_nonblock(1)
+
+            received_any = true
 
-    def receive_raw
-      received = 0
-      messages = []
-      buffer   = []
-      failed   = false
-      received_any = false
-
-      loop do
-        begin
-          # get a character from the socket, fail if nothing is available
-          c = @so.recv_nonblock(1)
-
-          received_any = true
-
-          case c
-          when CHAR_END_ENC
-            if received > 0
-              # add SLIP encoded message to list
-              messages << buffer.join
-
-              # reset state and keep reading from the port until there's
-              # nothing left
-              buffer.clear
-              received = 0
-              failed = false
-            end
-          when CHAR_ESC_ENC
-            # get next character, blocking is okay
-            c = @so.recv(1)
             case c
-            when CHAR_ESC_END_ENC
-              c = CHAR_END_ENC
-            when CHAR_ESC_ESC_ENC
-              c = CHAR_ESC_ENC
+            when CHAR_END_ENC
+              if received > 0
+                # add SLIP encoded message to list
+                messages << buffer.join
+
+                # reset state and keep reading from the port until there's
+                # nothing left
+                buffer.clear
+                received = 0
+                failed = false
+              end
+            when CHAR_ESC_ENC
+              # get next character, blocking is okay
+              c = @socket.recv(1)
+              case c
+              when CHAR_ESC_END_ENC
+                c = CHAR_END_ENC
+              when CHAR_ESC_ESC_ENC
+                c = CHAR_ESC_ENC
+              else
+                received += 1
+                buffer << c
+              end
             else
               received += 1
               buffer << c
             end
-          else
-            received += 1
-            buffer << c
-          end
-        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          # If any messages have been received, assume sender is done sending.
-          if failed || received_any
-            break
-          end
+          rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+            # If any messages have been received, assume sender is done sending.
+            if failed || received_any
+              break
+            end
 
-          # wait one second to see if the socket might become readable (and a
-          # response forthcoming). normal usage is send + wait for response,
-          # we have to give QLab a reasonable amount of time in which to respond.
+            # wait one second to see if the socket might become readable (and a
+            # response forthcoming). normal usage is send + wait for response,
+            # we have to give QLab a reasonable amount of time in which to respond.
 
-          IO.select([@so], [], [], 1)
-          failed = true
-          retry
+            IO.select([@socket], [], [], 1)
+            failed = true
+            retry
+          end
         end
-      end
 
-      if messages.size > 0
-        messages
-      else
-        nil
+        if messages.size > 0
+          messages
+        else
+          nil
+        end
       end
     end
   end

data/lib/qcmd/core_ext/osc/tcp_server.rb

@@ -0,0 +1,87 @@
+# An OSC TCP server receives and sends on the same socket using the SLIP
+# protocol.
+#
+# http://www.ietf.org/rfc/rfc1055.txt
+
+module OSC
+  module TCP
+    class Server < OSC::Server
+      def initialize port
+        @server = TCPServer.new port
+        @matchers = []
+        @queue = Queue.new
+      end
+
+      # run and stop work the same way
+
+    private
+
+      def detector
+        @server.listen(5)
+
+        # outer loop manages connections
+        loop do
+          network   = nil
+          buffer    = []
+          skip_char = false
+
+          # block until a new connection is opened, then get socket and create a
+          # responder so we can .send OSC::Message objects in response
+          socket = @server.accept
+          responder = SendingSocket.new(socket)
+
+          # fam, port, *addr = socket.getpeername.unpack('nnC4')
+
+          loop do
+            c, _network = socket.recvfrom(1)
+            network ||= _network
+
+            begin
+              case c
+              when CHAR_END_ENC
+                if buffer.size > 0
+                  osc_data = buffer.join
+
+                  if network.nil?
+                    # we don't know what port or address the connection is coming from :(
+                    ip_info = [0, 'localhost']
+                  else
+                    ip_info = Array.new
+                    ip_info << network[1]
+                    ip_info.concat(network[2].split('.'))
+                  end
+
+                  # tell listeners that messages have arrived, attach responder
+                  OSCPacket.messages_from_network(osc_data, ip_info).each do |message|
+                    message.responder = responder
+                    @queue.push(message)
+                  end
+
+                  # clear buffer and keep listening
+                  buffer.clear
+                end
+              when CHAR_ESC_ENC
+                skip_char = true
+              when CHAR_ESC_END_ENC
+                if skip_char
+                  buffer << CHAR_ESC_ENC
+                  skip_char = false
+                end
+              when CHAR_ESC_ESC_ENC
+                if skip_char
+                  buffer << CHAR_ESC_ENC
+                  skip_char = false
+                end
+              else
+                buffer << c
+              end
+            rescue EOFError
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/qcmd/version.rb

@@ -1,5 +1,5 @@
 module Qcmd
-  VERSION = "0.1.16.pre"
+  VERSION = "0.1.16.pre2"
 
   class << self
     def installed_version

data/sample/dnssd.rb

@@ -32,14 +32,14 @@ end
 
 browsers = []
 
-#browsers.push(DNSSD.browse('_qlab._udp.') do |b|
-#  do_browse_on_service(b)
-#end)
-
-browsers.push(DNSSD.browse('_qlab._tcp.') do |b|
+browsers.push(DNSSD.browse('_qlab._udp.') do |b|
   do_browse_on_service(b)
 end)
 
+# browsers.push(DNSSD.browse('_qlab._tcp.') do |b|
+#   do_browse_on_service(b)
+# end)
+
 trap 'INT' do
   browsers.map(&:stop);
   exit

data/sample/tcp_qlab_connection.rb

@@ -5,7 +5,7 @@ require 'json'
 
 # try it out
 
-qlab = OSC::TCPClient.new 'localhost', 53000
+qlab = OSC::TCP::Client.new 'localhost', 53000
 
 def receive(rcv)
   if rcv

data/sample/tcp_server_and_client.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'qcmd'
+require 'json'
+
+puts "setting up server"
+
+# server must come first
+server = OSC::TCP::Server.new 52000
+server.add_method(/.*/) do |message|
+  ip_address = message.ip_address.sub(/\.\.\./, '')
+  ts = Time.now.strftime('%Y-%m-%d %H:%M:%S')
+
+  types = message.to_a.map(&:class).map(&:to_s).join(', ')
+  args  = message.to_a
+
+  puts "[#{ts}] #{message.ip_address}:#{message.ip_port} -- #{message.address} -- [#{ types }] -- #{ args.inspect }"
+
+  message.responder.send OSC::Message.new("/hello-to-you-too")
+end
+
+puts "starting server"
+thread = Thread.new do
+  server.run
+end
+
+class MyClientHandler
+  def handle message
+    puts "[MyClientHandler] #{ message.address }"
+  end
+end
+
+puts "setting up client"
+client = OSC::TCP::Client.new 'localhost', 52000, MyClientHandler.new
+
+puts "sending spam"
+client.send OSC::Message.new("/hello", "world")
+
+sleep 1
+
+# thread.join

metadata

@@ -1,127 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qcmd
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 1
-  - 16
-  - pre
-  version: 0.1.16.pre
+version: !ruby/object:Gem::Version
+  version: 0.1.16.pre2
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Adam Bachman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dnssd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: osc-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: osc-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple interactive QLab 3 command line controller
-email: 
+email:
 - adam.bachman@gmail.com
-executables: 
+executables:
 - qcmd
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -142,8 +151,12 @@ files:
 - lib/qcmd/configuration.rb
 - lib/qcmd/context.rb
 - lib/qcmd/core_ext/array.rb
+- lib/qcmd/core_ext/osc.rb
 - lib/qcmd/core_ext/osc/message.rb
+- lib/qcmd/core_ext/osc/sending_socket.rb
+- lib/qcmd/core_ext/osc/tcp.rb
 - lib/qcmd/core_ext/osc/tcp_client.rb
+- lib/qcmd/core_ext/osc/tcp_server.rb
 - lib/qcmd/core_ext/string.rb
 - lib/qcmd/handler.rb
 - lib/qcmd/history.rb
@@ -168,6 +181,7 @@ files:
 - sample/fast-rate-change.rb
 - sample/simple_console.rb
 - sample/tcp_qlab_connection.rb
+- sample/tcp_server_and_client.rb
 - spec/spec_helper.rb
 - spec/unit/action_spec.rb
 - spec/unit/cli_spec.rb
@@ -175,39 +189,31 @@ files:
 - spec/unit/parser_spec.rb
 - spec/unit/qcmd_spec.rb
 - spec/unit/qlab_spec.rb
-has_rdoc: true
 homepage: https://github.com/Figure53/qcmd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: QLab 3 console
-test_files: 
+test_files:
 - features/support/setup.rb
 - spec/spec_helper.rb
 - spec/unit/action_spec.rb