empezar 0.3.0 → 0.3.1

data/features/starting_up.feature

@@ -35,4 +35,17 @@ Scenario: App with some arguments
   And I should have 'more' with value 34 in Configuration
   And I should have 8080 in 'port' in 'client'
   And I should have "localhost" in 'host' in 'client'
-  And I should have "/" in 'path' in 'client'
+  And I should have "/" in 'path' in 'client'
+
+@clean
+Scenario: Arguments override config file
+  Given the config file "config/main.yaml"
+  """
+  data: 70
+  """
+  And the command line arguments
+  """
+  data:89
+  """
+  When I start the runner
+  Then I should have 'data' with value 89 in Configuration

data/lib/empezar/runner.rb

@@ -10,7 +10,8 @@ module Empezar
         raise ConfigurationFileMissingException, "The configuration file is missing from '#{config_file}'"
       end
       Empezar::Configuration.instance.merge! SymbolMatrix.new config_file
-      Empezar::Configuration.instance.recursive_merge! SymbolMatrix.new arguments.join " "
+      Empezar::Configuration.instance
+        .recursive_merge! SymbolMatrix.new(arguments.join(" ")), true
     end
 
     def self.start_logger log_file, stdout

data/lib/empezar/version.rb

@@ -1,3 +1,3 @@
 module Empezar
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/empezar/runner_spec.rb

@@ -135,7 +135,7 @@ describe Empezar::Runner do
         SymbolMatrix.should_receive(:new).with(@joined_args)
           .and_return @extra_data
         Empezar::Configuration.instance.should_receive(:recursive_merge!)
-          .with @extra_data
+          .with @extra_data, true
 
         Empezar::Runner
           .start_configuration 'config/main.yaml', @arguments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: empezar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symbolmatrix