knife-zero 1.16.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e940242f9ebe1c19473adc25bef46f8b89b1b359
-  data.tar.gz: dde637d69d0166f2b9d319991cef01c5882c3f22
+  metadata.gz: a40dd1fc641fbf981484851683d3825740e2bcf5
+  data.tar.gz: 24f980020ff1fd340b3d8a0727d2d0b6ea2825f0
 SHA512:
-  metadata.gz: 4aa9468e7d718dd2cb6f084e44f516d09c9d68da2e5ecf4d7541306025f04c572f325e54a219a1bdcb512b069a36a4a9a4c2bbba98c259317b03516177ed567c
-  data.tar.gz: f3ae4989676b9e3af6f707fecef55f64ad22183c0e391922971d658237cb3b9e347ce99b305e8f000181fdb78bbdee8249511c0d07870de1640d59038e4595ea
+  metadata.gz: 3136f76b2f8c591eda4675fb6bf83c17ccf895b949ea99b41225f00cfb5de3cbb46bce42e799d45254f30e94d0eb582dd4a927b70f289e97524fb5d3262d2db7
+  data.tar.gz: c4dcc970035cde7144b592c49896758e8c28c1dd44cc018cc0b2dd79399377800966353d14925cff4cc2c1ab413f4db5556a70df78927c3508223dfa8cae07dd

data/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 Empty.
 
+## v1.17.1
+
+- [Bugfix]: change of 1.17.0 crashes nodenameless bootstrapping.
+
+## v1.17.0(Yanked)
+
+- Change: Ask overwrite node object at bootstrap #101
+    - New option `--[no-]overwrite`
+
 ## v1.16.0
 
 - [Feature] converge with `--json-attributes` #98

data/lib/chef/knife/zero_bootstrap.rb

@@ -33,17 +33,24 @@ class Chef
       self.options = Bootstrap.options.merge(self.options)
 
       option :bootstrap_converge,
-        :long => "--[no-]converge",
-        :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
-        :boolean => true,
-        :default => true,
-        :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
+             :long => "--[no-]converge",
+             :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
+             :boolean => true,
+             :default => true,
+             :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
+
+      option :overwrite_node_object,
+             :long => "--[no-]overwrite",
+             :description => "Overwrite local node object if node already exist. false by default",
+             :boolean => true,
+             :default => false,
+             :proc => lambda { |v| Chef::Config[:knife][:overwrite_node_object] = v }
 
       option :appendix_config,
-        :long => "--appendix-config PATH",
-        :description => "Append lines to end of client.rb on remote node from file.",
-        :proc => lambda { |o| File.read(o) },
-        :default => nil
+             :long => "--appendix-config PATH",
+             :description => "Append lines to end of client.rb on remote node from file.",
+             :proc => lambda { |o| File.read(o) },
+             :default => nil
 
       def run
         ## Command hook before_bootstrap (After launched Chef-Zero)
@@ -51,6 +58,23 @@ class Chef
           ::Knife::Zero::Helper.hook_shell_out!("before_bootstrap", ui, Chef::Config[:knife][:before_bootstrap])
         end
 
+        if @config[:bootstrap_converge]
+          unless @config[:overwrite_node_object]
+            q = Chef::Search::Query.new
+            node_name = resolve_node_name
+            result = q.search(:node, "name:#{node_name} OR knife_zero_host:#{node_name}")
+            if result.last > 0
+              ui.warn(%Q{Node "#{node_name}" already exist. [Found #{result.last} Node(s) in local search.] (You can skip asking with --overwrite option.)})
+              if result.last == 1
+                ui.confirm(%Q{Overwrite it }, true, false)
+              else
+                ui.confirm(%Q{Overwrite one of them }, true, false)
+              end
+            end
+          end
+        end
+
+
         if @config[:first_boot_attributes_from_file]
           @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
         else
@@ -113,6 +137,10 @@ class Chef
         attr
       end
 
+      def resolve_node_name
+        return @config[:chef_node_name] if @config[:chef_node_name]
+        @cli_arguments.first.split('@').last
+      end
     end
   end
 end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.16.0"
+    VERSION = "1.17.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler