knife-zero 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a664f1782d8cc36553ad2e5269d10080805568a2
-  data.tar.gz: 44fd1e97f0d4a800980e58bfc465ec45592f4309
+  metadata.gz: bdf0989e9de6228b25f20b31a9ec5d39255360d6
+  data.tar.gz: e6c149cefe11911ff06ab5e2b5f03e114ab69d06
 SHA512:
-  metadata.gz: d6ef45236ae82c085aa05011cca60505710663c7cb6df5eb7b274dd29e01c5c9d542da3e3fa4ea0c2c1db941a23b33ac38a19faa371571a9a5800df2ae1b065e
-  data.tar.gz: c8d52756ad5cfc23585bf306d13589387910063f32e5d96da1bc21103e3ec28e5164470407ec8e7c44fcf885a8457070f2697fc189836c679f2d2c960ed7dc5a
+  metadata.gz: e902a417918ddd8eb00c2461c75f7b68e69034ff4375224a1fb10fd3f03fb4f7db211d64d3d49bd99be6b40855744e8ed4d3c40344523932cbe4e078ad502e10
+  data.tar.gz: 19f63fd413efba43e48ddd10189046ffda6ea4b506063df448a0d8514274c00f9fcf29d3f90f7ae557e7b5b2656b23ac552b7ba5054fc9ba7857fe92b2bc4816

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.8.0
+
+- Feature: set bootstraped host to knife_zero.host attribute(normal) #57
+
 ## v1.7.1
 
 - Misc: change option name from --without-chef-run to --[no-]converge #25

data/README.md

@@ -16,6 +16,8 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 - It supports all functions of chef(C/S).
 - You have only to manage one chef-repo.
 
+[Knife-Zero Document](http://higanworks.com/knife-zero/)(WIP)
+
 ## Requirements
 
 - Must support AllowTcpForward 
@@ -52,6 +54,18 @@ knife zero converge QUERY (options)
 knife zero diagnose # show configuration from file
 ```
 
+### Configuration file
+
+You need to make sure the knife.rb file in your chef-repo (in the chef-repo root or .chef directory) is adapted to use chef-zero.
+
+For example, at `.chef/knife.rb`. At least the following contents are needed:
+```
+chef_repo_path   File.expand_path('../../' , __FILE__)
+cookbook_path    [File.expand_path('../../cookbooks' , __FILE__), File.expand_path('../../site-cookbooks' , __FILE__)]
+```
+
+If you used knife serve or knife zero, this makes sure chef-zero is started with the contents of the chef-repo directory instead of as an empty server.
+
 ### knife zero bootstrap
 
 Install Chef to remote node and run chef-client under chef-zero via tcp-forward.
@@ -456,6 +470,20 @@ Zero ChefClient Config
 ```
 
 
+## To include from other knife plugins
+
+If you want to integrate knife-zero on machine creation with cloud plugins, you can add zerobootstrap to deps like below.
+
+```
+deps do
+  require 'chef/knife/zerobootstrap'
+  Chef::Knife::ZeroBootstrap.load_deps
+  self.options = Chef::Knife::ZeroBootstrap.options.merge(self.options)
+end
+```
+
+For example, [knife-digital_ocean](https://github.com/higanworks/knife-digital_ocean/blob/79_merge_zero_bootstrap_options/lib/chef/knife/digital_ocean_droplet_create.rb)
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/knife-zero/fork )

data/lib/chef/knife/zero_bootstrap.rb

@@ -26,6 +26,10 @@ class Chef
         :default => true,
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
+      def run
+        @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+        super
+      end
 
       def knife_ssh
         begin
@@ -49,6 +53,14 @@ class Chef
           exit 1
         end
       end
+
+      def build_knifezero_attributes_for_node
+        attr = Mash.new
+        attr[:knife_zero] = {
+          host: server_name
+        }
+        attr
+      end
     end
   end
 end

data/lib/knife-zero/core/bootstrap_context.rb

@@ -41,7 +41,7 @@ class Chef
                s << " -W" if @config[:why_run]
                s
                else
-                 "echo Execution of Chef-Client has been canceled due to bootstrap_converge if false."
+                 "echo Execution of Chef-Client has been canceled due to bootstrap_converge is false."
                end
              else
                orig_start_chef

data/lib/knife-zero/version.rb

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

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.7.1", Knife::Zero::VERSION)
+    assert_equal("1.8.0", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH