knife-zero 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a52879c7b2312b6a05e46f044746eed637e2070
-  data.tar.gz: 3125584c73940e7a77afc98f8ec48122e2cb1c06
+  metadata.gz: 620915bb2600d2bff34062afc9f5aed680043159
+  data.tar.gz: c01f7d554cbb73f3ed02dd5e2f03eff8e9f26231
 SHA512:
-  metadata.gz: 767c923ddd0b2f41f69be5bd28cbf81d958de19cea129db796613f0d251da777b940a48458fd6d50e2d7f8e88c71dfafc73a761bd29208446532a6aaa5aa8d4f
-  data.tar.gz: dcf59ee8ac62dfd553adcdd07a04b3c5a06393d3c43a48298157ca2bf75865feaacd3f2146bb077dc071feb062008a49dfba78c26716730add01dc8f32b6cddc
+  metadata.gz: a0d1659ce376fd1969d2689082e7e6a1bc6eaee0653f7665b722325228c9cb592a6d3c7792234d099ba3e64556cac8f6399e079799eb691d0e955a8220d1c694
+  data.tar.gz: 9bc35ec066cc9707d6664623d9184d79dc2a796f94c3c2aa8b9e5505d3bb0b310b1558bd7cf8f1662af1cb942c83ea6c2906f192f08e31a3f22471c985e82c11

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unrelesed
 
+## v1.4.0
+
+- Change: remote listen by local chef-zero port + 10000
+- Feature: overrde Remote Chef-Zero port.
+
 ## v1.3.0
 
 - return dummy key to validation.

data/README.md

@@ -1,5 +1,7 @@
 # Knife-Plugin Zero
 
+[![Circle CI](https://circleci.com/gh/higanworks/knife-zero.svg?style=svg)](https://circleci.com/gh/higanworks/knife-zero)
+
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/higanworks/knife-zero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![Gem Version](https://badge.fury.io/rb/knife-zero.svg)](http://badge.fury.io/rb/knife-zero)
@@ -244,6 +246,10 @@ Connecting to 192.168.33.10
 
 Run zero chef_client with `-a name` option.
 
+> Caution: `-a(--attribute) name` option doesn't work since chef 12.1.0.
+> Please use specific attribute until fix it.
+> I've already create PR for fix. Please wait for merge to use name attribute. https://github.com/chef/chef/pull/3195
+
 ```
 $ knife zero chef_client "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a name
 WARN: No cookbooks directory found at or above current directory.  Assuming /Users/sawanoboriyu/worktemp/knife-zero-vagrant.

data/lib/chef/knife/zero_base.rb

@@ -57,6 +57,12 @@ class Chef
             :description  => 'Enable whyrun mode on chef-client run at remote node.',
             :boolean      => true
 
+          option :remote_chef_zero_port,
+            :long => "--remote-chef-zero-port PORT",
+            :description => "Listen port on remote",
+            :default => nil,
+            :proc => Proc.new { |key| Chef::Config[:remote_chef_zero_port] = key.to_i }
+
         end
       end
 

data/lib/chef/knife/zero_chef_client.rb

@@ -9,6 +9,7 @@ class Chef
       deps do
         require 'chef/run_list/run_list_item'
         Chef::Knife::BootstrapSsh.load_deps
+        require "knife-zero/helper"
       end
 
       banner "knife zero chef_client QUERY (options)"
@@ -49,7 +50,7 @@ class Chef
         client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
         s = "#{client_path}"
         s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
-        s << " -S http://127.0.0.1:8889"
+        s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
         s << " -o #{@config[:override_runlist]}" if @config[:override_runlist]
         s << " -W" if @config[:why_run]
         s

data/lib/knife-zero/bootstrap_ssh.rb

@@ -6,6 +6,7 @@ class Chef
       deps do
         Chef::Knife::Ssh.load_deps
         require "knife-zero/net-ssh-multi-patch"
+        require "knife-zero/helper"
       end
 
       def ssh_command(command, subsession=nil)
@@ -18,7 +19,7 @@ class Chef
                         '127.0.0.1'
         (subsession || session).servers.each do |server|
           session = server.session(true)
-          session.forward.remote(chef_zero_port, chef_zero_host, chef_zero_port)
+          session.forward.remote(chef_zero_port, chef_zero_host, ::Knife::Zero::Helper.zero_remote_port)
         end
         super
         rescue => e

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

@@ -1,4 +1,5 @@
 require 'chef/knife/core/bootstrap_context'
+require "knife-zero/helper"
 
 class Chef
   class Knife
@@ -21,7 +22,7 @@ class Chef
                s = "#{client_path} -j /etc/chef/first-boot.json"
                s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
                s << " -E #{bootstrap_environment}" if ::Chef::VERSION.to_f != 0.9 # only use the -E option on Chef 0.10+
-               s << " -S http://127.0.0.1:#{URI.parse(Chef::Config.chef_server_url).port}"
+               s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
                s << " -W" if @config[:why_run]
                s
              else

data/lib/knife-zero/helper.rb

@@ -0,0 +1,13 @@
+module Knife
+  module Zero
+    module Helper
+      def self.zero_remote_port
+        return ::Chef::Config[:remote_chef_zero_port] if ::Chef::Config[:remote_chef_zero_port]
+        chef_zero_port = ::Chef::Config[:chef_zero_port] ||
+                         ::Chef::Config[:knife][:chef_zero_port] ||
+                         8889
+        chef_zero_port + 10000
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.3.0"
+    VERSION = "1.4.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.3.0", Knife::Zero::VERSION)
+    assert_equal("1.4.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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,8 +172,8 @@ files:
 - lib/chef/knife/zero_chef_client.rb
 - lib/chef/knife/zero_diagnose.rb
 - lib/knife-zero/bootstrap_ssh.rb
-- lib/knife-zero/common.rb
 - lib/knife-zero/core/bootstrap_context.rb
+- lib/knife-zero/helper.rb
 - lib/knife-zero/net-ssh-multi-patch.rb
 - lib/knife-zero/version.rb
 - test/chef/knife/test_zero_bootstrap.rb

data/lib/knife-zero/common.rb

@@ -1,7 +0,0 @@
-module Knife
-  module Zero
-    module Helper
-      ## Some Helper..
-    end
-  end
-end