qcmd 0.1.7 → 0.1.8

data/spec/unit/commands_spec.rb

@@ -1,36 +1,157 @@
 require 'qcmd'
 require 'osc-ruby'
 
+#
+# This test file requires a running QLab instance with at least one cue. It is
+# *strongly* recommended you open a new QLab workspace and close all others
+# before running the tests.
+#
+
+def test_log msg=''
+  # puts msg
+end
+
+class DeadHandler
+  def self.handle response
+    # do nothing :P
+  end
+end
+
 describe Qcmd::Commands do
-  describe 'cue commands' do
+  describe 'when sending messages' do
     before do
       Qcmd.context = Qcmd::Context.new
-      Qcmd.context.machine = Qcmd::Machine.new('machine', '1.1.1.1', 1000)
-      Qcmd.context.workspace_connected = true
+      Qcmd.context.machine = Qcmd::Machine.new('test machine', 'localhost', 53000)
+      Qcmd.context.connect_to_qlab DeadHandler
+
+      # make sure alwaysReply is turned on
+      Qcmd.context.qlab.send(OSC::Message.new('/alwaysReply', 1))
+
+      @thread = nil
+    end
+
+    after do
+      if !@thread.nil? && @thread.alive?
+        @thread.join
+      end
+    end
+
+    describe 'machine commands' do
+      it 'should not raise errors' do
+        test_log
+
+        Qcmd::Commands::MACHINE.each do |machine_command|
+          expect {
+            osc_message = OSC::Message.new "/#{ machine_command }"
+
+            reply = nil
+
+            # should be able to instantiate all OSC message reponses as QLab replies
+            Qcmd.context.qlab.send(osc_message) do |response|
+              reply = Qcmd::QLab::Reply.new(response)
+              # test_log "[machine command] #{ reply.address } got #{ reply.to_s }"
+            end
+
+            test_log reply.address
+            reply.should_not be_nil
+          }.to_not raise_error
+        end
+      end
     end
 
-    describe 'cue command always needing reply' do
+    describe 'workspace commands' do
       before do
-        @address = '/workspace/TEST/cue/1/isRunning'
+        # make sure alwaysReply is turned on
+        Qcmd.context.qlab.send(OSC::Message.new('/alwaysReply', 1))
+
+        # load workspaces
+        osc_message = OSC::Message.new '/workspaces'
+        Qcmd.context.qlab.send(osc_message) do |response|
+          reply = Qcmd::QLab::Reply.new(response)
+          Qcmd.context.machine.workspaces = reply.data.map {|ws| Qcmd::QLab::Workspace.new(ws)}
+        end
       end
 
-      describe 'with args' do
-        before do
-          @message = OSC::Message.new(@address, 123)
+      it 'should not raise errors' do
+        test_log
+
+        workspace = Qcmd.context.machine.workspaces.first
+
+        Qcmd::Commands::WORKSPACE.each do |workspace_command|
+          expect {
+            osc_message = OSC::Message.new "/workspace/#{workspace.id}/#{ workspace_command }"
+
+            osc_response = nil
+            reply = nil
+
+            begin
+              Qcmd.context.qlab.send(osc_message) do |response|
+                osc_response = response
+                reply = Qcmd::QLab::Reply.new(response)
+                # test_log "[workspace command] #{ reply.address } got #{ reply.to_s }"
+              end
+            rescue => ex
+              puts "sender fail: #{ ex.message }"
+              raise
+            end
+
+            begin
+              test_log reply.address
+              reply.should_not(be_nil)
+            rescue => ex
+              puts "reply access fail '#{ ex.message }' on response #{ osc_response.inspect }"
+              raise
+            end
+
+          }.to_not raise_error
         end
 
-        it 'is detected' do
-          Qcmd::Commands.expects_reply?(@message).should eql(true)
+        # spawn thread to shrink screen back down
+        @thread = Thread.new do
+          sleep 2
+          Qcmd.context.qlab.send(OSC::Message.new("/workspace/#{workspace.id}/toggleFullScreen"))
         end
       end
 
-      describe 'without args' do
+      describe 'cue commands' do
         before do
-          @message = OSC::Message.new(@address, *@args)
+          @cue = nil
+
+          osc_message = OSC::Message.new "/workspace/#{ Qcmd.context.machine.workspaces.first.id }/cueLists"
+
+          Qcmd.context.qlab.send(osc_message) do |response|
+            reply = Qcmd::QLab::Reply.new(response)
+            @cue  = Qcmd::QLab::Cue.new(reply.data.first['cues'].first)
+          end
         end
 
-        it 'is detected' do
-          Qcmd::Commands.expects_reply?(@message).should eql(true)
+        it 'should not raise errors' do
+          test_log
+
+          workspace = Qcmd.context.machine.workspaces.first
+
+          Qcmd::Commands::CUE.each do |cue_command|
+            expect {
+              osc_message = OSC::Message.new "/workspace/#{workspace.id}/cue/#{ @cue.number }/#{ cue_command }"
+
+              osc_response = nil
+              reply = nil
+
+              Qcmd.context.qlab.send(osc_message) do |response|
+                osc_response = response
+                reply = Qcmd::QLab::Reply.new(response)
+              end
+
+              begin
+                test_log reply.address
+                reply.should_not be_nil
+              rescue => ex
+                puts "reply access fail '#{ ex.message }' on response #{ osc_response.inspect }"
+                raise
+              end
+
+            }.to_not raise_error
+          end
         end
       end
     end

data/spec/unit/parser_spec.rb

@@ -3,26 +3,57 @@ require 'qcmd'
 describe Qcmd::Parser do
   it "should parse simple commands" do
     tokens = Qcmd::Parser.parse "go"
-    tokens.should eql(['go'])
+    tokens.should eql([:go])
   end
 
   it "should parse embedded strings" do
     tokens = Qcmd::Parser.parse 'go "word word"'
-    tokens.should eql(['go', 'word word'])
+    tokens.should eql([:go, 'word word'])
   end
 
   it "should parse integers" do
     tokens = Qcmd::Parser.parse 'go "word word" 10'
-    tokens.should eql(['go', 'word word', 10])
+    tokens.should eql([:go, 'word word', 10])
   end
 
   it "should parse floats" do
     tokens = Qcmd::Parser.parse 'go "word word" 10 -12.3'
-    tokens.should eql(['go', 'word word', 10, -12.3])
+    tokens.should eql([:go, 'word word', 10, -12.3])
   end
 
   it "should parse nested quotes" do
     tokens = Qcmd::Parser.parse 'go "word word" 10 -12.3 "life \"is good\" yeah"'
-    tokens.should eql(['go', 'word word', 10, -12.3, 'life "is good" yeah'])
+
+    tokens.should eql([:go, 'word word', 10, -12.3, 'life "is good" yeah'])
+  end
+
+  it "should parse nested commands" do
+    tokens = Qcmd::Parser.parse 'cue 10 name (cue 3 name)'
+    tokens.should eql([:cue, 10, :name, [:cue, 3, :name]])
+  end
+
+  it "should parse alias commands" do
+    tokens = Qcmd::Parser.parse 'alias copy-name (cue 10 name (cue 3 name))'
+    tokens.should eql([:alias, :'copy-name', [:cue, 10, :name, [:cue, 3, :name]]])
+  end
+
+  it "should parse non alphanumeric commands" do
+    tokens = Qcmd::Parser.parse '..'
+    tokens.should eql([:'..'])
+  end
+
+  it "should parse leading slash commands" do
+    tokens = Qcmd::Parser.parse '/alwaysReply 1'
+    tokens.should eql([:'/alwaysReply', 1])
+  end
+
+  it 'should parse commands containing slashes' do
+    tokens = Qcmd::Parser.parse 'workspace/124/connect'
+    tokens.should eql([:'workspace/124/connect'])
+  end
+
+  it 'should parse strings with parens' do
+    tokens = Qcmd::Parser.parse %[cue 1 name "this is (not good)"]
+    tokens.should eql([:cue, 1, :name, 'this is (not good)'])
   end
 end

metadata

@@ -1,133 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qcmd
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.1.8
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - Adam Bachman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-24 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dnssd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: osc-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: osc-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        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 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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
 - Gemfile
 - LICENSE.txt
@@ -137,13 +140,17 @@ files:
 - bin/qcmd
 - features/support/setup.rb
 - lib/qcmd.rb
+- lib/qcmd/action.rb
+- lib/qcmd/aliases.rb
 - lib/qcmd/cli.rb
 - lib/qcmd/commands.rb
+- lib/qcmd/configuration.rb
 - lib/qcmd/context.rb
 - lib/qcmd/core_ext/array.rb
 - lib/qcmd/core_ext/osc/message.rb
-- lib/qcmd/core_ext/osc/stopping_server.rb
+- lib/qcmd/core_ext/osc/tcp_client.rb
 - lib/qcmd/handler.rb
+- lib/qcmd/history.rb
 - lib/qcmd/input_completer.rb
 - lib/qcmd/machine.rb
 - lib/qcmd/network.rb
@@ -152,60 +159,55 @@ files:
 - lib/qcmd/plaintext.rb
 - lib/qcmd/qlab.rb
 - lib/qcmd/qlab/cue.rb
+- lib/qcmd/qlab/cue_list.rb
 - lib/qcmd/qlab/reply.rb
 - lib/qcmd/qlab/workspace.rb
-- lib/qcmd/server.rb
 - lib/qcmd/version.rb
+- lib/vendor/sexpistol/LICENSE
+- lib/vendor/sexpistol/sexpistol.rb
+- lib/vendor/sexpistol/sexpistol/sexpistol.rb
+- lib/vendor/sexpistol/sexpistol/sexpistol_parser.rb
 - qcmd.gemspec
 - sample/dnssd.rb
 - sample/simple_console.rb
+- sample/tcp_qlab_connection.rb
 - spec/spec_helper.rb
+- spec/unit/action_spec.rb
 - spec/unit/cli_spec.rb
 - spec/unit/commands_spec.rb
-- spec/unit/osc_server_spec.rb
 - spec/unit/parser_spec.rb
 - spec/unit/qcmd_spec.rb
 - spec/unit/qlab_spec.rb
-has_rdoc: true
 homepage: https://github.com/abachman/qcmd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+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
 - spec/unit/cli_spec.rb
 - spec/unit/commands_spec.rb
-- spec/unit/osc_server_spec.rb
 - spec/unit/parser_spec.rb
 - spec/unit/qcmd_spec.rb
 - spec/unit/qlab_spec.rb