onering-client 0.0.82 → 0.0.83

data/lib/onering/api.rb

@@ -89,7 +89,7 @@ module Onering
     end
 
     # set API connectivity details
-      Onering::API.base_uri Onering::Config.get(:url, DEFAULT_BASE)
+      Onering::API.base_uri(options.get('config.url', Onering::Config.get(:url, DEFAULT_BASE)))
 
     # add default parameters
       options.get('config.params',{}).each do |k,v|

data/lib/onering/cli/version.rb

@@ -1,5 +1,5 @@
 module Onering
   module CLI
-    VERSION = "0.0.82"
+    VERSION = "0.0.83"
   end
 end

data/lib/onering/config.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'hashlib'
 
 module Onering
@@ -21,9 +22,13 @@ module Onering
 
       # merge all config files with more-specific values overriding less-specific ones
         @_config ||= DEFAULT_CONFIG
-        @_configfiles.each do |i|
+        @_configfiles_seen ||= Set.new()
+
+      # only load files we haven't seen before
+        (@_configfiles - @_configfiles_seen.to_a).each do |i|
           c = YAML.load(File.read(File.expand_path(i))) rescue {}
           @_config.deep_merge!(c)
+          @_configfiles_seen << i
         end
 
       # settings specified in the library override everything

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.82
+  version: 0.0.83
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10686340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+  version_requirements: *10686340
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10685860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10685860
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10685360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,31 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10685360
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10684900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+  version_requirements: *10684900
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10684420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: 0.0.25
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.25
+  version_requirements: *10684420
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10700360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10700360
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10699860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10699860
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10699400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10699400
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10698940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10698940
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -162,22 +117,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/onering/config.rb
+- lib/onering.rb
 - lib/onering/cli.rb
-- lib/onering/plugins/devices.rb
-- lib/onering/plugins/reporter.rb
+- lib/onering/config.rb
+- lib/onering/api.rb
+- lib/onering/util.rb
 - lib/onering/plugins/authentication.rb
+- lib/onering/plugins/reporter.rb
+- lib/onering/plugins/devices.rb
 - lib/onering/plugins/automation.rb
-- lib/onering/cli/devices.rb
 - lib/onering/cli/reporter.rb
-- lib/onering/cli/config.rb
-- lib/onering/cli/fact.rb
 - lib/onering/cli/version.rb
+- lib/onering/cli/devices.rb
+- lib/onering/cli/config.rb
 - lib/onering/cli/automation.rb
+- lib/onering/cli/fact.rb
 - lib/onering/cli/call.rb
-- lib/onering/api.rb
-- lib/onering/util.rb
-- lib/onering.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []
@@ -199,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering client API and utilities