SimControl 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    SimControl (0.1.5)
+    SimControl (0.1.6)
       active_support
       i18n
       thor

data/lib/SimControl/controller.rb

@@ -50,7 +50,7 @@ module SimControl
     end
 
     def simulation(klass, script, arguments)
-      @current_simulation = klass.new script, arguments
+      @current_simulation = klass.new script, @results_directory, arguments
     end
 
     def seeds

data/lib/SimControl/environments/base.rb

@@ -1,8 +1,12 @@
 module SimControl
   class BaseEnvironment
+    def initialize(results_path)
+      @results_path = results_path
+    end
+
     def simulate(scenario, seeds)
       seeds.each do |seed|
-        execute(scenario.args({seed: seed}))
+        execute(scenario.args({seed: seed, results: @results_path}))
       end
     end
   end

data/lib/SimControl/environments/python.rb

@@ -2,7 +2,8 @@ require "open3"
 
 module SimControl
   class PythonEnvironment < BaseEnvironment
-    def initialize(script, args = {})
+    def initialize(script, results_directory, args = {})
+      super(results_directory)
       @script = script
       @interpreter = args.delete(:interpreter)
       @virtualenv = args.delete(:virtualenv)

data/lib/SimControl/version.rb

@@ -1,3 +1,3 @@
 module SimControl
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/controller_spec.rb

@@ -55,11 +55,12 @@ scenario
 
   describe "#simulation" do
     let(:klass) { double("Klass") }
-    it "creates a new instance of the given class and passes the hash" do
+    it "creates a new instance of the given class and passes the hash, and the results directory" do
       script = "a-script"
       hash = double("Hash")
-      instance = SimControl::Controller.new("", "", "", "")
-      klass.should_receive(:new).with(script, hash)
+      results_directory = "results/scenario_name"
+      instance = SimControl::Controller.new("", "", "", results_directory)
+      klass.should_receive(:new).with(script, results_directory, hash)
       instance.simulation klass, script, hash
     end
 

data/spec/environments/base_environment_spec.rb

@@ -3,11 +3,20 @@ require "spec_helper"
 describe SimControl::BaseEnvironment do
   describe "#simulate" do
     it "calls #execute for each seed" do
+      environment = SimControl::BaseEnvironment.new ""
       scenario = double("scenario")
-      scenario.should_receive(:args).with(seed: 1)
-      scenario.should_receive(:args).with(seed: 2)
-      subject.should_receive(:execute).twice
-      subject.simulate(scenario, [1, 2])
+      scenario.should_receive(:args).with(seed: 1, results: "")
+      scenario.should_receive(:args).with(seed: 2, results: "")
+      environment.should_receive(:execute).twice
+      environment.simulate(scenario, [1, 2])
+    end
+
+    it "the results directory is merged in the scenario" do
+      scenario = double("scenario")
+      scenario.should_receive(:args).with(seed: 1, results: "path")
+      environment = SimControl::BaseEnvironment.new "path"
+      environment.stub(:execute)
+      environment.simulate scenario, [1]
     end
   end
 end

data/spec/environments/python_environment_spec.rb

@@ -10,7 +10,7 @@ describe SimControl::PythonEnvironment do
       basedir = "a-basedir"
       thread = double("Thread")
       
-      simulation = SimControl::PythonEnvironment.new script
+      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])
@@ -19,22 +19,22 @@ describe SimControl::PythonEnvironment do
     end
 
     it "calls the script if nothing is passed in args" do
-      simulation = SimControl::PythonEnvironment.new script
+      simulation = SimControl::PythonEnvironment.new script, ""
       expect(simulation.script).to eq("a-script")
     end
 
     it "uses a given interpreter" do
-      simulation = SimControl::PythonEnvironment.new script, interpreter: "pypy"
+      simulation = SimControl::PythonEnvironment.new script, "", interpreter: "pypy"
       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 = SimControl::PythonEnvironment.new script, "", virtualenv: "foo/bar",  interpreter: "pypy"
       expect(simulation.interpreter).to eq("foo/bar/bin/pypy")
     end
     
     it "composes the command" do
-      simulation = SimControl::PythonEnvironment.new script
+      simulation = SimControl::PythonEnvironment.new script, ""
       scenario = "--args 1"
       simulation.stub(:interpreter).and_return "/foo/jpython"
       expect(simulation.command(scenario)).to eq("/foo/jpython a-script --args 1")
@@ -42,12 +42,12 @@ describe SimControl::PythonEnvironment do
 
     it "raised an exception is a virtualenv is passed but no interpreter" do
       expect do
-        SimControl::PythonEnvironment.new script, virtualenv: "foo/bar"
+        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"
+      simulation = SimControl::PythonEnvironment.new "/foo/bar/sim.py", ""
       expect(simulation.basedir).to eq("/foo/bar")
     end
   end

metadata

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