cmdb 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4287917beeab0bb0a6ac9d486f2f6c2c5cf81d
-  data.tar.gz: 488206107b1515b2ecb4933690a718d8541ff4ae
+  metadata.gz: 4ecbdd4ebf320cf1fb4dd3bc292bc70ef1a1b84e
+  data.tar.gz: 2e8049f2445a8fc0e5f6c9f247c3870f048f8d8f
 SHA512:
-  metadata.gz: ead52e74f5ee6565fbbd78cce0db6397fd3b9ae55fa74583d283b911a7f98508b1eb31072bee6ebc8d4167375f2dc2fe1ebc716af9c8b2bf6f1b206c98275688
-  data.tar.gz: 41f23de1b60dbb5606b9262b304d37f08d93f1b979032681cb1ba23dd50e515dc8423535544754ed48fe9b4e89bbc36394c56c0eddc9e22d6e2bad77182c90f8
+  metadata.gz: 0220da2972161ea29bfc5ee28f99dc697542704dfeecf079d83803d7133a01f45cc6db8c586511a71c700808e9a4cf9bc308062990654f6da3b951947ec2f3af
+  data.tar.gz: 266f23c2e33c67a99bf66b2d856554e78ed9e2566c4a5d2e4cc12f4769a816bade0487f2639f83d5d041869b19c17456b896be1466dbef40868474157c8e766e

data/.gitignore

@@ -1,3 +1,8 @@
+# As a best practice, allow the committed dependencies to "float" so that
+# we are more likely to discover interface-breaking changes in our
+# dependencies before our clients do.
+Gemfile.lock
+
 # simplecov/rcov generated
 coverage
 coverage.data

data/.travis.yml

@@ -1,12 +1,11 @@
-sudo: false
+sudo: required
+dist: trusty
 language: ruby
 rvm:
 - 2.1
-bundler_args: --without development
+- 2.3
 before_install:
-- gem install --no-document -v '~> 1.10' bundler
+- sudo apt-get -y install python-pip && sudo pip install docker-compose && docker-compose -v
+- gem install --no-document -v '~> 1.12' bundler
 before_script:
 - bundle install
-script: 
-- bundle exec rake spec
-- bundle exec rake cucumber

data/Gemfile

@@ -12,6 +12,7 @@ group :test do
   gem 'rspec'
   gem 'rubocop'
   gem 'webmock'
+  gem 'coveralls', require: false
 end
 
 group :development do

data/README.md

@@ -1,7 +1,6 @@
 # CMDB
 
