scad4r 0.1.0 → 0.2.0

data/Gemfile

@@ -1,18 +1,18 @@
 source "http://rubygems.org"
 
-gem "bundler"
+gem "childprocess", "~> 0.3"
 
 group :development do
-  gem "growl"
-  gem "guard"
-  gem "guard-rspec"
+  gem "growl", "~> 1.0"
+  gem "guard", "~> 1.6"
+  gem "guard-rspec", "~> 2.3"
 
   gem "jeweler", "~> 1.8.3"
 
-  gem "rdoc"
-  gem "rspec"
-  gem "rb-fsevent"
+  gem "rdoc", "~> 3.12"
+  gem "rspec", "~> 2.12"
+  gem "rb-fsevent", "~> 0.9"
 
-  gem "simplecov"
-  gem "simplecov-csv"
+  gem "simplecov", "~> 0.7"
+  gem "simplecov-csv", "~> 0.1"
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/scad4r/runner.rb

@@ -1,3 +1,5 @@
+require 'childprocess'
+
 module Scad4r
   class Runner
     class PassThrough
@@ -21,17 +23,34 @@ module Scad4r
       # provide a reasonable default
       net_options = {output: output_file(path, net_options)}.merge(net_options)
 
-      io = IO.popen(openscad_invocation(path, net_options))
+      io = shell_out(openscad_invocation(path, net_options))
 
       result_hash = parser.parse io.read
 
       result_hash.merge({output: net_options.fetch(:output)})
     end
 
+    protected
+
+    def shell_out(*cmd)
+      r, w = pipes
+      process = ChildProcess.build(*cmd)
+      process.io.stdout = process.io.stderr = w
+      process.start
+      w.close
+      process.wait # to do, stream progress
+
+      r
+    end
+
     private
 
+    def pipes
+      IO.pipe
+    end
+
     def openscad_invocation(path, options)
-      [*openscad_command(options),*runtime_arguments(path, options), err: [:child, :out]]
+      [*openscad_command(options),*runtime_arguments(path, options)]
     end
 
     def openscad_command(options)

data/scad4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "scad4r"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caleb Buxton"]
-  s.date = "2013-01-26"
+  s.date = "2013-02-18"
   s.description = "Provides Ruby affordances for scripting OpenSCAD"
   s.email = "me@cpb.ca"
   s.extra_rdoc_files = [
@@ -52,39 +52,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<growl>, [">= 0"])
-      s.add_development_dependency(%q<guard>, [">= 0"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<childprocess>, ["~> 0.3"])
+      s.add_development_dependency(%q<growl>, ["~> 1.0"])
+      s.add_development_dependency(%q<guard>, ["~> 1.6"])
+      s.add_development_dependency(%q<guard-rspec>, ["~> 2.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov-csv>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12"])
+      s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.7"])
+      s.add_development_dependency(%q<simplecov-csv>, ["~> 0.1"])
     else
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<growl>, [">= 0"])
-      s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_dependency(%q<childprocess>, ["~> 0.3"])
+      s.add_dependency(%q<growl>, ["~> 1.0"])
+      s.add_dependency(%q<guard>, ["~> 1.6"])
+      s.add_dependency(%q<guard-rspec>, ["~> 2.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<simplecov-csv>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<rspec>, ["~> 2.12"])
+      s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_dependency(%q<simplecov>, ["~> 0.7"])
+      s.add_dependency(%q<simplecov-csv>, ["~> 0.1"])
     end
   else
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<growl>, [">= 0"])
-    s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_dependency(%q<childprocess>, ["~> 0.3"])
+    s.add_dependency(%q<growl>, ["~> 1.0"])
+    s.add_dependency(%q<guard>, ["~> 1.6"])
+    s.add_dependency(%q<guard-rspec>, ["~> 2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rb-fsevent>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<simplecov-csv>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<rspec>, ["~> 2.12"])
+    s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+    s.add_dependency(%q<simplecov>, ["~> 0.7"])
+    s.add_dependency(%q<simplecov-csv>, ["~> 0.1"])
   end
 end
 

data/spec/lib/scad4r/runner_spec.rb

@@ -26,13 +26,13 @@ module Scad4r
         end
 
         it "returns a hash describing the result" do
-          IO.stub(:popen).and_return(StringIO.new)
+          subject.stub(:shell_out).and_return(StringIO.new)
           subject.run(passed_file).should be_a(Hash)
         end
 
         describe "result hash" do
           before do
-            IO.stub(:popen).and_return(StringIO.new)
+            subject.stub(:shell_out).and_return(StringIO.new)
           end
 
           let(:parser) {

data/spec/support/openscad_execution_matcher.rb

@@ -1,11 +1,28 @@
 module OpenscadExecutionMatcher
   extend RSpec::Matchers::DSL
 
+  def childprocess_double
+    double("ChildProcess", start: true, wait: true,
+          io: double("IO", "stdout=" => true, "stderr=" => true))
+  end
+
+  def write_pipe_double
+    double("write pipe", close: true)
+  end
+
+  def read_pipe_double(result)
+    StringIO.new(result || "")
+  end
+
   matcher :run_openscad do |expected_openscad_command="openscad" |
     @expected_openscad_invocation = Array(expected_openscad_command)
 
     match do |openscad_runner|
-      IO.should_receive(:popen) do |arguments|
+
+      openscad_runner.stub(:pipes).and_return([
+        read_pipe_double(@mock_result),write_pipe_double])
+
+      ChildProcess.should_receive(:build) do |arguments|
         options = arguments.pop if arguments.last.is_a?(Hash)
 
         arguments.shift(@expected_openscad_invocation.length).should eql(@expected_openscad_invocation)
@@ -16,7 +33,7 @@ module OpenscadExecutionMatcher
 
         arguments.last.should eql(@expected_input_file)
 
-        StringIO.new(@mock_result||"")
+        childprocess_double
       end
     end
 

metadata

@@ -2,79 +2,79 @@
 name: scad4r
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Caleb Buxton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  name: bundler
+        version: '0.3'
+  name: childprocess
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   name: growl
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   name: guard
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   name: guard-rspec
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,81 +96,81 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   name: rdoc
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   name: rspec
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   name: rb-fsevent
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   name: simplecov
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   name: simplecov-csv
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: Provides Ruby affordances for scripting OpenSCAD
 email: me@cpb.ca
 executables: []
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2031449955225607489
+      hash: -3905703001506090554
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false