empezar 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -35,4 +35,17 @@ Scenario: App with some arguments
35
35
  And I should have 'more' with value 34 in Configuration
36
36
  And I should have 8080 in 'port' in 'client'
37
37
  And I should have "localhost" in 'host' in 'client'
38
- And I should have "/" in 'path' in 'client'
38
+ And I should have "/" in 'path' in 'client'
39
+
40
+ @clean
41
+ Scenario: Arguments override config file
42
+ Given the config file "config/main.yaml"
43
+ """
44
+ data: 70
45
+ """
46
+ And the command line arguments
47
+ """
48
+ data:89
49
+ """
50
+ When I start the runner
51
+ Then I should have 'data' with value 89 in Configuration
@@ -10,7 +10,8 @@ module Empezar
10
10
  raise ConfigurationFileMissingException, "The configuration file is missing from '#{config_file}'"
11
11
  end
12
12
  Empezar::Configuration.instance.merge! SymbolMatrix.new config_file
13
- Empezar::Configuration.instance.recursive_merge! SymbolMatrix.new arguments.join " "
13
+ Empezar::Configuration.instance
14
+ .recursive_merge! SymbolMatrix.new(arguments.join(" ")), true
14
15
  end
15
16
 
16
17
  def self.start_logger log_file, stdout
@@ -1,3 +1,3 @@
1
1
  module Empezar
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.1"
3
3
  end
@@ -135,7 +135,7 @@ describe Empezar::Runner do
135
135
  SymbolMatrix.should_receive(:new).with(@joined_args)
136
136
  .and_return @extra_data
137
137
  Empezar::Configuration.instance.should_receive(:recursive_merge!)
138
- .with @extra_data
138
+ .with @extra_data, true
139
139
 
140
140
  Empezar::Runner
141
141
  .start_configuration 'config/main.yaml', @arguments
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: empezar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-19 00:00:00.000000000 Z
12
+ date: 2012-12-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: symbolmatrix