cmdb 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df72629dd0ba9fcb24a33607ca6216e9a70ff188
-  data.tar.gz: 2daf8320e35c3cd58234d86b452b8574cc76e944
+  metadata.gz: 445daab93b31128021486ceabe032d190f05ce05
+  data.tar.gz: 195b0efcdbcc98d655f8799c60f3a5b736525a07
 SHA512:
-  metadata.gz: 97c03113ce4aa1c50718edadd6c9649096a22916bf14a16721df59987f56745c8150131a5bbb63d6d6f2c3c9e4db59fff2568f2480e0e3488468400b4cc92253
-  data.tar.gz: 38cc4d3c2701dfc66b2d3f27470851bd14128e5ec4b3548e85fa292daced4d609cb43f4d63746a73e449cd410e78f109ea27f8f822b99e73a0d4a45f4fa6fd7c
+  metadata.gz: e496a30d55cb46eb1bd08c621be5706732c70750a9474d6aca74856757702bd1369f5af4bb22e545b654c631dfb09987d46fa8a6fe1fb863b23a2bd5625c4dd8
+  data.tar.gz: ca6a65077171489c35740f42b8f43bff37a66aa9866629570b90d51a0eaef5655b8b7715edd872ad800f51e2dbd12b38b785f7e0c581a00c88d6ee9e8a2d0074

data/.rubocop.yml

@@ -0,0 +1,35 @@
+# CODING CONVENTIONS
+#  - any cop that can be auto-corrected with `rubocop -a` is mandatory
+#  - other cops may be enabled if committer fixes all issues
+AllCops:
+  Exclude:
+  - features/**/*
+  - spec/**/*
+Style/Encoding:
+  Enabled: true
+Style/FormatString:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/RaiseArgs:
+  Enabled: false
+Style/Semicolon:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,4 @@
+# encoding: utf-8
 source 'https://rubygems.org'
 
 gemspec
@@ -7,9 +8,13 @@ gem 'backticks'
 gem 'cucumber'
 gem 'rspec'
 
+group :test do
+  gem 'rubocop'
+  gem 'webmock'
+end
+
 group :development do
   gem 'yard'
   gem 'pry'
   gem 'pry-byebug'
 end
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cmdb (2.6.0)
+    cmdb (2.6.1)
       diplomat (~> 0.15)
       listen (~> 3.0)
       trollop (~> 2.0)
