qcmd 0.1.11 → 0.1.12

data/lib/qcmd/version.rb

@@ -1,3 +1,3 @@
 module Qcmd
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/vendor/sexpistol/sexpistol/sexpistol_parser.rb

@@ -52,31 +52,31 @@ class SexpistolParser < StringScanner
           when '(' then exp << [:quote].concat([parse])
           else exp << [:quote, @token]
           end
-        when String, Fixnum, Float, Symbol 
+        when String, Fixnum, Float, Symbol
           exp << @token
-        when nil 
+        when nil
           break
       end
     end
     exp
   end
-  
+
   def fetch_token
     skip(/\s+/)
     return nil if(eos?)
-    
-    @token = 
+
+    @token =
     # Match parentheses
-    if scan(/[\(\)]/)      
+    if scan(/[\(\)]/)
       matched
     # Match a string literal
     elsif scan(/"([^"\\]|\\.)*"/)
       eval(matched)
     # Match a float literal
-    elsif scan(/[\-\+]? [0-9]+ ((e[0-9]+) | (\.[0-9]+(e[0-9]+)?))/x)
+    elsif scan(/[\-\+]? [0-9]+ ((e[0-9]+) | (\.[0-9]+(e[0-9]+)?)) (\s|$)/x)
       matched.to_f
     # Match an integer literal
-    elsif scan(/[\-\+]?[0-9]+/)
+    elsif scan(/[\-\+]?[0-9]+ (\s|$)/x)
       matched.to_i
     # Match a comma (for comma quoting)
     elsif scan(/'/)

data/qcmd.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'dnssd'
-  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'dnssd', '= 2.0'
+  gem.add_runtime_dependency 'json', '= 1.7.7'
   gem.add_runtime_dependency 'osc-ruby', '= 1.0.0'
-  gem.add_runtime_dependency 'trollop'
+  gem.add_runtime_dependency 'trollop', '= 2.0'
 
   gem.add_development_dependency "rspec", '~> 2.10.0'
-  gem.add_development_dependency "cucumber"
+  gem.add_development_dependency "cucumber", '= 1.2.1'
   gem.add_development_dependency "aruba"
 end

data/spec/unit/parser_spec.rb

@@ -17,8 +17,13 @@ describe Qcmd::Parser do
   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 = Qcmd::Parser.parse '1.1 go "word word" 10 -12.3 1.1.1 10.2'
+    tokens.should eql([1.1, :go, 'word word', 10, -12.3, :'1.1.1', 10.2])
+  end
+
+  it "should parse invalid numbers as symbols" do
+    tokens = Qcmd::Parser.parse 'cue 1.11.0'
+    tokens.should eql([:cue, :'1.11.0'])
   end
 
   it "should parse nested quotes" do

metadata

@@ -1,120 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qcmd
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 11
-  version: 0.1.11
+version: !ruby/object:Gem::Version
+  version: 0.1.12
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Adam Bachman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-10 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: 
-        - 0
-        version: "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: 
-        - 0
-        version: "0"
+  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: 
-        - 0
-        version: "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: 
-        - 0
-        version: "0"
+  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
@@ -167,37 +183,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: 
-      - 0
-      version: "0"
+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: '0'
 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