uispecrunner 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/uispecrunner/application.rb

@@ -20,7 +20,7 @@ class UISpecRunner
       options_file = 'uispec.opts'
       if File.exists?(options_file)
         option_file_args = File.readlines(options_file).map {|l| l.chomp.split " "}.flatten
-        options = options.merge(UISpecRunner::Options.new(option_file_args))
+        options = UISpecRunner::Options.new(option_file_args).merge(options)
       end
       
       runner = UISpecRunner.new(options)

data/uispecrunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uispecrunner}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Watters"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Blake Watters