-[![TravisCI][travis_ci_img]](https://travis-ci.org/rightscale/cmdb)
-[travis_ci_img]: https://travis-ci.org/rightscale/cmdb.svg?branch=master
+[![TravisCI](https://travis-ci.org/rightscale/cmdb.svg?branch=master)](https://travis-ci.org/rightscale/cmdb) [![Coverage](https://coveralls.io/repos/github/rightscale/cmdb/badge.svg?branch=master)](https://coveralls.io/github/rightscale/cmdb?branch=master)
 
 CMDB is a Ruby interface for consuming data from one or more configuration management databases
 (CMDBs) and making that information available to Web applications.
@@ -36,73 +35,6 @@ CMDB has three primary interfaces:
      method transforms the whole configuration into an environment-friendly hash if you prefer to seed the
      environment yourself, without using the shim.
 
-# Data Model
-
-CMDB models all data sources as trees whose nodes are named, and whose leaf
-nodes can contain a piece of data: strings, numbers, booleans, or arrays.
-
-Maps are disallowed on order to prevent ambiguity; a map always represents a
-subtree of the k/v store, never a value. Mixed-type arrays are disallowed
-because they can cause problems with strongly-typed languages. Nil is
-disallowed as a value because writing nil means "delete the key."
-
-Paths within a tree -- and therefore CMDB keys -- are identified using a dot
-notation similar to Java properties; for instance, `production.http.listen_port`
-might be an Integer-valued key that tells your microservice which HTTP port
-to listen on in the production environment; `production.database.host` might be
-the database host, and so forth. The names of keys are determined by the tree
-structure of your k/v store, and when you set a key through CMDB, its position
-in the tree is derived from its key name.
-
-## Source Prefixes
-
-CMDB sources have a `prefix`, meaning that _all_ keys contained in
-that source begin with the same prefix. No two sources may share a prefix,
-ensuring that sources don't "hide" each others' data. The prefix of a source is
-usually automatically determined by the final component of its URL, e.g. the
-filename in the case of `file://` sources and the final path component in the
-case of `consul://` or other network sources.
-
-## Inheritance
-
-The uniqueness constraint on prefixes means that all sources' keys are
-disjoint; there is no such thing as "inheritance" in the CMDB data model.
-
-When keys are exported to the environment, the prefix is stripped from the
-key name; however, CMDB _still_ prevents overlap in this case.
-
-Inheritance may be supported in future as an optional behavior, but is omitted
-for the time being because in practice, it causes more problems than it solves.
-
-## Ambiguous Key Names
-
-Consider a file that defines the following variables:
-
-    # confusing.yml
-    this:
-      is:
-        ambiguous
-      was:
-        very: ambiguous
-        extremely: confusing
-
-At first glance, ths file defines two CMDB keys:
-  - `confusing.this.is` (a string)
-  - `confusing.this.was` (a map)
-
-However, an equally valid interpretation would be:
-  - `confusing.this.is`
-  - `confusing.this.was.very`
-  - `confusing.this.was.extremely`
-
-Because CMDB keys cannot contain maps, the first interpretation is wrong. The second
-interpretation is valid according to the data model, but results in a situation where the type
-of the keys could change if the structure of the YML file changes.
-
-For this reason, any YAML file that defines an "ambiguous" key name will cause an error at
-initialization time. To avoid ambiguous key names, think of your YAML file as a tree and remember
-that _leaf nodes must define data_ and _internal nodes must define structure_.
-
 # Getting Started
 
 ## Determine sources
@@ -247,3 +179,70 @@ located in `/var/lib/cmdb` and present it as a source whose prefix is `mykeys`.
 JSON and YAML files are both supported. The structured data within each file
 can contain arbitrarily-deep subtrees which are interpreted as subkeys,
 sub-subkeys and so forth.
+
+# Data Model
+
+CMDB models all data sources as trees whose nodes are named, and whose leaf
+nodes can contain a piece of data: strings, numbers, booleans, or arrays.
+
+Maps are disallowed on order to prevent ambiguity; a map always represents a
+subtree of the k/v store, never a value. Mixed-type arrays are disallowed
+because they can cause problems with strongly-typed languages. Nil is
+disallowed as a value because writing nil means "delete the key."
+
+Paths within a tree -- and therefore CMDB keys -- are identified using a dot
+notation similar to Java properties; for instance, `production.http.listen_port`
+might be an Integer-valued key that tells your microservice which HTTP port
+to listen on in the production environment; `production.database.host` might be
+the database host, and so forth. The names of keys are determined by the tree
+structure of your k/v store, and when you set a key through CMDB, its position
+in the tree is derived from its key name.
+
+## Source Prefixes
+
+CMDB sources have a `prefix`, meaning that _all_ keys contained in
+that source begin with the same prefix. No two sources may share a prefix,
+ensuring that sources don't "hide" each others' data. The prefix of a source is
+usually automatically determined by the final component of its URL, e.g. the
+filename in the case of `file://` sources and the final path component in the
+case of `consul://` or other network sources.
+
+## Inheritance
+
+The uniqueness constraint on prefixes means that all sources' keys are
+disjoint; there is no such thing as "inheritance" in the CMDB data model.
+
+When keys are exported to the environment, the prefix is stripped from the
+key name; however, CMDB _still_ prevents overlap in this case.
+
+Inheritance may be supported in future as an optional behavior, but is omitted
+for the time being because in practice, it causes more problems than it solves.
+
+## Ambiguous Key Names
+
+Consider a file that defines the following variables:
+
+    # confusing.yml
+    this:
+      is:
+        ambiguous
+      was:
+        very: ambiguous
+        extremely: confusing
+
+At first glance, ths file defines two CMDB keys:
+  - `confusing.this.is` (a string)
+  - `confusing.this.was` (a map)
+
+However, an equally valid interpretation would be:
+  - `confusing.this.is`
+  - `confusing.this.was.very`
+  - `confusing.this.was.extremely`
+
+Because CMDB keys cannot contain maps, the first interpretation is wrong. The second
+interpretation is valid according to the data model, but results in a situation where the type
+of the keys could change if the structure of the YML file changes.
+
+For this reason, any YAML file that defines an "ambiguous" key name will cause an error at
+initialization time. To avoid ambiguous key names, think of your YAML file as a tree and remember
+that _leaf nodes must define data_ and _internal nodes must define structure_.

data/Rakefile

@@ -14,7 +14,10 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:spec, :cucumber]
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+
+task default: [:spec, :cucumber, 'coveralls:push']
 
 
 require 'docker/compose'
@@ -25,7 +28,5 @@ task :sandbox do
   mapper = Docker::Compose::Mapper.new(compose)
   source1 = mapper.map('consul://consul:8500/sandbox/apples')
   source2 = mapper.map('consul://consul:8500/sandbox/oranges')
-
-  lib = File.expand_path('../lib', __FILE__)
   exec "bin/shell --source=#{source1} --source=#{source2}"
 end

data/lib/cmdb/commands/shell.rb

@@ -103,12 +103,18 @@ cmdb shell
           words = line.split(/\s+/)
           command, args = words.first.to_sym, words[1..-1]
 
-          run_ruby(command, args) || run_getter(line) || run_setter(line) ||
-            fail(CMDB::BadCommand.new(command))
+          exception = nil
+          begin
+            run_ruby(command, args)
+          rescue CMDB::BadCommand => e
+            exception = e
+          end
+
+          # deferred raise after trying getter and setter shortcuts
+          raise exception if exception && !(run_setter(line) || run_getter(line))
+
           handle_output(self._)
-        rescue SystemCallError => e
-          handle_error(e) || raise
-        rescue => e
+        rescue StandardError, SystemCallError => e
           handle_error(e) || raise
         end
       end
@@ -120,10 +126,8 @@ cmdb shell
     def run_ruby(command, args)
       self._ = @dsl.__send__(command, *args)
       true
-    rescue CMDB::BadCommand
-      false
-    rescue ArgumentError => e
-      raise CMDB::BadCommand.new(e.message, command)
+    rescue ArgumentError, NoMethodError => e
+      raise CMDB::BadCommand.new(command, e.message)
     end
 
     # @return [Boolean] true if line was handled as a getter

data/lib/cmdb/shell/dsl.rb

@@ -14,10 +14,6 @@ module CMDB::Shell
       DSL
     end
 
-    def method_missing(meth, *args)
-      ::Kernel.raise ::CMDB::BadCommand.new(meth)
-    end
-
     def ls(path='')
       prefix = @shell.expand_path(path)
       @cmdb.search prefix
@@ -54,18 +50,19 @@ module CMDB::Shell
       if @cmdb.set(key, value)
         @cmdb.get(key)
       else
-        ::Kernel.raise ::CMDB::BadCommand.new('set', 'No source is capable of accepting writes')
+        ::Kernel.raise ::CMDB::BadCommand.new('set', "No source accepts writes for '#{::CMDB.split(key).first}'")
       end
     end
 
     def unset(key)
       @cmdb.set(key, nil)
+      @cmdb.get(key)
     end
     alias rm unset
 
     def cd(path)
       pwd = @shell.expand_path(path)
-      @shell.pwd = CMDB.split(pwd)
+      @shell.pwd = ::CMDB.split(pwd)
       pwd.to_sym
     end
     alias chdir cd

data/lib/cmdb/source/network.rb

@@ -74,10 +74,11 @@ module CMDB
     #
     # @return [Integer] HTTP status code
     # @param [String] path
-    def http_delete(path)
+    def http_delete(path, query:nil)
       @http ||= Net::HTTP.start(@http_url.host, @http_url.port)
       url = @http_url.dup
       url.path = path
+      url.query = query unless query.nil? || query.empty?
 
       request = Net::HTTP::Delete.new url
       response = @http.request request

data/lib/cmdb/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module CMDB
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdb
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - RightScale
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -54,7 +54,6 @@ files:
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -112,4 +111,3 @@ signing_key:
 specification_version: 4
 summary: Command-line tool for configuration manegement databases
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,97 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cmdb (3.0.0)
-      trollop (~> 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.4.0)
-    ast (2.2.0)
-    backticks (1.0.0rc1)
-    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)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 3.2.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.4.0)
-      gherkin (~> 3.2.0)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
-    docker-compose (1.0.0rc2)
-      backticks (>= 1.0.0rc1)
-    gherkin (3.2.0)
-    hashdiff (0.3.0)
-    method_source (0.8.2)
-    multi_json (1.11.2)
-    multi_test (0.1.2)
-    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)
-      slop (~> 3.4)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
-      pry (~> 0.10)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      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
-  ruby
-
-DEPENDENCIES
-  backticks (= 1.0.0rc1)
-  bundler (~> 1.10)
-  cmdb!
-  cucumber
-  docker-compose (= 1.0.0rc2)
-  pry
-  pry-byebug
-  rake
-  rspec
-  rubocop
-  webmock
-  yard
-
-BUNDLED WITH
-   1.11.2