cmdb 3.0.0rc1 → 3.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6aea8a8e330452b914eae78b2909200d62aca4
-  data.tar.gz: ffcb1a5762568246b37e3924c793f29d36b7e3ab
+  metadata.gz: 2a5fa442a4ff4b6f1d7955c804b79bce26e232a5
+  data.tar.gz: 60a350561cc2612639f53f41b1427b6d0ace23b0
 SHA512:
-  metadata.gz: f20fe6ab9ff05e6f3450117f21abbc91b215bdedb55cfee11b6ad8bfba2937826536862f8d7593a3ec60d845424288d6aab3340691bf58957d586dab37d0c4ca
-  data.tar.gz: 59dd521b9730b77d8acea1ba8587a04bc6cb172f67e79cfbfe2eda09825bc3107fd7bc799824f7a823ae00295f3509418523066cf3cc6d55694d727aadff30a8
+  metadata.gz: 949bf77549aefdbdb499e4d9ab818d826f5359d026dd8bd4bf6f0046a809e69e54369cb975962c3ef0c367a8ab5e3106731050dacf71eec5149fc109fec4a6a7
+  data.tar.gz: f5e1c629aa3135b333c89cffa7e2f1d1a4a05266c4be9fea75e3ba0cc5751c1f89c4f70d4859b464b205bb570ff67b0fb26cb898b925fa7896ccf3e96da99a53

data/Dockerfile

@@ -0,0 +1,13 @@
+FROM ruby:2-alpine
+MAINTAINER Tony Spataro <tony@rightscale.com>
+
+WORKDIR /cmdb
+ENTRYPOINT ["bin/shell"]
+
+# HACK: install runtime dependencies by hand in order to avoid depending on
+# bundler + git + make + gcc at build time.
+RUN gem install trollop -v '~> 2.0'
+
+ADD bin /cmdb/bin/
+ADD exe /cmdb/exe/
+ADD lib /cmdb/lib/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cmdb (3.0.0rc1)
+    cmdb (3.0.0rc2)
       trollop (~> 2.0)
 
 GEM

data/README.md

@@ -29,7 +29,7 @@ CMDB has three primary interfaces:
 
   1. The `cmdb shim` command populates the environment with values and/or rewrites hardcoded
      config files, then spawns your application.
-  2. The `CMDB::Interface` object provides a programmatic API for querying CMDBs. Its `#to_h`
+  2. The `CMDB::Interface` object provides a programmatic API for querying CMDBs. Its `#to_env`
      method transforms the whole configuration into an environment-friendly hash if you prefer to seed the
      environment yourself, without using the shim.
   3. The `cmdb shell` command navigates your k/v store using filesystem-like

data/Rakefile

@@ -26,5 +26,5 @@ task :sandbox do
   url = mapper.map('consul://consul:8500/sandbox')
 
   lib = File.expand_path('../lib', __FILE__)
-  exec "ruby -I#{lib} -rpry exe/cmdb --source=#{url} shell"
+  exec "bin/shell --source=#{url}"
 end

data/TODO.md

@@ -0,0 +1,10 @@
+1) Move array validation stuff (same type, etc) out of File source so Consul
+   can use it. Or decide to ditch this constraint ... hmm ...
+   
+2) Create a Shell.new helper to enable embedding of shells into other apps
+
+3) Extract padding/truncation/excerpting code into Text module; deal with
+   corner cases better.
+
+4) Move CMDB separator logic (join/split) into toplevel methods of CMDB;
+   DRY out Shell#expand_path

data/bin/console

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
 # encoding: utf-8
 
 require 'bundler/setup'

data/bin/setup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/bash
 set -euo pipefail
 IFS=$'\n\t'
 

data/bin/shell

