SimControl 0.1.3 → 0.1.4

data/Gemfile.lock

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

data/lib/SimControl/environments/base.rb

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

data/lib/SimControl/scenario.rb

@@ -6,19 +6,19 @@ module SimControl
         args.pop
       end
       @commands = args
-      @options = options
+      @options = options || {}
     end
 
-    def options
-      @options.map { |k, v| "--#{ k } #{ v }" }.join " "
+    def options(other_options = {})
+      other_options.merge(@options).map { |k, v| "--#{ k } #{ v }" }.join " "
     end
 
     def commands
       @commands.join(" ").strip
     end
 
-    def args
-      [commands, options].join " "
+    def args(other_options = {})
+      [commands, options(other_options)].join(" ").strip
     end
   end
 end

data/lib/SimControl/version.rb

@@ -1,3 +1,3 @@
 module SimControl
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/environments/base_environment_spec.rb

@@ -3,29 +3,11 @@ require "spec_helper"
 describe SimControl::BaseEnvironment do
   describe "#simulate" do
     it "calls #execute for each seed" do
+      scenario = double("scenario")
+      scenario.should_receive(:args).with(seed: 1)
+      scenario.should_receive(:args).with(seed: 2)
       subject.should_receive(:execute).twice
-      subject.simulate({}, [1, 2])
-    end
-
-    it "injects the seed in the arguments hash" do
-      subject.should_receive(:execute) do |args|
-        expect(args[:seed]).to eq(1)
-      end
-
-      subject.should_receive(:execute) do |args|
-        expect(args[:seed]).to eq(2)
-      end
-
-      subject.simulate({}, [1, 2])
-    end
-
-    it "keeps the arguments hash" do
-      subject.should_receive(:execute) do |args|
-        expect(args[:foo]).to eq("bar")
-      end
-
-      subject.simulate({foo: "bar"}, [1])
-
+      subject.simulate(scenario, [1, 2])
     end
   end
 end

data/spec/scenario_spec.rb

@@ -15,4 +15,9 @@ describe SimControl::Scenario do
     scenario = SimControl::Scenario.new "foo", "bar", baz: "1", qux: 2
     expect(scenario.args).to eq("foo bar --baz 1 --qux 2")
   end
+
+  it "merges options passed to args in the options" do
+    scenario = SimControl::Scenario.new
+    expect(scenario.args(seed: 1)).to eq("--seed 1")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SimControl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -189,12 +189,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1705226376190038330
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1705226376190038330
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23