SimControl 0.1.4 → 0.1.5

data/lib/SimControl/environments/python.rb

@@ -13,10 +13,6 @@ module SimControl
       @script
     end
 
-    def args(scenario)
-      scenario.args
-    end
-
     def execute(scenario)
       stdin, stout, stderr, thread = Open3.popen3 command(scenario), chdir: basedir
       thread.join
@@ -27,7 +23,7 @@ module SimControl
     end
 
     def command(scenario)
-      [interpreter, script, args(scenario)].reject(&:nil?).reject(&:empty?).join " "
+      [interpreter, script, scenario].reject(&:nil?).reject(&:empty?).join " "
     end
 
     def interpreter

data/lib/SimControl/scenario.rb

@@ -18,7 +18,7 @@ module SimControl
     end
 
     def args(other_options = {})
-      [commands, options(other_options)].join(" ").strip
+      [options(other_options), commands].join(" ").strip
     end
   end
 end

data/lib/SimControl/version.rb

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

data/spec/environments/python_environment_spec.rb

@@ -35,8 +35,7 @@ describe SimControl::PythonEnvironment do
     
     it "composes the command" do
       simulation = SimControl::PythonEnvironment.new script
-      scenario = double("scenario")
-      scenario.should_receive(:args).and_return("--args 1")
+      scenario = "--args 1"
       simulation.stub(:interpreter).and_return "/foo/jpython"
       expect(simulation.command(scenario)).to eq("/foo/jpython a-script --args 1")
     end

data/spec/scenario_spec.rb

@@ -13,7 +13,7 @@ describe SimControl::Scenario do
 
   it "generates the complete arguments string" do
     scenario = SimControl::Scenario.new "foo", "bar", baz: "1", qux: 2
-    expect(scenario.args).to eq("foo bar --baz 1 --qux 2")
+    expect(scenario.args).to eq("--baz 1 --qux 2 foo bar")
   end
 
   it "merges options passed to args in the options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SimControl
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -189,18 +189,12 @@ 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