@@ -0,0 +1,23 @@
+#! /bin/sh
+
+tcptest() {
+  nc -w 1 $1 $2 < /dev/null > /dev/null 2> /dev/null
+}
+
+if [ $# -gt 0 ]; then
+  args="$@"
+elif tcptest consul 8500; then
+  args="--source=consul://consul"
+elif tcptest localhost 8500; then
+  args="--source=consul://localhost"
+else
+  echo 'cmdb: No k/v source detected; running shell demo with fake source!'
+  args="--source=memory:"
+fi
+
+if gem list -i pry > /dev/null; then
+  pry="-rpry"
+fi
+
+echo "+ cmdb $args"
+exec ruby -Ilib $pry exe/cmdb $args shell

data/exe/cmdb

@@ -25,7 +25,7 @@ command_info = command_list.map { |c| "       * #{c}" }.join("\n")
 
 # Use a Trollop parser for help/banner display, but do not actually parse
 # anything just yet.
-p = Trollop::Parser.new do
+parser = Trollop::Parser.new do
   version "cmdb #{gemspec_version} (c) 2013-2014 RightScale, Inc."
   banner <<-EOS
 A command-line interface for configuration management.
@@ -54,13 +54,22 @@ Common options that apply to all commands:
   stop_on commands.keys
 end
 
-Trollop.with_standard_exception_handling p do
+subcommand = nil
+options    = nil
+
+Trollop.with_standard_exception_handling parser do
   raise Trollop::HelpNeeded if ARGV.empty?
 
   # Apply global options
-  options = p.parse ARGV
+  options = parser.parse ARGV
   CMDB.log.level = Logger::FATAL if options[:quiet]
 
+  # Identify the subcommand and run it (or print help).
+  raise Trollop::HelpNeeded if ARGV.empty?
+  subcommand = ARGV.shift
+end
+
+begin
   if options[:source].empty?
     sources = CMDB::Source.detect
   else
@@ -69,15 +78,39 @@ Trollop.with_standard_exception_handling p do
     end
   end
 
-  interface = CMDB::Interface.new(*sources)
-
-  # Identify the subcommand and run it (or print help).
-  raise Trollop::HelpNeeded if ARGV.empty?
-  cmd = ARGV.shift
-  klass = commands[cmd]
-  if klass
-    klass.create(interface).run
-  else
+  klass = commands[subcommand]
+  unless klass
     CMDB.log.fatal "Unrecognized command '#{cmd}'; try 'cmdb --help'"
+    exit 100
+  end
+
+  interface = CMDB::Interface.new(*sources)
+  klass.create(interface).run
+rescue CMDB::BadKey => e
+  CMDB.log.fatal "CMDB: Bad Key: malformed CMDB key '#{e.key}'"
+  exit 1
+rescue CMDB::BadValue => e
+  CMDB.log.fatal "CMDB: Bad Value: illegal value for CMDB key '#{e.key}' in source #{e.url}"
+  exit 2
+rescue CMDB::BadData => e
+  CMDB.log.fatal "CMDB: Bad Data: malformed CMDB data in source #{e.url}"
+  exit 3
+rescue CMDB::ValueConflict => e
+  CMDB.log.fatal "CMDB: Value Conflict: #{e.message}"
+  e.sources.each do |s|
+    CMDB.log.fatal " - #{s.url}"
+  end
+  exit 4
+rescue CMDB::NameConflict => e
+  CMDB.log.fatal "CMDB: Name Conflict: #{e.message}"
+  e.keys.each do |k|
+    CMDB.log.fatal " - #{k}"
   end
+  exit 4
+rescue CMDB::EnvironmentConflict => e
+  CMDB.log.fatal "CMDB: Environment Conflict: #{e.message}"
+  exit 5
+rescue Errno::ENOENT => e
+  CMDB.log.fatal "CMDB: missing file or directory #{e.message}"
+  exit 6
 end

data/lib/cmdb/commands/shell.rb

@@ -29,6 +29,9 @@ cmdb shell
     # @return [CMDB::Interface]
     attr_reader :cmdb
 
+    # @return [CMDB::Shell::DSL]
+    attr_reader :dsl
+
     # @return [Array] the "present working directory" (i.e. key prefix) for shell commands
     attr_accessor :pwd
 
@@ -39,7 +42,9 @@ cmdb shell
     def initialize(interface)
       @cmdb = interface
       @pwd = []
-      @out = CMDB::Shell::Printer.new
+      text = CMDB::Shell::Text.new(!$stdout.tty? || ENV['TERM'].nil?)
+      @out = CMDB::Shell::Printer.new($stdout, $stderr, text)
+      @in  = CMDB::Shell::Prompter.new(text)
     end
 
     # Run the shim.
@@ -58,8 +63,6 @@ cmdb shell
     #
     # @return [String] absolute key in dotted notation
     def expand_path(subpath)
-      pieces = subpath.split(ALT_SEPARATOR)
-
       if subpath[0] == ALT_SEPARATOR
         result = []
       else
@@ -69,6 +72,7 @@ cmdb shell
       if subpath.include?(ALT_SEPARATOR) || subpath =~ NAVIGATION
         # filesystem-like subpath
         # apply Unix-style directory navigation shortcuts
+        pieces = subpath.split(ALT_SEPARATOR).select { |p| !p.nil? && !p.empty? }
         pieces.each do |piece|
           case piece
           when '..' then result.pop
@@ -79,6 +83,7 @@ cmdb shell
 
         result.join(CMDB::SEPARATOR)
       else
+        pieces = subpath.split(CMDB::SEPARATOR).select { |p| !p.nil? && !p.empty? }
         # standard dotted notation
         result += pieces
       end
@@ -89,8 +94,7 @@ cmdb shell
     private
 
     def repl
-      require 'readline'
-      while line = Readline.readline(@out.prompt(self), true)
+      while line = @in.read(self)
         begin
           line = line.chomp
           next if line.nil? || line.empty?
@@ -100,6 +104,8 @@ cmdb shell
           run_ruby(command, args) || run_getter(line) || run_setter(line) ||
             fail(CMDB::BadCommand.new(command))
           handle_output(self._)
+        rescue SystemCallError => e
+          handle_error(e) || raise
         rescue => e
           handle_error(e) || raise
         end
@@ -112,7 +118,7 @@ cmdb shell
     def run_ruby(command, args)
       self._ = @dsl.__send__(command, *args)
       true
-    rescue NoMethodError
+    rescue CMDB::BadCommand
       false
     rescue ArgumentError => e
       raise CMDB::BadCommand.new(e.message, command)
@@ -126,7 +132,7 @@ cmdb shell
       else
         false
       end
-    rescue CMDB::Error
+    rescue CMDB::BadKey
       false
     end
 
@@ -138,14 +144,12 @@ cmdb shell
       value = nil unless value && value.length > 0
       self._ = @dsl.set(key, value)
       true
-    rescue CMDB::Error
-      false
     end
 
     def handle_output(obj)
       case obj
       when Hash
-        @out.keys_values(obj)
+        @out.keys_values(obj, prefix:pwd.join('.'))
       else
         @out.value(obj)
       end
@@ -157,6 +161,11 @@ cmdb shell
       when CMDB::BadCommand
         @out.error "#{e.command}: #{e.message}"
         true
+      when CMDB::Error
+        @out.error e.message
+        true
+      when SystemCallError
+        @out.error "#{e.class.name}: #{e.message}"
       else
         false
       end

data/lib/cmdb/commands/shim.rb

@@ -15,10 +15,9 @@ option to tell the shim where to rewrite configuration files. It will look for t
 in JSON or YML that look like <<cmdb.key.name>> and replace them with the value of
 the specified key.
 
-To use the shim with 12-factor apps, use the --env option to tell the shim to load
-every CMDB key into the environment. When using --env, the prefix of each key is
-omitted from the environment variable name, e.g. "common.database.host" is
-represented as DATABASE_HOST.
+The shim populates the environment with all data from every source. The source-
+specific prefix of each key is omitted from the environment variable name,
+e.g. "common.database.host" is represented as DATABASE_HOST.
 
 Usage:
 cmdb shim [options] -- <command_to_exec> [options_for_command]
@@ -31,9 +30,6 @@ Where [options] are selected from:
         opt :pretend,
             'Check for errors, but do not actually launch the app or rewrite files',
             default: false
-        opt :env,
-            "Add CMDB keys to the app server's process environment",
-            default: false
         opt :user,
             'Switch to named user before executing app',
             type: :string
@@ -75,42 +71,15 @@ Where [options] are selected from:
     #
     # @raise [SystemExit] if something goes wrong
     def run
-      rewrote   = rewrite_files
-      populated = populate_environment
+      populate_environment
+      rewrote = rewrite_files
 
-      if !rewrote && !populated && !@pretend && @command.empty?
-        CMDB.log.warn 'CMDB: nothing to do; please specify --dir, --env, or a command to run'
+      if !rewrote && !@pretend && @command.empty?
+        CMDB.log.warn 'CMDB: nothing to do; please specify --dir, or -- followed by a command to run'
         exit 7
       end
 
       launch_app
-    rescue CMDB::BadKey => e
-      CMDB.log.fatal "CMDB: Bad Key: malformed CMDB key '#{e.key}'"
-      exit 1
-    rescue CMDB::BadValue => e
-      CMDB.log.fatal "CMDB: Bad Value: illegal value for CMDB key '#{e.key}' in source #{e.url}"
-      exit 2
-    rescue CMDB::BadData => e
-      CMDB.log.fatal "CMDB: Bad Data: malformed CMDB data in source #{e.url}"
-      exit 3
-    rescue CMDB::ValueConflict => e
-      CMDB.log.fatal "CMDB: Value Conflict: #{e.message}"
-      e.sources.each do |s|
-        CMDB.log.fatal " - #{s.url}"
-      end
-      exit 4
-    rescue CMDB::NameConflict => e
-      CMDB.log.fatal "CMDB: Name Conflict: #{e.message}"
-      e.keys.each do |k|
-        CMDB.log.fatal " - #{k}"
-      end
-      exit 4
-    rescue CMDB::EnvironmentConflict => e
-      CMDB.log.fatal "CMDB: Environment Conflict: #{e.message}"
-      exit 5
-    rescue Errno::ENOENT => e
-      CMDB.log.fatal "CMDB: missing file or directory #{e.message}"
-      exit 6
     end
 
     private
@@ -143,8 +112,7 @@ Where [options] are selected from:
 
     # @return [Boolean]
     def populate_environment
-      env = @cmdb.to_h
-
+      env = @cmdb.to_env
       env.keys.each do |k|
         raise CMDB::EnvironmentConflict.new(k) if ENV.key?(k)
       end
@@ -153,6 +121,7 @@ Where [options] are selected from:
         false
       else
         env.each_pair do |k, v|
+          raise "WOOGA #{k} #{v}" if k.kind_of?(Array) || v.kind_of?(Array)
           ENV[k] = v
         end
         true

data/lib/cmdb/interface.rb

@@ -78,7 +78,7 @@ module CMDB
     end
 
     def search(prefix)
-      prefix = Regexp.new('^' + Regexp.escape(prefix))
+      prefix = Regexp.new('^' + Regexp.escape(prefix)) unless prefix.is_a?(Regexp)
       result = {}
 
       @sources.each do |s|
@@ -101,19 +101,19 @@ module CMDB
     # rather than returning bad data.
     #
     # @raise [NameConflict] if two or more key names transform to the same
-    def to_h
+    def to_env
       values = {}
-      sources = {}
+      originals = {}
 
-      each_pair do |key, value|
-        env_key = key_to_env(key)
-        value = JSON.dump(value) unless value.is_a?(String)
-
-        if sources.key?(env_key)
-          raise NameConflict.new(env_key, [sources[env_key], key])
-        else
-          sources[env_key] = key
-          values[env_key] = value_to_env(value)
+      @sources.each do |s|
+        s.each_pair do |k, v|
+          env = key_to_env(k, s)
+          if (orig = originals[env])
+            raise NameConflict.new(env, [orig, k])
+          else
+            values[env] = value_to_env(v)
+            originals[env] = k
+          end
         end
       end
 
@@ -135,8 +135,12 @@ module CMDB
     end
 
     # Make an environment variable out of a key name
-    def key_to_env(key)
-      env_name = key
+    def key_to_env(key, source)
+      if source.prefix
+        env_name = key[source.prefix.size+1..-1]
+      else
+        env_name = key.dup
+      end
       env_name.gsub!(/[^A-Za-z0-9_]+/, '_')
       env_name.upcase!
       env_name

data/lib/cmdb/shell/dsl.rb

@@ -10,6 +10,14 @@ module CMDB::Shell
       @out = out
     end
 
+    def class
+      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
@@ -17,15 +25,16 @@ module CMDB::Shell
 
     def help
       @out.info 'Commands:'
-      @out.info '  cd slash/sep/path - append to search prefix'
-      @out.info '  cd /path          - reset prefix'
+      @out.info '  cd <key>          - append/remove search prefix'
+      @out.info '  cd /              - reset search prefix'
       @out.info '  get <key>         - print value of key'
       @out.info '  ls                - show keys and values'
       @out.info '  set <key> <value> - print value of key'
       @out.info '  quit              - exit the shell'
-      @out.info 'Notation:'
-      @out.info '  a.b.c             - (sub)key relative to search prefix'
-      @out.info '  ../b/c            - the b.c subkey relative to parent of search prefix'
+      @out.info 'Key notation:'
+      @out.info '  a.b.c             - relative to search prefix'
+      @out.info '  ../b/c            - relative to parent of search prefix'
+      @out.info '  /a                - relative to root (i.e. all sources)'
       @out.info 'Shortcuts:'
       @out.info '  <key>             - for get'
       @out.info '  <key>=<value>     - for set'

data/lib/cmdb/shell/printer.rb

@@ -1,14 +1,15 @@
 module CMDB::Shell
   class Printer
-    def initialize(out=STDOUT, err=STDERR)
+    def initialize(out=$stdout, err=$stderr, text=Text.new(true))
       @out = out
       @err = err
-      @c = Text.new(!@out.tty?)
+      @c = text
     end
 
     # Print an informational message.
     def info(str)
       @out.puts @c.white(str)
+      self
     end
 
     # Print an error message.
@@ -19,7 +20,7 @@ module CMDB::Shell
 
     # Display a single CMDB value.
     def value(obj)
-      @out.puts '  ' + color_value(obj, 76)
+      @out.puts '  ' + color_value(obj, @c.width-2)
       self
     end
 
@@ -27,36 +28,26 @@ module CMDB::Shell
     def keys_values(h, prefix:nil)
       wk = h.keys.inject(0) { |ax, e| e.size > ax ? e.size : ax }
       wv = h.values.inject(0) { |ax, e| es = e.inspect.size; es > ax ? es : ax }
-      width = @c.tty_columns
-      half = width / 2 - 2
-      wk = [wk, half].min
+      half = @c.width / 2
+      wk = [wk, half].min-3
       wv = [wv, half].min
-      re = (width - wk - wv)
+      re = (@c.width - wk - wv)
       wv += re if re > 0
 
       h.each do |k, v|
-        @out.puts format('  %s%s', color_key(k, wk+1, prefix:prefix), color_value(v, wv))
+        @out.puts format('  %s %s', color_key(k, wk+1, prefix:prefix), color_value(v, wv))
       end
 
       self
     end
 
-    # @return [String] human-readable CMDB prompt
-    def prompt(cmdb)
-      pwd = '/' + cmdb.pwd.join('/')
-      pwd = pwd[0...40] + '...' if pwd.size >= 40
-      'cmdb:' +
-        @c.green(pwd) +
-        @c.default('> ')
-    end
-
     private
 
     # Colorize a key and right-pad it to fit a minimum size. Append a ':'
     # to make it YAML-esque.
     def color_key(k, size, prefix:nil)
       v = k.to_s
-      v.sub(prefix, '') if prefix && v.index(prefix) == 0
+      v = v.sub(prefix, '') if prefix && v.index(prefix) == 0
       suffix = ':'
       if v.size + 1 > size
         v = v[0...size-4]
@@ -76,7 +67,6 @@ module CMDB::Shell
       else
         vv = v.inspect
       end
-      vv << (' ' * [0, size - vv.size].max)
 
       case v
       when Symbol

data/lib/cmdb/shell/prompter.rb

@@ -0,0 +1,40 @@
+module CMDB::Shell
+  class Prompter
+    def initialize(text)
+      require 'readline'
+      @c = text
+    end
+
+    # Prompt the user for input and read a line. Offer autocompletion services
+    # using Readline and CMDB/DSL searches.
+    def read(shell)
+      Readline.completion_proc = proc do |word|
+        commands = shell.dsl.class.instance_methods.select do |m|
+          m.to_s.index(word) == 0 && m !~ /[^a-z]/
+        end.map(&:to_s)
+        next commands if commands.any?
+
+        hits  = shell.cmdb.search(shell.expand_path(word)).keys
+        hits.sort! { |x, y| x.size <=> y.size }
+        pwd = shell.pwd.join('.')
+        hits[0...CMDB::Shell::MANY].map { |k| k.sub(pwd, '') }
+      end
+
+      Readline.readline(prompt(shell.cmdb, shell.pwd), true)
+    end
+
+    private
+
+    # Return a suitable prompt for later printing.
+    #
+    # @return [String] human-readable CMDB prompt
+    def prompt(cmdb, pwd)
+      max=@c.width/2
+      pwd = '/' + pwd.join('/')
+      pwd = '...' + pwd[-max..-1] if pwd.size >= max
+      'cmdb:' +
+        @c.green(pwd) +
+        @c.default('> ')
+    end
+  end
+end

data/lib/cmdb/shell/text.rb

@@ -15,6 +15,7 @@ module CMDB::Shell
 
     def initialize(plain)
       @plain = plain
+      trap('SIGWINCH') { @width = nil } unless @plain
     end
 
     COLORS.each_pair do |color, value|
@@ -54,11 +55,11 @@ module CMDB::Shell
     alias_method :bright_default, :bold
 
     # @return [Integer] screen width (number of columns)
-    def tty_columns
+    def width
       if @plain
         65_535
       else
-        Integer(`stty size`.chomp.split(/ +/)[1]) rescue 80
+        @width ||= Integer(`stty size`.chomp.split(/ +/)[1]) rescue 80
       end
     end
   end

data/lib/cmdb/shell.rb

@@ -1,8 +1,16 @@
 module CMDB
   module Shell
+    # Maximum number of "things" before the UI starts collapsing display
+    # elements, i.e. treating subtrees as subdirectories.
+    FEW  = 3
+
+    # Maximum number of "things" for which to offer autocomplete and other
+    # shortcuts.
+    MANY = 25
   end
 end
 
 require 'cmdb/shell/dsl'
 require 'cmdb/shell/text'
 require 'cmdb/shell/printer'
+require 'cmdb/shell/prompter'

data/lib/cmdb/source/consul.rb

@@ -20,11 +20,11 @@ module CMDB
       when String
         response = json_parse(response)
         item = response.first
-        json_parse(Base64.decode64(item['Value']))
+        item['Value'] && json_parse(Base64.decode64(item['Value']))
       when 404
         nil
       else
-        raise CMDB:Error.new("Unexpected consul response #{value.inspect}")
+        raise CMDB::Error.new("Unexpected consul response #{response.inspect}")
       end
     end
 
@@ -60,6 +60,7 @@ module CMDB
 
       result.each do |item|
         key = slash_to_dot(item['Key'])
+        next unless item['Value']
         value = json_parse(Base64.decode64(item['Value']))
         yield(key, value)
       end

data/lib/cmdb/source/file.rb

@@ -64,14 +64,17 @@ module CMDB
         when Hash
           flatten(value, key, output)
         when Array
-          if value.all? { |e| e.is_a?(String) } ||
+          if value.any? { |e| e.is_a?(Hash) }
+            # mismatched arrays: not allowed
+            raise BadValue.new(url, key, value, 'hashes not allowed inside arrays')
+          elsif value.all? { |e| e.is_a?(String) } ||
              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(url, key, value)
+            raise BadValue.new(url, key, value, 'mismatched/unsupported element types')
           end
         when String, Numeric, TrueClass, FalseClass
           output[key] = value

data/lib/cmdb/source/memory.rb

@@ -8,7 +8,7 @@ module CMDB
     # @return [String] the empty string
     attr_reader :prefix
 
-    # Construct a new Source::Hahs.
+    # Construct a new Source::Memory.
     def initialize(hash, prefix)
       @hash = hash
       @prefix = prefix

data/lib/cmdb/source/network.rb

@@ -10,11 +10,12 @@ module CMDB
     private
 
     # Perform a GET. On 2xx, return the response body as a String.
-    # On 3xx, 4xx, 5xx, return an Integer status code.
+    # On 3xx or 4xx return an Integer status code. On 5xx, retry up to
+    # the specified number of times, then return an Integer status code.
     #
     # @param [String] path
     # @return [Integer,String]
-    def http_get(path, query:nil)
+    def http_get(path, query:nil, retries:3)
       @http ||= Net::HTTP.start(@uri.host, @uri.port)
       uri = @uri.dup
       uri.path = path
@@ -26,8 +27,14 @@ module CMDB
       case response.code.to_i
       when 200..299
         response.body
+      when 500..599
+        if retries > 0
+          http_get(path, query:query, retries:retries-1)
+        else
+          response.code.to_i
+        end
       else
-        return response.code.to_i
+        response.code.to_i
       end
     end
 

data/lib/cmdb/source.rb

@@ -62,6 +62,8 @@ module CMDB
         Source::Consul.new(URI.parse(curi.to_s), prefix)
       when 'file'
         Source::File.new(uri.path, prefix)
+      when 'memory'
+        Source::Memory.new({},nil)
       else
         raise ArgumentError, "Unrecognized URL scheme '#{uri.scheme}'"
       end

data/lib/cmdb/version.rb

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

data/lib/cmdb.rb

@@ -39,7 +39,7 @@ module CMDB
     end
   end
 
-  # A value of an unsupported type was encountered in the CMDB.
+  # A value of an unsupported type was encountered in the CMDB or filesystem.
   class BadValue < Error
     # @return [URI] filesystem or network location of the bad value
     attr_reader :url
@@ -50,14 +50,16 @@ module CMDB
     # @param [URI] url filesystem or network location of the bad value
     # @param [String] key CMDB key name under which the bad value was found
     # @param [Object] value the bad value itself
-    def initialize(url, key, value)
+    def initialize(url, key, value, desc=nil)
       @url = url
       @key = key
-      super("Values of type #{value.class.name} are unsupported")
+      msg = "Unsupported #{value.class.name} value"
+      msg << ": #{desc}" if desc
+      super(msg)
     end
   end
 
-  # Malformed data was encountered in the CMDB or in an app's filesystem.
+  # Malformed data was encountered in the CMDB or filesystem.
   class BadData < Error
     # @return [URI] filesystem or network location of the bad data
     attr_reader :url
@@ -94,7 +96,7 @@ module CMDB
   # Deprecated name for ValueConflict
   Conflict = ValueConflict
 
-  # Two or more keys in different sources have an identical name. This isn't an error
+  # Two or more keys in prefixed sources have an identical name. This isn't an error
   # when CMDB is used to refer to keys by their full, prefixed name, but it can become
   # an issue when loading keys into the environment for 12-factor apps to process.
   class NameConflict < Error
@@ -127,7 +129,7 @@ module CMDB
 
   def log
     unless @log
-      @log = Logger.new(STDOUT)
+      @log = Logger.new($stderr)
 
       @log.formatter = Proc.new do |severity, datetime, progname, msg|
         "#{severity}: #{msg}\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdb
 version: !ruby/object:Gem::Version
-  version: 3.0.0rc1
+  version: 3.0.0rc2
 platform: ruby
 authors:
 - RightScale
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -52,13 +52,16 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/console
 - bin/setup
+- bin/shell
 - cmdb.gemspec
 - docker-compose.yml
 - exe/cmdb
@@ -76,6 +79,7 @@ files:
 - lib/cmdb/shell.rb
 - lib/cmdb/shell/dsl.rb
 - lib/cmdb/shell/printer.rb
+- lib/cmdb/shell/prompter.rb
 - lib/cmdb/shell/text.rb
 - lib/cmdb/source.rb
 - lib/cmdb/source/consul.rb