cmdb 3.0.0rc3 → 3.0.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c44ac22f3267a7961d7034b5a0b56fc34a7bd7a
-  data.tar.gz: dfd4eaded71592fe0f8be7aa5b2a552610972811
+  metadata.gz: c88c245ee9bc31f0fe4f261b3d688402b0f06be1
+  data.tar.gz: 0e6b981474487959202b1bc16a85e5411754c818
 SHA512:
-  metadata.gz: 7910184801caaa46c493b1eca7094bf9d5107741cb20c67f1fdaaa537b99652634c528b7d9864865ddd0cdb8e902cb0373fd829ca70fb595ff39c075f1fa3541
-  data.tar.gz: 5779dece8e9682d685a148a6c5315a10aae3b6be19d2505e02ed0beb923895a3b8c931068e97322874f9fbd63f8379bbc704c9a503de39fedb03003961692dae
+  metadata.gz: a613be0d9de98744ba0b86d799d6f3685e46632a8d8373cb6ba1b1b473b326a26ce6b95912be9b60f31f5090ca2a883784fdf89d0e3362a9a5acbc6d15953887
+  data.tar.gz: 337b285e2ed120e8b543fe4cc0e1c9e0e1af759589aee4072c022bc76a793272b934185c12db54b2bd9860fe2a325c5c879423f4b38b45423f08ebde01d29b16

data/Gemfile.lock

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

data/Rakefile

@@ -23,8 +23,9 @@ task :sandbox do
   compose = Docker::Compose::Session.new
   compose.up 'consul', detached:true
   mapper = Docker::Compose::Mapper.new(compose)
-  uri = mapper.map('consul://consul:8500/sandbox')
+  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=#{uri}"
+  exec "bin/shell --source=#{source1} --source=#{source2}"
 end

data/lib/cmdb.rb

@@ -127,6 +127,24 @@ module CMDB
 
   module_function
 
+  # Split a dotted-notation CMDB key into its constituent parts and return an
+  # Array. Optionally limit the amount of splitting done by passing parts > 0.
+  #
+  # @return [Array]
+  # @param [String] key dotted-notation key
+  # @param [Integer] parts number of total parts to return
+  def split(key, parts=0)
+    key.split(SEPARATOR, parts)
+  end
+
+  # Transform a list of key components into a dotted-notation key.
+  #
+  # @return [String]
+  def join(*pieces)
+    pieces.flatten!
+    pieces.join(SEPARATOR)
+  end
+
   def log
     unless @log
       @log = Logger.new($stderr)

data/lib/cmdb/commands/shell.rb

@@ -72,6 +72,7 @@ cmdb shell
       if subpath.include?(ALT_SEPARATOR) || subpath =~ NAVIGATION
         # filesystem-like subpath
         # apply Unix-style directory navigation shortcuts
+        # ge rid of successive //// and other oddities
         pieces = subpath.split(ALT_SEPARATOR).select { |p| !p.nil? && !p.empty? }
         pieces.each do |piece|
           case piece
@@ -81,14 +82,15 @@ cmdb shell
           end
         end
 
-        result.join(CMDB::SEPARATOR)
+        CMDB.join(result)
       else
-        pieces = subpath.split(CMDB::SEPARATOR).select { |p| !p.nil? && !p.empty? }
         # standard dotted notation
+        # get rid of successive .... and other oddities
+        pieces = CMDB.split(subpath).select { |p| !p.nil? && !p.empty? }
         result += pieces
       end
 
-      result.join(CMDB::SEPARATOR)
+      CMDB.join(result)
     end
 
     private

data/lib/cmdb/interface.rb

@@ -48,19 +48,21 @@ module CMDB
 
     # Set the value of a CMDB key.
     #
-    # @return [Source,ni] the source that accepted the write, if any
+    # @return [Source,nil] the source that accepted the write, if any
     # @raise [BadKey] if the key name is malformed
     def set(key, value)
       raise BadKey.new(key) unless key =~ VALID_KEY
 
-      @sources.reverse.each do |s|
+      wrote = nil
+      @sources.each do |s|
         if s.respond_to?(:set)
-          s.set(key, value)
-          return s
+          if s.set(key, value)
+            wrote = s
+            break
+          end
         end
       end
-
-      nil
+      wrote
     end
 
     # Enumerate all of the keys in the CMDB.
@@ -77,13 +79,15 @@ module CMDB
       self
     end
 
-    def search(prefix)
-      prefix = Regexp.new('^' + Regexp.escape(prefix)) unless prefix.is_a?(Regexp)
+    # @return [Hash] all keys/values that match query
+    # @param [String,Regexp] query key name prefix or pattern to search for
+    def search(query)
+      query = Regexp.new('^' + Regexp.escape(query)) unless query.is_a?(Regexp)
       result = {}
 
       @sources.each do |s|
         s.each_pair do |k, v|
-          result[k] = v if k =~ prefix
+          result[k] = v if k =~ query
         end
       end
 

data/lib/cmdb/shell/dsl.rb

@@ -65,7 +65,7 @@ module CMDB::Shell
 
     def cd(path)
       pwd = @shell.expand_path(path)
-      @shell.pwd = pwd.split(::CMDB::SEPARATOR)
+      @shell.pwd = CMDB.split(pwd)
       pwd.to_sym
     end
     alias chdir cd

data/lib/cmdb/source/consul.rb

@@ -10,6 +10,9 @@ module CMDB
 
     def initialize(uri, prefix)
       super(uri, 8500, prefix)
+      useless = uri.path.split('/')
+      useless.shift ; useless.pop # del initial "" and final word (aka prefix)
+      @useless = CMDB.join(useless)
     end
 
     # Get a single key from consul. If the key is not found, return nil.
@@ -33,16 +36,26 @@ module CMDB
     end
 
     # Set a single key in consul. If value is nil, then delete the key
-    # entirely from consul.
+    # entirely from consul. If this source cannot accept the write due to
+    # key name limitations, return nil.
     #
+    # @return [true,nil]
     # @param [String] key dot-notation key
     # @param [Object] value new value of key
+    # @raise [CMDB:Error] if the write fails atthe consul server
     def set(key, value)
+      return nil unless prefixed?(key)
       key = dot_to_slash(key)
       if value.nil?
-        http_delete path_to(key)
+        status = http_delete path_to(key)
+      else
+        status = http_put path_to(key), value
+      end
+
+      if status >= 200 && status < 300
+        true
       else
-        http_put path_to(key), value
+        raise CMDB::Error.new("Consul put/delete failed with status #{status}")
       end
     end
 
@@ -64,6 +77,7 @@ module CMDB
 
       result.each do |item|
         key = slash_to_dot(item['Key'])
+        key.sub(@useless,'')
         next unless item['Value']
         value = json_parse(Base64.decode64(item['Value']))
         yield(key, value)
@@ -89,5 +103,14 @@ module CMDB
     def path_to(subpath)
       ::File.join('/v1/kv/', @uri.path, subpath)
     end
+
+    # Transform a subpath into a key name. Account for base-path prefix if
+    # necessary.
+    def slash_to_dot(path)
+      dot = super
+      dot.sub!(@useless,'')
+      dot=dot[1..-1] if dot[0] == '.'
+      dot
+    end
   end
 end

data/lib/cmdb/source/file.rb

@@ -60,7 +60,7 @@ module CMDB
 
     def flatten(data, prefix, output)
       data.each_pair do |key, value|
-        key = "#{prefix}#{CMDB::SEPARATOR}#{key}"
+        key = CMDB.join(prefix, key)
         case value
         when Hash
           flatten(value, key, output)

data/lib/cmdb/source/network.rb

@@ -99,24 +99,19 @@ module CMDB
     end
 
     # Convert dotted notation to slash-separated notation without an initial
-    # slash. Remove prefix if appropriate; raise an error if the key name
-    # does not begin with this source's prefix.
+    # slash. Remove prefix if it is present in the dotted-notation key.
     def dot_to_slash(key)
-      unless prefixed?(key)
-        raise CMDB::BadKey.new(key, "Keys of this source must begin with #{prefix}.")
-      end
-      pieces = key.split(CMDB::SEPARATOR)
-      pieces.shift
+      pieces = CMDB.split(key)
+      pieces.shift if pieces[0] == @prefix
       pieces.join('/')
     end
 
-    # Convert a slash-separated URI path or subpath to dotted notation. If there is an initial
-    # slash, discard it. Prepend source's prefix to key name if not already present.
+    # Convert a slash-separated URI path or subpath to dotted notation,
+    # discarding initial slash. Does not account for prefix in any way!
     def slash_to_dot(path)
       pieces = path.split('/')
       pieces.shift if pieces[0].empty?
-      pieces.unshift(prefix) unless prefix.nil? || pieces[0] == prefix
-      pieces.join(CMDB::SEPARATOR)
+      CMDB.join(pieces)
     end
   end
 end

data/lib/cmdb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdb
 version: !ruby/object:Gem::Version
-  version: 3.0.0rc3
+  version: 3.0.0rc4
 platform: ruby
 authors:
 - RightScale
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop