qcmd 0.1.2 → 0.1.3

data/lib/qcmd/cli.rb

@@ -96,9 +96,6 @@ module Qcmd
       when 'connect'
         Qcmd.debug "(connect command received args: #{ args.inspect })"
 
-        # remove quoted strings
-        args = args.map {|a| a.gsub(/^"/, '').gsub(/"$/, '')}
-
         machine_name = args.shift
         passcode     = args.shift
 
@@ -114,7 +111,7 @@ module Qcmd
       when 'use'
         Qcmd.debug "(use command received args: #{ args.inspect })"
 
-        workspace_name = args.shift.gsub(/['"]/, '')
+        workspace_name = args.shift
         passcode       = args.shift
 
         Qcmd.debug "(using workspace: #{ workspace_name.inspect })"
@@ -139,7 +136,6 @@ module Qcmd
         # pull off cue number
         cue_number = args.shift
         cue_action = args.shift
-        args = args.map {|a| a.gsub(/^"/, '').gsub(/"$/, '')}
 
         if cue_number.nil?
           print "no cue command given. cue commands should be in the form:"

data/lib/qcmd/commands.rb

@@ -12,7 +12,7 @@ module Qcmd
       uniqueID hasFileTargets hasCueTargets allowsEditingDuration isLoaded
       isRunning isPaused isBroken preWaitElapsed actionElapsed
       postWaitElapsed percentPreWaitElapsed percentActionElapsed
-      percentPostWaitElapsed type
+      percentPostWaitElapsed type sliderLevels
       basics children
     )
 
@@ -20,6 +20,7 @@ module Qcmd
     NO_ARG_CUE_RESPONSE = %w(
       number name notes cueTargetNumber cueTargetId preWait duration
       postWait continueMode flagged armed colorName
+      sliderLevel
     )
 
     class << self

data/lib/qcmd/input_completer.rb

@@ -17,6 +17,7 @@ module Qcmd
       percentPreWaitElapsed percentActionElapsed percentPostWaitElapsed
       type number name notes cueTargetNumber cueTargetId preWait duration
       postWait continueMode flagged armed colorName basics children
+      sliderLevel sliderLevels
     ]
 
     CompletionProc = Proc.new {|input|
@@ -25,7 +26,7 @@ module Qcmd
       matcher  = /^#{Regexp.escape(input)}/
       commands = ReservedWords.grep(matcher)
 
-      if Qcmd.connected? && Qcmd.context
+      if Qcmd.connected?
         # have selected a machine
         if Qcmd.context.workspace_connected?
           # have selected a workspace

data/lib/qcmd/parser.rb

@@ -37,10 +37,57 @@ module Qcmd
         end
       end
 
+      # A helper method to take care of the repetitive stuff for us
+      def is_match?( string, pattern)
+        match = string.match(pattern)
+        return false unless match
+        # Make sure that the matched pattern consumes the entire token
+        match[0].length == string.length
+      end
+
+      # Detect a symbol
+      def is_symbol?( string )
+        # Anything other than parentheses, single or double quote and commas
+        return is_match?( string, /[^\"\'\,\(\)]+/ )
+      end
+
+      # Detect an integer literal
+      def is_integer_literal?( string )
+        # Any number of numerals optionally preceded by a plus or minus sign
+        return is_match?( string, /[\-\+]?[0-9]+/ )
+      end
+
+      def is_float_literal?( string )
+        # Any number of numerals optionally preceded by a plus or minus sign
+        return is_match?( string, /[\-\+]?[0-9]+(\.[0-9]*)?/ )
+      end
+
+      # Detect a string literal
+      def is_string_literal?( string )
+        # Any characters except double quotes
+        # (except if preceded by a backslash), surrounded by quotes
+        return is_match?( string, /"([^"\\]|\\.)*"/)
+      end
+
+      def convert_tokens( token_array )
+        converted_tokens = []
+        token_array.each do |t|
+          converted_tokens << t.to_i and next if( is_integer_literal?(t) )
+          converted_tokens << t.to_f and next if( is_float_literal?(t) )
+          converted_tokens << t.to_s and next if( is_symbol?(t) )
+          converted_tokens << eval(t) and next if( is_string_literal?(t) )
+          # If we haven't recognized the token by now we need to raise
+          # an exception as there are no more rules left to check against!
+          raise Exception, "Unrecognized token: #{t}"
+        end
+        return converted_tokens
+      end
+
       def parse( string )
         string, string_literals = extract_string_literals(string)
         token_array = tokenize_string(string)
         token_array = restore_string_literals(token_array, string_literals)
+        token_array = convert_tokens(token_array)
         return token_array
       end
     end

data/lib/qcmd/version.rb

@@ -1,3 +1,3 @@
 module Qcmd
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/parser_spec.rb

@@ -0,0 +1,28 @@
+require 'qcmd'
+
+describe Qcmd::Parser do
+  it "should parse simple commands" do
+    tokens = Qcmd::Parser.parse "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'])
+  end
+
+  it "should parse integers" do
+    tokens = Qcmd::Parser.parse '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])
+  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'])
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qcmd
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Adam Bachman
@@ -185,6 +185,7 @@ files:
 - sample/dnssd.rb
 - spec/cli_spec.rb
 - spec/commands_spec.rb
+- spec/parser_spec.rb
 - spec/qcmd_spec.rb
 - spec/qlab_spec.rb
 has_rdoc: true
@@ -226,5 +227,6 @@ test_files:
 - features/support/setup.rb
 - spec/cli_spec.rb
 - spec/commands_spec.rb
+- spec/parser_spec.rb
 - spec/qcmd_spec.rb
 - spec/qlab_spec.rb