knife-zero 1.11.1 → 1.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd069912d8b815db4d447a3d19dc88af0d6bdcc
-  data.tar.gz: 455e737d9d4554952467e27d9bbc746fbdece401
+  metadata.gz: c640b8403785ff85ed323af235521b984e2487d1
+  data.tar.gz: 129585a3b31aa6c0733cc12679187732e5e0cef4
 SHA512:
-  metadata.gz: 11a07ff246595ed09b7888e9dd00005c33c491f83bd79429803554afeaff1e295d8aff5ac5434dcb3ef353f55187495642e1fb4ada68b802856324e98119780c
-  data.tar.gz: e3279e6fb9437b96eb9238f749e2ce6edab7a0c49917794ecb6c2ad63ffd9da61a87b90983560cadc466a4b46fae45527bdd27abba45065b5825e4662826b975
+  metadata.gz: cd82c47ede1ffe8805d70ac20674407d2b7401d2f7a8ea1efe41aedd44fed444e9b4823ac459985b7f133db12c7a2240c56c8d9519f61d6121c5ce1e90e0516e
+  data.tar.gz: c67a894054dedd240f30beaaeeb6bc75bcefb64aca59319da644cda0e71508e3e94105e68ccf1a8e3d4a244b200bbedb66806ae45453d0653742d2fdb9928588

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.12.0
+
+- Feature: New subcommand `zero apply`
+
 ## v1.11.1
 
 - Feature: add before_hook

data/README.md

@@ -32,6 +32,7 @@ Relocated: [Installation | Knife-Zero Document](http://knife-zero.github.io/10_i
 
 ```
 ** ZERO COMMANDS **
+knife zero apply QUERY (options)
 knife zero bootstrap [SSH_USER@]FQDN (options)
 knife zero chef_client QUERY (options) | It's same as converge
 knife zero converge QUERY (options)

data/lib/chef/knife/zero_apply.rb

@@ -0,0 +1,64 @@
+require 'chef/knife'
+require 'chef/knife/zero_base'
+require 'chef/knife/zero_converge'
+require 'knife-zero/bootstrap_ssh'
+require 'knife-zero/helper'
+require 'shellwords'
+
+class Chef
+  class Knife
+    class ZeroApply < Chef::Knife::BootstrapSsh
+      include Chef::Knife::ZeroBase
+      deps do
+        Chef::Knife::BootstrapSsh.load_deps
+        Chef::Knife::ZeroConverge.load_deps
+        require "knife-zero/helper"
+      end
+
+      banner "knife zero apply QUERY (options)"
+
+      self.options = Ssh.options.merge(self.options)
+      self.options = ZeroConverge.options.merge(self.options)
+      self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
+
+      option :recipe,
+        :short        => "-r Recipe String or @filename",
+        :long         => "--recipe Recipe String or @filename",
+        :description  => "Recipe for execute by chef-apply",
+        :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 }
+
+      def initialize(argv=[])
+        super
+        self.configure_chef
+
+        @name_args = [@name_args[0], start_chef_appy]
+      end
+
+      def start_chef_appy
+        if @config[:verbosity] and @config[:verbosity] >= 2
+          log_level = 'debug'
+        else
+          log_level = 'info'
+        end
+
+        client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
+        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-apply"
+        s = String.new("echo #{@config[:recipe]} | #{client_path}")
+        s << " -l #{log_level}"
+        s << " -s"
+        s << " --minimal-ohai" if @config[:minimal_ohai]
+        s << " -W" if @config[:why_run]
+        Chef::Log.info "Remote command: " + s
+        s
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.11.1"
+    VERSION = "1.12.0.rc1"
     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.11.1
+  version: 1.12.0.rc1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - CHANGELOG.md
 - README.md
 - knife-zero.gemspec
+- lib/chef/knife/zero_apply.rb
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/chef/knife/zero_chef_client.rb
@@ -186,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8