SimControl 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    SimControl (0.1.0)
+    SimControl (0.1.2)
       active_support
       i18n
       thor
@@ -15,7 +15,7 @@ GEM
     coderay (1.0.9)
     diff-lcs (1.2.4)
     fakefs (0.4.2)
-    i18n (0.6.4)
+    i18n (0.6.5)
     method_source (0.8.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)

data/lib/SimControl/environments/python.rb

@@ -1,3 +1,5 @@
+require "open3"
+
 module SimControl
   class PythonEnvironment < BaseEnvironment
     def initialize(script, args = {})
@@ -7,10 +9,25 @@ module SimControl
       raise "passing a virtualenv requires an interpreter" if @virtualenv and not @interpreter
     end
 
+    def script
+      @script
+    end
+
+    def args(scenario)
+      scenario.map { |k, v| "--#{ k } #{ v }" }.join " "
+    end
+
     def execute(scenario)
-      args = scenario.map { |k, v| "--#{ k } #{ v }" }.join " "
-      command = [interpreter, @script, args].reject(&:nil?).reject(&:empty?).join " "
-      `#{ command }`
+      stdin, stout, stderr, thread = Open3.popen3 command(scenario), chdir: basedir
+      thread.join
+    end
+
+    def basedir
+      File.dirname @script
+    end
+
+    def command(scenario)
+      [interpreter, script, args(scenario)].reject(&:nil?).reject(&:empty?).join " "
     end
 
     def interpreter

data/lib/SimControl/version.rb

@@ -1,3 +1,3 @@
 module SimControl
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/environments/python_environment_spec.rb

@@ -1,30 +1,48 @@
 require "spec_helper"
 
+require "open3"
+
 describe SimControl::PythonEnvironment do
   let(:script) { "a-script" }
   describe "#simulate" do
+    it "uses popen3 to call the command and sets the cwd" do
+      command = "a-command"
+      basedir = "a-basedir"
+      thread = double("Thread")
+      
+      simulation = SimControl::PythonEnvironment.new script
+      simulation.stub(:command).and_return(command)
+      simulation.stub(:basedir).and_return(basedir)
+      Open3.should_receive(:popen3).with(command, chdir: basedir).and_return([nil, nil, nil, thread])
+      thread.should_receive(:join)
+      simulation.execute(foo: 1)
+    end
+
     it "calls the script if nothing is passed in args" do
       simulation = SimControl::PythonEnvironment.new script
-      simulation.should_receive(:`).with(script)
-      simulation.execute({})
+      expect(simulation.script).to eq("a-script")
     end
 
     it "passes args to the script in -- syntax" do
       simulation = SimControl::PythonEnvironment.new script
-      simulation.should_receive(:`).with("#{ script } --foo bar --baz 1")
-      simulation.execute({foo: "bar", baz: 1})
+      expect(simulation.args({foo: "bar", baz: 1})).to eq("--foo bar --baz 1")
     end
 
     it "uses a given interpreter" do
       simulation = SimControl::PythonEnvironment.new script, interpreter: "pypy"
-      simulation.should_receive(:`).with("pypy #{ script }")
-      simulation.execute({})
+      expect(simulation.interpreter).to eq("pypy")
     end
 
     it "uses a given virtualenv and interpreter" do
       simulation = SimControl::PythonEnvironment.new script, virtualenv: "foo/bar",  interpreter: "pypy"
-      simulation.should_receive(:`).with("foo/bar/bin/pypy #{ script }")
-      simulation.execute({})
+      expect(simulation.interpreter).to eq("foo/bar/bin/pypy")
+    end
+    
+    it "composes the command" do
+      simulation = SimControl::PythonEnvironment.new script
+      simulation.stub(:args).and_return "--args 1"
+      simulation.stub(:interpreter).and_return "/foo/jpython"
+      expect(simulation.command(args: 1)).to eq("/foo/jpython a-script --args 1")
     end
 
     it "raised an exception is a virtualenv is passed but no interpreter" do
@@ -32,6 +50,11 @@ describe SimControl::PythonEnvironment do
         SimControl::PythonEnvironment.new script, virtualenv: "foo/bar"
       end.to raise_error /passing a virtualenv requires an interpreter/
     end
+
+    it "returns the basedir" do
+      simulation = SimControl::PythonEnvironment.new "/foo/bar/sim.py"
+      expect(simulation.basedir).to eq("/foo/bar")
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SimControl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor