knife-topo 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19485c4efce675847ae4dde4ed7c045e48cdfd7b
-  data.tar.gz: bf7721eda5687896c64f3327a06959aceb9c6109
+  metadata.gz: 7d2b424d953de3fe9fe46d76562b29bdfc08b27d
+  data.tar.gz: 1f4c0b21f7dbf6b285b159486f4b38c63be7fd21
 SHA512:
-  metadata.gz: 633d4163ea5de35ddd8d80ef4447c7f5c97d80804169da9f7e6f82d929440abf7cabf2301ce27ff6940c1195dbf5f356e5a63e386b9cd0f83c7dcf5f276d8b4f
-  data.tar.gz: 2b68f502d8591d89f0fc5186532730362f03dc467925089e2687e4b176af45f88e80bdfa62a1713805a5e562aa11e0ad460dbcd9857c05fc5e456f372e60eb53
+  metadata.gz: 12e20c73920d5db8e0a30a3e72f3b7ca31980c7d1092655d8bea5b5868726fa86dc205f25ad31f4e84e8a8b6667e660ca8ffe5b8612c41a919c8ab004e7f9b80
+  data.tar.gz: 3e55e3ac7a10033755fd72d1c9c593dcbd995523ee0db6aa3e03d4d4939f0ea5b9d36d5ec40e2554585a6eb2d49ddace61d5c70426bb077cc0e9dc6cce0eae2e

data/knife-topo.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache License (2.0)'
 
   spec.files         = Dir.glob('{lib}/**/*') +
-    ['LICENSE', 'README.md', __FILE__]
+                       ['LICENSE', 'README.md', __FILE__]
   spec.require_paths = ['lib']
 end

data/lib/chef/knife/topo/command_helper.rb

@@ -62,7 +62,7 @@ module KnifeTopo
     end
 
     def most_common(vals)
-      return if vals.length == 0
+      return if vals.empty?
       vals.group_by do |val|
         val
       end.values.max_by(&:size).first

data/lib/chef/knife/topo/consts.rb

@@ -1,4 +1,4 @@
 # constants
 module KnifeTopo
-  PRIORITIES = %w(default force_default normal override force_override)
+  PRIORITIES = %w(default force_default normal override force_override).freeze
 end

data/lib/chef/knife/topo/loader.rb

@@ -110,6 +110,7 @@ module KnifeTopo
       Chef::DataBag.load(topo_bag_name)
     rescue Net::HTTPServerException => e
       raise unless e.to_s =~ /^404/
+      {}
     end
 
     def load_node_data(node_name, min_priority = 'default')

data/lib/chef/knife/topo/node_update_helper.rb

@@ -25,7 +25,7 @@ module KnifeTopo
   # Node update helper for knife topo
   module NodeUpdateHelper
     # Update an existing node
-    def update_node(node_updates)
+    def update_node(node_updates, merge = false)
       config[:disable_editing] = true
 
       begin
@@ -34,7 +34,7 @@ module KnifeTopo
 
         env = node_updates['chef_environment']
         check_chef_env(env) unless env == node['chef_environment']
-        do_node_updates(node, node_updates)
+        do_node_updates(node, node_updates, merge)
 
       rescue Net::HTTPServerException => e
         raise unless e.to_s =~ /^404/
@@ -44,8 +44,8 @@ module KnifeTopo
       node
     end
 
-    def do_node_updates(node, node_updates)
-      updated = update_node_with_values(node, node_updates)
+    def do_node_updates(node, node_updates, merge = false)
+      updated = update_node_with_values(node, node_updates, merge)
       if updated
         ui.info "Updating #{updated.join(', ')} on node #{node.name}"
         node.save
@@ -56,11 +56,11 @@ module KnifeTopo
     end
 
     # Update original node, return list of updated properties.
-    def update_node_with_values(node, updates)
+    def update_node_with_values(node, updates, merge = false)
       updated = []
 
       # merge the normal attributes (but not tags)
-      updated << 'normal' if update_attrs(node, updates['normal'])
+      updated << 'normal' if update_attrs(node, updates['normal'], merge)
 
       # update runlist
       updated << 'run_list' if update_runlist(node, updates['run_list'])
@@ -74,15 +74,20 @@ module KnifeTopo
       updated << 'tags' if update_tags(node, updates['tags'])
 
       # return false if no updates, else return array of property names
-      updated.length > 0 && updated
+      !updated.empty? && updated
     end
 
     # Update methods all return true if an actual update is made
-    def update_attrs(node, attrs)
+    def update_attrs(node, attrs, merge = false)
       return false unless attrs
-      attrs.delete('tags')
+      # keep the current tags
+      attrs['tags'] = node.normal.tags
       original = Marshal.load(Marshal.dump(node.normal))
-      node.normal = Chef::Mixin::DeepMerge.merge(node.normal, attrs)
+      node.normal = if merge
+                      Chef::Mixin::DeepMerge.merge(node.normal, attrs)
+                    else
+                      attrs
+                    end
       original != node.normal
     end
 

data/lib/chef/knife/topo/version.rb

@@ -1,4 +1,4 @@
 # version
 module KnifeTopo
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'.freeze
 end

data/lib/chef/knife/topo_bootstrap.rb

@@ -47,7 +47,7 @@ module KnifeTopo
     )
 
     # Make the base bootstrap options available on topo bootstrap
-    self.options = (Chef::Knife::Bootstrap.options).merge(TopoBootstrap.options)
+    self.options = Chef::Knife::Bootstrap.options.merge(TopoBootstrap.options)
 
     attr_accessor :msgs, :results
 
@@ -120,21 +120,21 @@ module KnifeTopo
 
     # Report is used by create, update and bootstrap commands
     def report
-      if @topo['nodes'].length > 0
+      if @topo['nodes'].empty?
+        ui.info 'No nodes found'
+      else
         report_msg(:bootstrapped, :info, false) if @bootstrap
         report_msg(:skipped, :info, true)
         report_msg(:skipped_ssh, :info, true)
         report_msg(:existed, :info, true)
         report_msg(:failed, :warn, true) if @bootstrap
-      else
-        ui.info 'No nodes found'
       end
       ui.info("Topology: #{@topo.display_info}")
     end
 
     def report_msg(state, level, only_non_zero = true)
       nodes = @results[state]
-      return if only_non_zero && nodes.length == 0
+      return if only_non_zero && nodes.empty?
       ui.send(level, @msgs[state] %
         { num: nodes.length, list: nodes.join(', ') })
     end

data/lib/chef/knife/topo_cookbook_create.rb

@@ -43,7 +43,7 @@ module KnifeTopo
 
     def initialize(args)
       super
-      @args  = args
+      @args = args
     end
 
     def run

data/lib/chef/knife/topo_cookbook_upload.rb

@@ -37,14 +37,14 @@ module KnifeTopo
     )
 
     # Make called command options available
-    self.options = (Chef::Knife::CookbookUpload.options).merge(
+    self.options = Chef::Knife::CookbookUpload.options.merge(
       TopoCookbookUpload.options)
 
     include KnifeTopo::Loader
 
     def initialize(args)
       super
-      @args  = args
+      @args = args
 
       # All called commands need to accept union of options
       Chef::Knife::CookbookUpload.options = options

data/lib/chef/knife/topo_create.rb

@@ -50,7 +50,7 @@ module KnifeTopo
     # Make called command options available
     orig_opts = KnifeTopo::TopoCreate.options
     upload_opts = Chef::Knife::CookbookUpload.options
-    merged_opts = (KnifeTopo::TopoBootstrap.options).merge(upload_opts)
+    merged_opts = KnifeTopo::TopoBootstrap.options.merge(upload_opts)
     self.options = merged_opts.merge(orig_opts)
 
     include KnifeTopo::CommandHelper
@@ -59,7 +59,7 @@ module KnifeTopo
 
     def initialize(args)
       super
-      @args  = args
+      @args = args
     end
 
     def bootstrap_msgs
@@ -116,8 +116,9 @@ module KnifeTopo
 
     def update_nodes
       nodes = processor.generate_nodes
+      merge = @topo.merge_attrs
       nodes.each do |node_data|
-        bootstrap_or_update_node(node_data)
+        bootstrap_or_update_node(node_data, merge)
       end
     end
 
@@ -130,16 +131,14 @@ module KnifeTopo
       @topo.save
     end
 
-    def bootstrap_or_update_node(node_data)
+    def bootstrap_or_update_node(node_data, merge)
       node_name = node_data['name']
       if @bootstrap
-        update_node(node_data) unless node_bootstrap(node_data)
+        update_node(node_data, merge) unless node_bootstrap(node_data)
+      elsif update_node(node_data, merge)
+        @results[:existed] << node_name
       else
-        if update_node(node_data)
-          @results[:existed] << node_name
-        else
-          @results[:skipped] << node_name
-        end
+        @results[:skipped] << node_name
       end
     end
 

data/lib/chef/knife/topo_export.rb

@@ -82,7 +82,7 @@ module KnifeTopo
       update_nodes!(topo['nodes'])
 
       # pick an topo environment based on the nodes
-      return topo if @node_names.length == 0
+      return topo if @node_names.empty?
       env = pick_env(topo['nodes'])
       topo['chef_environment'] = env if env
       topo
@@ -105,13 +105,13 @@ module KnifeTopo
         'tags' => [],
         'strategy' => 'via_cookbook',
         'strategy_data' => default_strategy_data,
-        'nodes' => @node_names.length == 0 ? [empty_node('node1')] : []
+        'nodes' => @node_names.empty? ? [empty_node('node1')] : []
       }
     end
 
     def default_strategy_data
       {
-        'cookbook' =>  @topo_name || 'topo1',
+        'cookbook' => @topo_name || 'topo1',
         'filename' => 'topology'
       }
     end

