scad4r 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/features/result_parser.feature

@@ -0,0 +1,12 @@
+Feature: I want to know what openscad's done with my scad file
+
+  Scenario: Errors in geometry
+    Given I have a Scad4r::Runner with a Scad4r::ResultParser
+    And a file named "not_two_manifold.scad" with:
+    """
+    cube([20, 20, 20]);
+    translate([-20, -20, 0]) cube([20, 20, 20]);
+    cube([50, 50, 5], center = true);
+    """
+    When I run "not_two_manifold.scad" through the Scad4r::Runner
+    Then the results should be an error

data/features/step_definitions/result_parser_steps.rb

@@ -0,0 +1,3 @@
+Then /^the results should be an error$/ do
+  last_results.should include(:error)
+end

data/features/step_definitions/runner_steps.rb

@@ -2,6 +2,10 @@ Given /^I have a Scad4r::Runner$/ do
   self.runner= Scad4r::Runner.new
 end
 
+Given /^I have a Scad4r::Runner with a Scad4r::ResultParser$/ do
+  self.runner= Scad4r::Runner.new(parser: Scad4r::ResultParser.new)
+end
+
 When /^I run "(.*?)" through the Scad4r::Runner$/ do |path|
   in_current_dir do
     self.last_results= runner.run(path)

data/features/support/env.rb

@@ -16,6 +16,7 @@ require 'rspec/expectations'
 require 'aruba/cucumber'
 
 require 'scad4r/runner'
+require 'scad4r/result_parser'
 
 require 'pry'
 

data/lib/scad4r/result_parser.rb

@@ -4,6 +4,8 @@ module Scad4r
       case result
       when %r{Parser error in line (\d+): (.*)$}
         {error: "#{$2} line #{$1}"}
+      when %r{Object isn't}
+        {error: result}
       when %r{WARNING:}, %r{ECHO:}
         extract_timings(result).merge({
           warnings: extract_warnings(result),

data/scad4r.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "scad4r"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caleb Buxton"]
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "features/result_parser.feature",
     "features/runner.feature",
+    "features/step_definitions/result_parser_steps.rb",
     "features/step_definitions/runner_steps.rb",
     "features/support/env.rb",
     "lib/scad4r.rb",

data/spec/lib/scad4r/result_parser_spec.rb

@@ -9,12 +9,21 @@ module Scad4r
     subject { OpenStruct.new(described_class.new.parse(scad_result)) }
 
     context "with errors" do
-      let(:scad_result) { <<-END
-Parser error in line 47: syntax error
+      context "in syntax" do
+        let(:scad_result) { <<-END
+  Parser error in line 47: syntax error
+
+    END
+    }
+        its(:error) { should eql("syntax error line 47") }
+      end
+
+      context "in geometry" do
+        let(:scad_result) {
+          "Object isn't a valid 2-manifold! Mobify your design." }
 
-  END
-  }
-      its(:error) { should eql("syntax error line 47") }
+        its(:error) { should eql("Object isn't a valid 2-manifold! Mobify your design.")}
+      end
     end
 
     context "with warnings" do
@@ -105,7 +114,7 @@ END
     context "with timings" do
 
       let(:scad_result) { <<-END
-CGAL Cache insert: import(file=\"../Huxley/Print-Huxley/Indi (1728992 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,20],[0,1,0,0],[0,0,1, (1728992 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,20],[0,1,0,0] (1728992 bytes)\nCGAL Cache insert: group(){group(){multmatrix([[1,0,0,20],[ (1728992 bytes)\nCGAL Cache insert: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,7.5],[0,1,0,2.9],[0,0 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,32.5],[0,1,0,2.9],[0, (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,32.5],[0,1,0,25.9],[0 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,7.5],[0,1,0,25.9],[0, (62712 bytes)\nCGAL Cache insert: cube(size=[3,3,5],center=false); (10872 bytes)\nCGAL Cache insert: multmatrix([[0.707107,-0.707107,0,0],[0. (10872 bytes)\nCGAL Cache hit: multmatrix([[0.707107,-0.707107,0,0],[0. (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,-1.06066],[0,1,0,-2.1 (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,41.0607],[0,1,0,-2.12 (10872 bytes)\nCGAL Cache insert: cube(size=[5.83095,5.83095,5],center=fal (10872 bytes)\nCGAL Cache insert: multmatrix([[0.857493,-0.514496,0,0],[0. (10872 bytes)\nCGAL Cache hit: cube(size=[5.83095,5.83095,5],center=fal (10872 bytes)\nCGAL Cache insert: multmatrix([[0.514496,-0.857493,0,0],[0. (10872 bytes)\nCGAL Cache insert: cube(size=[40,28.8,5],center=false); (10872 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,7.5],[0,1,0,2 (250560 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,-1.06066],[0, (21648 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,0],[0,1,0,25.8],[0,0, (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,40],[0,1,0,25.8],[0,0 (10872 bytes)\nCGAL Cache insert: difference(){cube(size=[40,28.8,5],cente (273048 bytes)\nCGAL Cache hit: group(){group(){multmatrix([[1,0,0,20],[ (1728992 bytes)\nCGAL Cache hit: difference(){cube(size=[40,28.8,5],cente (273048 bytes)\nCGAL Cache insert: group(){difference(){cube(size=[40,28.8, (273048 bytes)\nCGAL Cache insert: difference(){group(){group(){multmatrix( (1190904 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,-60],[0,1,0,0],[0,0,1 (1728992 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,60],[0,1,0,0],[0,0,1, (1190904 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,-60],[0,1,0,0 (3192752 bytes)\nObject isn't a valid 2-manifold! Modify your design.\n       52.44 real        48.14 user         0.34 sys
+CGAL Cache insert: import(file=\"../Huxley/Print-Huxley/Indi (1728992 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,20],[0,1,0,0],[0,0,1, (1728992 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,20],[0,1,0,0] (1728992 bytes)\nCGAL Cache insert: group(){group(){multmatrix([[1,0,0,20],[ (1728992 bytes)\nCGAL Cache insert: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache hit: cylinder($fn=24,$fa=12,$fs=2,h=5,r1=1.65 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,7.5],[0,1,0,2.9],[0,0 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,32.5],[0,1,0,2.9],[0, (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,32.5],[0,1,0,25.9],[0 (62712 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,7.5],[0,1,0,25.9],[0, (62712 bytes)\nCGAL Cache insert: cube(size=[3,3,5],center=false); (10872 bytes)\nCGAL Cache insert: multmatrix([[0.707107,-0.707107,0,0],[0. (10872 bytes)\nCGAL Cache hit: multmatrix([[0.707107,-0.707107,0,0],[0. (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,-1.06066],[0,1,0,-2.1 (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,41.0607],[0,1,0,-2.12 (10872 bytes)\nCGAL Cache insert: cube(size=[5.83095,5.83095,5],center=fal (10872 bytes)\nCGAL Cache insert: multmatrix([[0.857493,-0.514496,0,0],[0. (10872 bytes)\nCGAL Cache hit: cube(size=[5.83095,5.83095,5],center=fal (10872 bytes)\nCGAL Cache insert: multmatrix([[0.514496,-0.857493,0,0],[0. (10872 bytes)\nCGAL Cache insert: cube(size=[40,28.8,5],center=false); (10872 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,7.5],[0,1,0,2 (250560 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,-1.06066],[0, (21648 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,0],[0,1,0,25.8],[0,0, (10872 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,40],[0,1,0,25.8],[0,0 (10872 bytes)\nCGAL Cache insert: difference(){cube(size=[40,28.8,5],cente (273048 bytes)\nCGAL Cache hit: group(){group(){multmatrix([[1,0,0,20],[ (1728992 bytes)\nCGAL Cache hit: difference(){cube(size=[40,28.8,5],cente (273048 bytes)\nCGAL Cache insert: group(){difference(){cube(size=[40,28.8, (273048 bytes)\nCGAL Cache insert: difference(){group(){group(){multmatrix( (1190904 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,-60],[0,1,0,0],[0,0,1 (1728992 bytes)\nCGAL Cache insert: multmatrix([[1,0,0,60],[0,1,0,0],[0,0,1, (1190904 bytes)\nCGAL Cache insert: group(){multmatrix([[1,0,0,-60],[0,1,0,0 (3192752 bytes)\n       52.44 real        48.14 user         0.34 sys
 END
       }
 

metadata

@@ -2,7 +2,7 @@
 name: scad4r
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Caleb Buxton
@@ -236,7 +236,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- features/result_parser.feature
 - features/runner.feature
+- features/step_definitions/result_parser_steps.rb
 - features/step_definitions/runner_steps.rb
 - features/support/env.rb
 - lib/scad4r.rb
@@ -268,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 198757374685059186
+      hash: 134172931124227608
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false