knife-zero 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f164d9e687c64fd99f26f272cf78f55d68d5da0d
-  data.tar.gz: fa5521a178e6cc1c8013afb3b59f4ae5f54bc2b6
+  metadata.gz: 1c14d86c9f5ba40c4758f6bc7553e0e3f299533f
+  data.tar.gz: 049fcba1509a56553e1547c0d2dc98d8854db324
 SHA512:
-  metadata.gz: 5625962c8b19e5521c8fa01551627589f871ba386d49742d75c73f2a0c1ae0faa0307bba1504cf6f56a9ec093ed4c7968000c243122012a94b6541274a23b5f5
-  data.tar.gz: cbc352df56bd72710c7f201da748b882493bf7d217eb69940d7dde5df6aca7e4026db7f396a307e22a91fc2838dbbed5ac881f1377d40ed6b83a9c2988a925e4
+  metadata.gz: e9cd094110b0219b0ed1ba74d854f44e5f6a624d195d202cfa4cdc3f980cde6004ba9d4978384c2f382f835993dcc4d20bbd7644200d3dc1aeb69b41ad55b609
+  data.tar.gz: d24fcd3e46f799d4098bb69407b57119bd3b1c4b1c268d868fb384ff93b0cce9710842c4f1682ec50cbee35f6458cc06fd9656bd2014f0d0ff0d1ebb0b6c2381

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+
+## v1.12.1
+
+- Typo: start_chef_appy => start_chef_apply
+- Feature: Import json_attribs option from chef-apply to zero-apply
+
 ## v1.12.0
 
 - Feature: New subcommand `zero apply`

data/lib/chef/knife/zero_apply.rb

@@ -1,6 +1,7 @@
 require 'chef/knife'
 require 'chef/knife/zero_base'
 require 'chef/knife/zero_converge'
+require 'chef/application/apply'
 require 'knife-zero/bootstrap_ssh'
 require 'knife-zero/helper'
 require 'shellwords'
@@ -29,21 +30,20 @@ class Chef
         :default => "",
         :proc => lambda { |o| o.start_with?('@') ? File.read(o[1..-1]).shellescape : (o.to_s).shellescape }
 
-      option :minimal_ohai,
-        :long         => "--[no-]minimal-ohai",
-        :description  => "Only run the bare minimum ohai plugins chef needs to function (false by default)",
-        :boolean => true,
-        :default => false,
-        :proc => lambda { |o| o.to_s }
+      ## Import from Chef-Apply
+      self.options[:minimal_ohai] = Chef::Application::Apply.options[:minimal_ohai]
+      self.options[:json_attribs] = Chef::Application::Apply.options[:json_attribs]
+      self.options[:json_attribs][:description] = "Load attributes from a JSON file or URL (retrieves from the remote node)"
+
 
       def initialize(argv=[])
         super
         self.configure_chef
 
-        @name_args = [@name_args[0], start_chef_appy]
+        @name_args = [@name_args[0], start_chef_apply]
       end
 
-      def start_chef_appy
+      def start_chef_apply
         if @config[:verbosity] and @config[:verbosity] >= 2
           log_level = 'debug'
         else
@@ -56,6 +56,7 @@ class Chef
         s << " -l #{log_level}"
         s << " -s"
         s << " --minimal-ohai" if @config[:minimal_ohai]
+        s << " -j #{@config[:json_attribs]}" if @config[:json_attribs]
         s << " -W" if @config[:why_run]
         Chef::Log.info "Remote command: " + s
         s

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.12.0"
+    VERSION = "1.12.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.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler