omf_ec 6.1.4.pre.1 → 6.1.4.pre.2

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -3,6 +3,9 @@ source "http://rubygems.org"
3
3
  # Specify your gem's dependencies in omf_ec.gemspec
4
4
  gemspec
5
5
 
6
+ gem 'omf_common', path: "../omf_common"
7
+ gem 'blather'
8
+
6
9
  group :test do
7
10
  gem 'rake'
8
11
  end
@@ -14,7 +14,7 @@ logging:
14
14
  date_pattern: "%H:%M:%S"
15
15
  pattern: "%d %5l %c{2}: %m\n"
16
16
  # To turn colour on use color_scheme: default
17
- color_scheme: none
17
+ color_scheme: default
18
18
  # To Rolling log file, and log everything
19
19
  rolling_file:
20
20
  level: all
@@ -27,4 +27,4 @@ logging:
27
27
  pattern: "[%d] %-5l %c: %m\n"
28
28
 
29
29
  # Use OML server located at localhost port 3003
30
- oml_uri: tcp:localhost:3003
30
+ #oml_uri: tcp:localhost:3003
@@ -74,8 +74,8 @@ module OmfEc
74
74
  res[key].uniq!
75
75
  elsif value.kind_of? Hash
76
76
  # Merge hash values
77
- res[key] ||= {}
78
- res[key].merge(value)
77
+ res[key] ||= Hashie::Mash.new
78
+ res[key].merge!(value)
79
79
  else
80
80
  # Overwrite otherwise
81
81
  res[key] = value
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omf_ec
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.4.pre.1
4
+ version: 6.1.4.pre.2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - '='
100
100
  - !ruby/object:Gem::Version
101
- version: 6.1.4.pre.1
101
+ version: 6.1.4.pre.2
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - '='
108
108
  - !ruby/object:Gem::Version
109
- version: 6.1.4.pre.1
109
+ version: 6.1.4.pre.2
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: sequel
112
112
  requirement: !ruby/object:Gem::Requirement