tickly 2.1.3 → 2.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 178bbaee09a8714a619462a767a15dc86284e039
+  data.tar.gz: 8d5d22b037fb58ad14593b246579a74d3b725d63
+SHA512:
+  metadata.gz: 4c81568f20334cbdfd0265130f15d0420d46d6633fef1baf1c5cdd869bcb492666ce6058da2919e3a5e75600b378c4003002d6c24f070d79914412e36d25b374
+  data.tar.gz: cc2bc355e7c6bac3cb25d93616ccc8c5d9e84643213f1c4368c52c77b3a089799988a0d532cc5451bfa545d6a0d8254a238a4d7060800976e3ac920a41ea387f

data/.travis.yml

@@ -2,4 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0-p247

data/Gemfile

@@ -7,6 +7,6 @@ gem 'bychar', '~> 2'
 group :development do
   gem "rake"
   gem "rdoc", "~> 3.12"
-  gem "jeweler", "~> 1.8.3"
+  gem "jeweler", "~> 1.8.7"
   gem "ruby-prof"
 end

data/lib/tickly.rb

@@ -4,5 +4,5 @@ require File.dirname(__FILE__) + "/tickly/curve"
 require File.dirname(__FILE__) + "/tickly/node_processor"
 
 module Tickly
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/lib/tickly/parser.rb

@@ -71,6 +71,11 @@ module Tickly
       
       expressions << stack if stack.any?
       
+      # Make sure that all of the expresisons get collapsed
+      expressions = expressions.map do | e |
+        compact_subexpr(e, stack_depth + 1)
+      end
+      
       return expressions
     end
     

data/test/test-data/nuke8_copypaste_without_linefeed_at_end.nk

@@ -0,0 +1,6 @@
+set cut_paste_input [stack 0]
+version 8.0 v1
+push $cut_paste_input
+Tracker4 {
+ypos -177
+}

data/test/test_node_processor.rb

@@ -4,6 +4,8 @@ class TestParserEvaluator < Test::Unit::TestCase
   
   HUGE_SCRIPT = File.open(File.dirname(__FILE__) + "/test-data/huge_nuke_tcl.tcl")
   NUKE7_SCRIPT = File.open(File.dirname(__FILE__) + "/test-data/nuke7_tracker_2tracks.nk")
+  MISSING_LF = File.open(File.dirname(__FILE__) + 
+    "/test-data/nuke8_copypaste_without_linefeed_at_end.nk")
   
   class Tracker4
     attr_reader :knobs
@@ -20,7 +22,6 @@ class TestParserEvaluator < Test::Unit::TestCase
     
     assert_raise(NodeCaptured) do
       pe.parse(NUKE7_SCRIPT) do | node |
-        
         assert_kind_of Tracker4, node
         assert_equal "Tracker1", node.knobs["name"]
         
@@ -29,9 +30,26 @@ class TestParserEvaluator < Test::Unit::TestCase
     end
   end
   
+  def test_processes_without_trailing_LF
+    pe = Tickly::NodeProcessor.new
+    pe.add_node_handler_class(Tracker4)
+    
+    assert_raise(NodeCaptured) do
+      pe.parse(MISSING_LF) do | node |
+        
+        assert_kind_of Tracker4, node
+        ref_knobs = {"ypos"=>"-177"}
+        assert_equal ref_knobs, node.knobs
+        
+        raise NodeCaptured
+      end
+    end
+  end
+  
   def test_raises_without_a_block
     pe = Tickly::NodeProcessor.new
     assert_raise(LocalJumpError) { pe.parse(NUKE7_SCRIPT) }
   end
-
+  
+  
 end

data/tickly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tickly"
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-09-01"
+  s.date = "2013-12-06"
   s.description = "Parses the subset of the TCL grammar needed for Nuke scripts"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test-data/huge_nuke_tcl.tcl",
     "test/test-data/nuke7_tracker_2tracks.nk",
+    "test/test-data/nuke8_copypaste_without_linefeed_at_end.nk",
     "test/test-data/nuke_group.txt",
     "test/test-data/nukenode.txt",
     "test/test-data/one_node_with_one_param.txt",
@@ -51,30 +52,30 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/julik/tickly"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "Assists in parsing Nuke scripts in TCL"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bychar>, ["~> 2"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
       s.add_dependency(%q<bychar>, ["~> 2"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_dependency(%q<ruby-prof>, [">= 0"])
     end
   else
     s.add_dependency(%q<bychar>, ["~> 2"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     s.add_dependency(%q<ruby-prof>, [">= 0"])
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tickly
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.1.4
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bychar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,33 +55,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Parses the subset of the TCL grammar needed for Nuke scripts
@@ -113,6 +102,7 @@ files:
 - test/helper.rb
 - test/test-data/huge_nuke_tcl.tcl
 - test/test-data/nuke7_tracker_2tracks.nk
+- test/test-data/nuke8_copypaste_without_linefeed_at_end.nk
 - test/test-data/nuke_group.txt
 - test/test-data/nukenode.txt
 - test/test-data/one_node_with_one_param.txt
@@ -132,29 +122,25 @@ files:
 homepage: http://github.com/julik/tickly
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2166634319159916573
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Assists in parsing Nuke scripts in TCL
 test_files: []