@@ -9,10 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.4.0)
+    ast (2.2.0)
     backticks (0.4.0)
     builder (3.2.2)
     byebug (8.2.2)
     coderay (1.1.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     cucumber (2.3.2)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
@@ -32,6 +36,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     gherkin (3.2.0)
+    hashdiff (0.3.0)
     json (1.8.3)
     listen (3.0.6)
       rb-fsevent (>= 0.9.3)
@@ -40,6 +45,9 @@ GEM
     multi_json (1.11.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    parser (2.3.0.6)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -47,6 +55,7 @@ GEM
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
+    rainbow (2.1.0)
     rake (10.5.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -64,8 +73,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rubocop (0.37.2)
+      parser (>= 2.3.0.4, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 0.3)
+    ruby-progressbar (1.7.5)
+    safe_yaml (1.0.4)
     slop (3.6.0)
     trollop (2.1.2)
+    unicode-display_width (0.3.1)
+    webmock (1.24.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
     yard (0.8.7.6)
 
 PLATFORMS
@@ -80,6 +102,8 @@ DEPENDENCIES
   pry-byebug
   rake
   rspec
+  rubocop
+  webmock
   yard
 
 BUNDLED WITH

data/Rakefile

@@ -2,16 +2,16 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'cucumber/rake/task'
-desc "Run functional tests"
+desc 'Run functional tests'
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--color --format pretty}
+  t.cucumber_opts = %w(--color --format pretty)
 end
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [:spec, :cucumber]
+task default: [:spec, :cucumber]

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-require "bundler/setup"
-require "cmdb"
+require 'bundler/setup'
+require 'cmdb'
 
-require "pry"
+require 'pry'
 Pry.start

data/cmdb.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['RightScale']
   spec.email         = ['rubygems@rightscale.com']
 
-  spec.summary       = %q{Command-line tool for configuration manegement databases}
-  spec.description   = %q{Reads CMDB variables from files, Consul, and elsewhere.}
+  spec.summary       = 'Command-line tool for configuration manegement databases'
+  spec.description   = 'Reads CMDB variables from files, Consul, and elsewhere.'
   spec.homepage      = 'https://github.com/rightscale/cmdb'
   spec.license       = 'MIT'
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new("~> 2.0")
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.0')
 
   spec.add_dependency 'listen', '~> 3.0'
   spec.add_dependency 'diplomat', '~> 0.15'

data/exe/cmdb

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rubygems'
 require 'trollop'
+
 require 'cmdb'
+require 'cmdb/commands'
 
-if gemspec = Gem.loaded_specs['cmdb']
+if (gemspec = Gem.loaded_specs['cmdb'])
   gemspec_version = gemspec.version
 else
   require_relative '../lib/cmdb/version'
@@ -39,7 +42,7 @@ To get help on a command:
   stop_on commands.keys
 end
 
-opts = Trollop::with_standard_exception_handling p do
+Trollop.with_standard_exception_handling p do
   raise Trollop::HelpNeeded if ARGV.empty?
   p.parse ARGV
   cmd = ARGV.shift
@@ -48,6 +51,6 @@ opts = Trollop::with_standard_exception_handling p do
   if klass
     klass.create.run
   else
-    raise ArgumentError, "Unrecognized command #{cmd}"
+    raise(ArgumentError, "Unrecognized command #{cmd}")
   end
 end

data/fixtures/Gemfile

@@ -1,3 +1,4 @@
+# encoding: utf-8
 source 'https://rubygems.org'
 
 gem 'sinatra', '~> 1.3'

data/fixtures/app/widgets.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 get '/widgets' do
   headers 'Content-Type' => 'application/json; charset=utf-8'
   [200, '[]']

data/fixtures/config.ru

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rubygems'
 require 'bundler/setup'
 require 'sinatra'
@@ -24,6 +25,6 @@ if ENV['DIE_DIE_DIE']
   puts "I am dying as requested by ENV['DIE_DIE_DIE']"
   exit(42)
 else
-  puts "I am up and running"
+  puts 'I am up and running'
   run Sinatra::Application
 end

data/lib/cmdb/commands/help.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'logger'
 require 'listen'
 
@@ -31,45 +32,46 @@ cmdb shim [options] -- <command_to_exec> [options_for_command]
 Where [options] are selected from:
         EOS
         opt :dir,
-            "Directory to scan for key-replacement tokens in data files",
-            :type => :string
+            'Directory to scan for key-replacement tokens in data files',
+            type: :string
         opt :consul_url,
-            "The URL for talking to consul",
-            :type => :string
+            'The URL for talking to consul',
+            type: :string
         opt :consul_prefix,
-            "The prefix to use when getting keys from consul, can be specified more than once",
-            :type => :string,
-            :multi => true
+            'The prefix to use when getting keys from consul, can be specified more than once',
+            type: :string,
+            multi: true
         opt :keys,
-            "Override search path(s) for CMDB key files",
-            :type => :strings
+            'Override search path(s) for CMDB key files',
+            type: :strings
         opt :pretend,
-            "Check for errors, but do not actually launch the app or rewrite files",
-            :default => false
+            'Check for errors, but do not actually launch the app or rewrite files',
+            default: false
         opt :quiet,
             "Don't print any output",
-            :default => false
+            default: false
         opt :reload,
-            "CMDB key that enables reload-on-edit",
-            :type => :string
+            'CMDB key that enables reload-on-edit',
+            type: :string
         opt :reload_signal,
-            "Signal to send to app server when code is edited",
-            :type => :string,
-            :default => "HUP"
+            'Signal to send to app server when code is edited',
+            type: :string,
+            default: 'HUP'
         opt :env,
             "Add CMDB keys to the app server's process environment",
-            :default => false
+            default: false
         opt :user,
-            "Switch to named user before executing app",
-            :type => :string
+            'Switch to named user before executing app',
+            type: :string
         opt :root,
-            "Promote named subkey to the root when it is present in a namespace",
-            :type => :string
+            'Promote named subkey to the root when it is present in a namespace',
+            type: :string
       end
 
-      self.new(ARGV, options)
+      new(ARGV, options)
     end
 
-
+    def run
+    end
   end
 end

data/lib/cmdb/commands/shim.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'logger'
 require 'listen'
 
@@ -31,43 +32,43 @@ cmdb shim [options] -- <command_to_exec> [options_for_command]
 Where [options] are selected from:
         EOS
         opt :dir,
-            "Directory to scan for key-replacement tokens in data files",
-            :type => :string
+            'Directory to scan for key-replacement tokens in data files',
+            type: :string
         opt :consul_url,
-             "The URL for talking to consul",
-             :type => :string
+            'The URL for talking to consul',
+            type: :string
         opt :consul_prefix,
-             "The prefix to use when getting keys from consul, can be specified more than once",
-             :type => :string,
-             :multi => true
+            'The prefix to use when getting keys from consul, can be specified more than once',
+            type: :string,
+            multi: true
         opt :keys,
-            "Override search path(s) for CMDB key files",
-            :type => :strings
+            'Override search path(s) for CMDB key files',
+            type: :strings
         opt :pretend,
-            "Check for errors, but do not actually launch the app or rewrite files",
-            :default => false
+            'Check for errors, but do not actually launch the app or rewrite files',
+            default: false
         opt :quiet,
             "Don't print any output",
-            :default => false
+            default: false
         opt :reload,
-            "CMDB key that enables reload-on-edit",
-            :type => :string
+            'CMDB key that enables reload-on-edit',
+            type: :string
         opt :reload_signal,
-            "Signal to send to app server when code is edited",
-            :type => :string,
-            :default => "HUP"
+            'Signal to send to app server when code is edited',
+            type: :string,
+            default: 'HUP'
         opt :env,
             "Add CMDB keys to the app server's process environment",
-            :default => false
+            default: false
         opt :user,
-            "Switch to named user before executing app",
-          :type => :string
+            'Switch to named user before executing app',
+            type: :string
         opt :root,
-            "Promote named subkey to the root when it is present in a namespace",
-          :type => :string
+            'Promote named subkey to the root when it is present in a namespace',
+            type: :string
       end
 
-      self.new(ARGV, options)
+      new(ARGV, options)
     end
 
     # Irrevocably change the current user for this Unix process by calling the
@@ -90,7 +91,7 @@ Where [options] are selected from:
     # Create a Shim.
     # @param [Array] command collection of string to pass to Kernel#exec; 0th element is the command name
     # @options [String] :condif_dir
-    def initialize(command, options={})
+    def initialize(command, options = {})
       @command         = command
       @dir             = options[:dir]
       @consul_url      = options[:consul_url]
@@ -103,32 +104,26 @@ Where [options] are selected from:
       @user            = options[:user]
       @root            = options[:root]
 
-      unless @keys.empty?
-        CMDB::FileSource.base_directories = @keys
-      end
-      unless @consul_url.nil?
-        CMDB::ConsulSource.url = @consul_url
-      end
+      CMDB::FileSource.base_directories = @keys unless @keys.empty?
+      CMDB::ConsulSource.url = @consul_url unless @consul_url.nil?
       if !@consul_prefixes.nil? && !@consul_prefixes.empty?
         CMDB::ConsulSource.prefixes = @consul_prefixes
       end
 
-      if options[:quiet]
-        CMDB.log.level = Logger::FATAL
-      end
+      CMDB.log.level = Logger::FATAL if options[:quiet]
     end
 
     # Run the shim.
     #
     # @raise [SystemExit] if something goes wrong
     def run
-      @cmdb = CMDB::Interface.new(:root=>@root)
+      @cmdb = CMDB::Interface.new(root: @root)
 
       rewrote   = rewrite_files
       populated = populate_environment
 
-      if (!rewrote && !populated && !@pretend && @command.empty?)
-        CMDB.log.warn "CMDB: nothing to do; please specify --dir, --env, or a command to run"
+      if !rewrote && !populated && !@pretend && @command.empty?
+        CMDB.log.warn 'CMDB: nothing to do; please specify --dir, --env, or a command to run'
         exit 7
       end
 
@@ -170,7 +165,7 @@ Where [options] are selected from:
 
       CMDB.log.info 'Starting rewrite of configuration...'
 
-      rewriter  = CMDB::Rewriter.new(@dir)
+      rewriter = CMDB::Rewriter.new(@dir)
 
       total = rewriter.rewrite(@cmdb)
 
@@ -178,7 +173,7 @@ Where [options] are selected from:
         missing = rewriter.missing_keys.map { |k| "  #{k}" }.join("\n")
         CMDB.log.error "Cannot rewrite configuration; #{rewriter.missing_keys.size} missing keys:\n#{missing}"
 
-        exit -rewriter.missing_keys.size
+        exit(-rewriter.missing_keys.size)
       end
 
       report_rewrite(total)
@@ -236,7 +231,7 @@ Where [options] are selected from:
         exec_app
       end
 
-      CMDB.log.info("App (pid %d) has been forked; watching %s" % [pid, ::Dir.pwd])
+      CMDB.log.info('App (pid %d) has been forked; watching %s' % [pid, ::Dir.pwd])
 
       t0 = Time.at(0)
 
@@ -250,39 +245,39 @@ Where [options] are selected from:
           dt = Time.now - t0
           if dt > 15
             Process.kill(@signal, pid)
-            CMDB.log.info "Sent SIG%s to app (pid %d) because (modified,created,deleted)=(%d,%d,%d)" %
+            CMDB.log.info 'Sent SIG%s to app (pid %d) because (modified,created,deleted)=(%d,%d,%d)' %
                           [@signal, pid, modified.size, added.size, removed.size]
             t0 = Time.now
           else
-            CMDB.log.error "Skipped SIG%s to app (pid %d) due to timeout (%d)" %
+            CMDB.log.error 'Skipped SIG%s to app (pid %d) due to timeout (%d)' %
                            [@signal, pid, dt]
           end
         rescue
-          CMDB.log.error "Skipped SIG%s to app (pid %d) due to %s" %
-                        [@signal, pid, $!.to_s]
+          CMDB.log.error 'Skipped SIG%s to app (pid %d) due to %s' %
+                         [@signal, pid, $ERROR_INFO.to_s]
         end
       end
 
       listener.start
 
-      wpid, wstatus = nil, nil
+      wpid = nil
+      wstatus = nil
 
       loop do
         begin
           wpid, wstatus = Process.wait2(-1, Process::WNOHANG)
-          if wpid == pid && wstatus.exited?
-            break
-          elsif wpid
-            CMDB.log.info("Descendant (pid %d) has waited with %s" % [wpid, wstatus.inspect])
+          if wpid
+            break if wstatus.exited?
+            CMDB.log.info('Descendant (pid %d) has waited with %s' % [wpid, wstatus.inspect])
           end
         rescue
-          CMDB.log.error "Skipped wait2 to app (pid %d) due to %s" %
-                         [pid, $!.to_s]
+          CMDB.log.error 'Skipped wait2 to app (pid %d) due to %s' %
+                         [pid, $ERROR_INFO.to_s]
         end
         sleep(1)
       end
 
-      CMDB.log.info("App (pid %d) has exited with %s" % [wpid, wstatus.inspect])
+      CMDB.log.info('App (pid %d) has exited with %s' % [wpid, wstatus.inspect])
       listener.stop
       exit(wstatus.exitstatus || 43)
     end

data/lib/cmdb/commands.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module CMDB
   module Commands
   end

data/lib/cmdb/consul_source.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'diplomat'
 
 module CMDB
@@ -5,31 +6,33 @@ module CMDB
     # Regular expression to match array values
     ARRAY_VALUE = /^\[(.*)\]$/
 
-    # The url to communicate with consul
-    @@url = nil
-    # The prefixes to use when getting keys from consul
-    @@prefixes = nil
+    ### Class variables
 
-    def self.url=(url)
-      @@url = url
+    class << self
+      attr_writer :url
     end
 
-    def self.url
-      @@url
+    class << self
+      attr_reader :url
     end
 
-    def self.prefixes=(prefixes)
-      @@prefixes = prefixes
+    class << self
+      attr_writer :prefixes
     end
 
-    def self.prefixes
-      @@prefixes
+    class << self
+      attr_reader :prefixes
     end
 
+    ### Instance variables
+
+    # The url to communicate with consul
+    @url = nil
+
     # Initialize the configuration for consul source
     def initialize(prefix)
       Diplomat.configure do |config|
-        config.url = @@url
+        config.url = self.class.url
       end
       @prefix = prefix
     end
@@ -38,12 +41,14 @@ module CMDB
     def get(key)
       value = Diplomat::Kv.get(dot_to_slash(key))
       process_value(value)
+    rescue TypeError
+      puts 'hi'
     rescue Diplomat::KeyNotFound
       nil
     end
 
     # Not implemented for consul source
-    def each_pair(&block)
+    def each_pair(&_block)
       prefix = @prefix || ''
       all = Diplomat::Kv.get(prefix, recurse: true)
       all.each do |item|
@@ -51,21 +56,23 @@ module CMDB
         dotted_key = item[:key].split('/').join('.')
         key = dotted_prefix == '' ? dotted_key : dotted_key.split("#{dotted_prefix}.").last
         value = process_value(item[:value])
-        puts "Key: #{key}, Value: #{value}"
-        block.call(dotted_key.split("#{dotted_prefix}.").last, process_value(item[:value]))
+        yield(key, value)
       end
     rescue Diplomat::KeyNotFound
+      CMDB.log.warn exc.message
     end
 
     private
 
+    # Lazily parse a value, which may be valid JSON or may be a bare string.
+    # TODO: concat a regexp to match JSONable things
     def process_value(val)
-      return JSON.load(val)
-    rescue Exception
-      return val
+      JSON.load(val)
+    rescue JSON::ParserError
+      val
     end
 
-    # Converts the dotted notation to a slashed notation. If a @@prefix is set, it applies the prefix.
+    # Converts the dotted notation to a slashed notation. If a @prefix is set, it applies the prefix.
     # @example
     #   "common.proxy.endpoints" => common/proxy/endpoints (or) shard403/common/proxy/endpoints
     def dot_to_slash(key)
@@ -74,4 +81,3 @@ module CMDB
     end
   end
 end
-

data/lib/cmdb/file_source.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'uri'
 
 module CMDB
@@ -12,29 +13,30 @@ module CMDB
     # @return [URI] a file:// URL describing where this source's data comes from
     attr_reader :prefix, :url
 
-    @@base_directories = ['/var/lib/cmdb', File.expand_path('~/.cmdb')]
+    @base_directories = ['/var/lib/cmdb', File.expand_path('~/.cmdb')]
 
     # List of directories that will be searched (in order) for YML files at load time.
     # @return [Array] collection of String
-    def self.base_directories
-      @@base_directories
+    class << self
+      attr_reader :base_directories
     end
 
     # @param [Array] bd collection of String absolute paths to search for YML files
-    def self.base_directories=(bd)
-      @@base_directories = bd
+    class << self
+      attr_writer :base_directories
     end
 
     # Construct a new FileSource from an input YML file.
     # @param [String,Pathname] filename path to a YAML file
+    # @param [String] root optional subpath in data to "mount"
+    # @param [String] prefix optional prefix of
     # @raise [BadData] if the file's content is malformed
-    def initialize(filename, root=nil)
+    def initialize(filename, root = nil, prefix = File.basename(filename, '.*'))
+      @data = {}
+      @prefix = prefix
       filename = File.expand_path(filename)
       @url = URI.parse("file://#{filename}")
-      @prefix = File.basename(filename, ".*")
       @extension = File.extname(filename)
-      @data = {}
-
       raw_bytes = File.read(filename)
       raw_data  = nil
 
@@ -45,10 +47,10 @@ module CMDB
         when /ya?ml$/i
           raw_data = YAML.load(raw_bytes)
         else
-          raise BadData.new(self.url, 'file with unknown extension; expected js(on) or y(a)ml')
+          raise BadData.new(url, 'file with unknown extension; expected js(on) or y(a)ml')
         end
-      rescue Exception
-        raise BadData.new(self.url, 'CMDB data file')
+      rescue StandardError
+        raise BadData.new(url, 'CMDB data file')
       end
 
       raw_data = raw_data[root] if !root.nil? && raw_data.key?(root)
@@ -67,9 +69,9 @@ module CMDB
     # @yield every key/value in the source
     # @yieldparam [String] key
     # @yieldparam [Object] value
-    def each_pair(&block)
+    def each_pair(&_block)
       # Strip the prefix in the key and call the block
-      @data.each_pair { |k, v| block.call(k.split("#{@prefix}.").last, v) }
+      @data.each_pair { |k, v| yield(k.split("#{@prefix}.").last, v) }
     end
 
     private
@@ -82,19 +84,19 @@ module CMDB
           flatten(value, key, output)
         when Array
           if value.all? { |e| e.is_a?(String) } ||
-               value.all? { |e| e.is_a?(Numeric) } ||
-               value.all? { |e| e == true } ||
-               value.all? { |e| e == false }
+             value.all? { |e| e.is_a?(Numeric) } ||
+             value.all? { |e| e == true } ||
+             value.all? { |e| e == false }
             output[key] = value
           else
             # mismatched arrays: not allowed
-            raise BadValue.new(self.url, key, value)
+            raise BadValue.new(url, key, value)
           end
         when String, Numeric, TrueClass, FalseClass
           output[key] = value
         else
           # nil and anything else: not allowed
-          raise BadValue.new(self.url, key, value)
+          raise BadValue.new(url, key, value)
         end
       end
     end

data/lib/cmdb/interface.rb

@@ -1,10 +1,11 @@
+# encoding: utf-8
 require 'json'
 
 module CMDB
   class Interface
     # Create a new instance of the CMDB interface.
     # @option settings [String] root name of subkey to consider as root
-    def initialize(settings={})
+    def initialize(settings = {})
       @root = settings[:root] if settings
 
       namespaces = {}
@@ -14,7 +15,7 @@ module CMDB
 
       @sources = []
       # Load from consul source first if one is available.
-      if !ConsulSource.url.nil?
+      unless ConsulSource.url.nil?
         if ConsulSource.prefixes.nil? || ConsulSource.prefixes.empty?
           @sources << ConsulSource.new('')
         else
@@ -109,7 +110,7 @@ module CMDB
 
       # Also consult working dir in development environments
       if CMDB.development?
-        local_dir   = File.join(Dir.pwd, '.cmdb')
+        local_dir = File.join(Dir.pwd, '.cmdb')
         directories += [local_dir]
       end
 
@@ -136,18 +137,15 @@ module CMDB
       overlapping.each do |ns, sources|
         exc = ValueConflict.new(ns, sources)
 
-        if CMDB.development?
-          CMDB.log.warn exc.message
-        else
-          raise exc
-        end
+        CMDB.log.warn exc.message
+        raise exc unless CMDB.development?
       end
     end
 
     # Make an environment variable out of a key name
     def key_to_env(key)
       env_name = key
-      env_name.gsub!(/[^A-Za-z0-9_]+/,'_')
+      env_name.gsub!(/[^A-Za-z0-9_]+/, '_')
       env_name.upcase!
       env_name
     end

data/lib/cmdb/rewriter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'yaml'
 require 'json'
 
@@ -30,13 +31,13 @@ module CMDB
       total = 0
       @rewriters.each { |rw| total += rw.rewrite(cmdb) }
 
-      @missing_keys = @rewriters.map { |rw| rw.missing_keys}.flatten.uniq.sort
+      @missing_keys = @rewriters.map(&:missing_keys).flatten.uniq.sort
 
       total
     end
 
     def save
-      @rewriters.each { |rw| rw.save }
+      @rewriters.each(&:save)
       true
     end
 

data/lib/cmdb/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module CMDB
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'.freeze
 end

data/lib/cmdb.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'set'
 require 'singleton'
 
@@ -62,7 +63,7 @@ module CMDB
 
     # @param [URI] url filesystem or network location of the bad value
     # @param [String] context brief description of where data was found e.g. 'CMDB data file' or 'input config file'
-    def initialize(url, context=nil)
+    def initialize(url, context = nil)
       @url = url
       super("Malformed data encountered #{(' in ' + context) if context}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdb
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - RightScale
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line tool for configuration manegement databases