data/lib/chef/knife/topo_search.rb

@@ -41,7 +41,7 @@ module KnifeTopo
 
     # Make the base search options available on topo search
     orig_opts = KnifeTopo::TopoSearch.options
-    self.options = (Chef::Knife::Search.options).merge(orig_opts)
+    self.options = Chef::Knife::Search.options.merge(orig_opts)
 
     include KnifeTopo::CommandHelper
 
@@ -75,7 +75,7 @@ module KnifeTopo
       group_query = query && !query.start_with?('NOT') ? "(#{query})" : query
 
       # search specific topologies or all/none
-      constraint = (topo_name) ? 'topo_name:' + topo_name : 'topo_name:*'
+      constraint = topo_name ? 'topo_name:' + topo_name : 'topo_name:*'
 
       # combine the grouped query and constraint
       combine(query, group_query, constraint)

data/lib/chef/topo/converter/topo_v1.rb

@@ -26,7 +26,9 @@ class Chef
   module Topo
     # Convert V1 topology JSON to V2
     class TopoV1Converter < Chef::Topo::Converter
-      PRIORITIES = %w(default force_default normal override force_override)
+      PRIORITIES = %w(
+        default force_default normal override force_override
+      ).freeze
 
       register_converter('topo_v1', name)
 
@@ -51,7 +53,7 @@ class Chef
       def determine_strategy
         @output['strategy'] = 'direct_to_node'
         cookbooks = @input['cookbook_attributes']
-        return unless cookbooks && cookbooks.length > 0
+        return unless cookbooks && !cookbooks.empty?
 
         cookbooks.each do |cb|
           cond = cb['conditional'] || []

data/lib/chef/topology.rb

@@ -25,7 +25,9 @@ class Chef
   class Topology < Chef::DataBagItem
     attr_accessor :strategy
 
-    PRIORITIES = %w(default force_default normal override force_override)
+    PRIORITIES = %w(
+      default force_default normal override force_override
+    ).freeze
 
     # Have to override and say this is a data bag json_class
     # or get error on upload re 'must specify id'
@@ -41,7 +43,7 @@ class Chef
     end
 
     def self.convert_from(format, data)
-      from_json((Chef::Topo::Converter.convert(format, data)))
+      from_json(Chef::Topo::Converter.convert(format, data))
     end
 
     def self.from_json(data)
@@ -52,10 +54,11 @@ class Chef
 
     # Make sure the JSON has an id and other expected fields
     def raw_data=(new_data)
+      @strategy = new_data['strategy'] || 'direct_to_node'
       new_data['id'] ||= (new_data['name'] || 'undefined')
+#      new_data['name'] ||= (new_data['id'])
       new_data['nodes'] ||= []
       super(normalize(new_data))
-      @strategy = raw_data['strategy'] || 'direct_to_node'
     end
 
     # clean up some variations so we only have to process one way
@@ -100,6 +103,10 @@ class Chef
       raw_data['nodes']
     end
 
+    def merge_attrs
+      raw_data['strategy_data'] && raw_data['strategy_data']['merge_attrs']
+    end
+
     # nodes with topo properties merged in
     def merged_nodes
       nodes.map do |n|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies: []
 description: Knife-topo uses a JSON file to capture a topology of nodes, which can
   be loaded into Chef and bootstrapped
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Knife plugin to manage topologies of nodes