lib/SimControl/scenario.rb in SimControl-0.1.3 vs lib/SimControl/scenario.rb in SimControl-0.1.4

@@ -4,21 +4,21 @@
       options = Hash.try_convert(args.last)
       if options
         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