knife-zero 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669006724c6e47cce3b95f94d477e974a57a32ab
-  data.tar.gz: 94d34c6bd8708e218f179b15179e7ae8359109dd
+  metadata.gz: 52c93c2a006243fcbd0e0ad73eb140a8336b73d6
+  data.tar.gz: 718d5d1c551c145af599aaa9a9e0f3a40a6bcdec
 SHA512:
-  metadata.gz: 87bfb41b3ff229dbf057ef52307d763d57514ce373ef51fb118da4b905d09e75fa625c0679c92bb2d9febdcaf8f28ce461574e21016b107e7977810f2677761e
-  data.tar.gz: 85bf85f129c80d70f2ddf1b4ee646ff13d8420e46760b14cf5390d783d42400806fa5cd3c85ef4ddd9c1e2c3f74148141a0d3602f97c940a18d767746fdb4ef9
+  metadata.gz: d62de79dcd29220aa558f044e3ef10d7f42f95c8d8e6c397df1d571c987eb11310b52da7bc6226d1d366f17b03e5c3358c205ef6999065b49e28d7b6b8849720
+  data.tar.gz: d942ed977b211e2ee6f33305c1b9cb85e291d465cf50ed16837cf0c8b4e96c076acaa49e3c4c548c5808e6f5890c4d4bacca5aa704d977ac50c9844a178a9017

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog of knife-zero
+
+## v0.1.1
+
+- Bug: Issue #1 NoMethodError: undefined method 'split' for nil:NilClass at bootstrap
+
+## v0.1.0 (yanked)
+
+- Feature: run Chef-Client by Seach query.
+
+
+## v0.0.2
+
+- initial release
+- Feature: bootstrap with chefzero via tcp-forward

data/README.md

@@ -1,6 +1,8 @@
 # Knife-Plugin Zero
 
 [![Gem Version](https://badge.fury.io/rb/knife-zero.svg)](http://badge.fury.io/rb/knife-zero)
+[![Stories in Ready](https://badge.waffle.io/higanworks/knife-zero.svg?label=ready&title=Ready)](http://waffle.io/higanworks/knife-zero) 
+[![Stories in Progress](https://badge.waffle.io/higanworks/knife-zero.svg?label=In%20Progress&title=In%20Progress)](http://waffle.io/higanworks/knife-zero) 
 
 Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.
 
@@ -32,9 +34,10 @@ Or install it yourself as:
 ```
 ** ZERO COMMANDS **
 knife zero bootstrap FQDN (options)
+knife zero chef_client QUERY (options)
 ```
 
-### Bootstrap
+### knife zero bootstrap
 
 Install Chef to remote node and run chef-client under chef-zero via tcp-forward.
 
@@ -56,6 +59,7 @@ host.example.com Starting first Chef Client run...
 host.example.com Starting Chef Client, version 11.14.6
 host.example.com Creating a new client identity for host.example.com using the validator key.
 
+
 ## Resolv and sync cookbook via http over ssh tcp-forward by run-list.
 host.example.com resolving cookbooks for run list: ["hogehoge::default"]
 host.example.com Synchronizing Cookbooks:
@@ -102,13 +106,56 @@ xxx.xxx.xxx.xxx  08:41:36 up  1:03,  1 user,  load average: 0.00, 0.01, 0.01
 xxx.xxx.xxx.xxx  08:41:37 up 143 days,  2:32,  4 users,  load average: 0.00, 0.01, 0.05
 ```
 
-### Update(pending)
+### knife zero chef_client (for update)
+
+`knife zero chef_client QUERY (options)`
 
 Search nodes from local chef-repo directory, and run command at remote node.
 
 Supported options are mostly the same as `knife ssh`.
 
-> Pending
+#### Example
+
+```
+## Chef-Repo has two nodes
+$ knife node list --local-mode
+host.example.com
+host2.example.com
+
+## add recipe to run_list of host.example.com
+$ knife node run_list add host.example.com hogehoge::default --local-mode
+host.example.com:
+  run_list: recipe[hogehoge::default]
+
+
+$ knife zero chef_client 'name:*' --attribute ipaddress 
+
+## host.example.com was converged by run_list.
+host.example.com Starting Chef Client, version 11.14.6
+host.example.com resolving cookbooks for run list: ["hogehoge::default"]
+host.example.com Synchronizing Cookbooks:
+host.example.com   - hogehoge
+host.example.com Compiling Cookbooks...
+host.example.com Converging 0 resources
+host.example.com 
+host.example.com Running handlers:
+host.example.com Running handlers complete
+host.example.com Chef Client finished, 0/0 resources updated in 3.112708185 seconds
+
+
+## host2.example.com has no run_list.
+host2.example.com Starting Chef Client, version 11.14.2
+host2.example.com resolving cookbooks for run list: []
+host2.example.com Synchronizing Cookbooks:
+host2.example.com Compiling Cookbooks...
+host2.example.com [2014-08-24T11:52:15+00:00] WARN: Node ngrok01.xenzai.net has an empty run list.
+host2.example.com Converging 0 resources
+host2.example.com 
+host2.example.com Running handlers:
+host2.example.com Running handlers complete
+host2.example.com Chef Client finished, 0/0 resources updated in 3.729471856 seconds
+```
+
 
 ## Sample Workflow
 

data/lib/chef/knife/chef_client.rb

@@ -0,0 +1,49 @@
+require 'chef/knife'
+require 'chef/knife/zero_base'
+
+class Chef
+  class Knife
+    class ZeroChefClient < Chef::Knife::Ssh
+      include Chef::Knife::ZeroBase
+      deps do
+        require 'chef/node'
+        require 'chef/environment'
+        require 'chef/api_client'
+        require 'chef/search/query'
+        require 'knife-zero/bootstrap_ssh'
+        Chef::Knife::BootstrapSsh.load_deps
+      end
+
+      banner "knife zero chef_client QUERY (options)"
+
+      option :attribute,
+        :short => "-a ATTR",
+        :long => "--attribute ATTR",
+        :description => "The attribute to use for opening the connection - default depends on the context",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key.strip }
+
+      def run
+        configure_attribute
+        configure_user
+        configure_password
+        configure_identity_file
+        list = search_nodes
+
+        list.each do |n|
+          Chef::Log.debug("Start session for #{n}")
+          session = knife_ssh
+          session.configure_session(n)
+          session.ssh_command(start_chef_client)
+        end
+      end
+
+      def start_chef_client
+        client_path = @config[:chef_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
+      end
+    end
+  end
+end

data/lib/chef/knife/zero_base.rb

@@ -58,6 +58,22 @@ class Chef
         end
       end
 
+      def knife_ssh
+        ssh = Chef::Knife::BootstrapSsh.new
+        ssh.ui = ui
+        ssh.name_args = [ server_name, ssh_command ] unless ssh.name_args.empty?
+        ssh.config[:ssh_user] = Chef::Config[:knife][:ssh_user] || config[:ssh_user]
+        ssh.config[:ssh_password] = config[:ssh_password]
+        ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
+        ssh.config[:ssh_gateway] = Chef::Config[:knife][:ssh_gateway] || config[:ssh_gateway]
+        ssh.config[:forward_agent] = Chef::Config[:knife][:forward_agent] || config[:forward_agent]
+        ssh.config[:identity_file] = Chef::Config[:knife][:identity_file] || config[:identity_file]
+        ssh.config[:manual] = true
+        ssh.config[:host_key_verify] = Chef::Config[:knife][:host_key_verify] || config[:host_key_verify]
+        ssh.config[:on_error] = :raise
+        ssh
+      end
+
       private
 
       def locate_config_value(key)

data/lib/chef/knife/zero_bootstrap.rb

@@ -80,36 +80,36 @@ class Chef
           name, path = h.split("=")
           Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new  }
 
-        option :secret,
-          :short => "-s SECRET",
-          :long  => "--secret ",
-          :description => "The secret key to use to encrypt data bag item values",
-          :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
-
-        option :secret_file,
-          :long => "--secret-file SECRET_FILE",
-          :description => "A file containing the secret key to use to encrypt data bag item values",
-          :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
-
-        option :bootstrap_url,
-          :long        => "--bootstrap-url URL",
-          :description => "URL to a custom installation script",
-          :proc        => Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u }
-
-        option :bootstrap_install_command,
-          :long        => "--bootstrap-install-command COMMANDS",
-          :description => "Custom command to install chef-client",
-          :proc        => Proc.new { |ic| Chef::Config[:knife][:bootstrap_install_command] = ic }
-
-        option :bootstrap_wget_options,
-          :long        => "--bootstrap-wget-options OPTIONS",
-          :description => "Add options to wget when installing chef-client",
-          :proc        => Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
-
-        option :bootstrap_curl_options,
-          :long        => "--bootstrap-curl-options OPTIONS",
-          :description => "Add options to curl when install chef-client",
-          :proc        => Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
+      option :secret,
+        :short => "-s SECRET",
+        :long  => "--secret ",
+        :description => "The secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
+
+      option :secret_file,
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
+
+      option :bootstrap_url,
+        :long        => "--bootstrap-url URL",
+        :description => "URL to a custom installation script",
+        :proc        => Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u }
+
+      option :bootstrap_install_command,
+        :long        => "--bootstrap-install-command COMMANDS",
+        :description => "Custom command to install chef-client",
+        :proc        => Proc.new { |ic| Chef::Config[:knife][:bootstrap_install_command] = ic }
+
+      option :bootstrap_wget_options,
+        :long        => "--bootstrap-wget-options OPTIONS",
+        :description => "Add options to wget when installing chef-client",
+        :proc        => Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
+
+      option :bootstrap_curl_options,
+        :long        => "--bootstrap-curl-options OPTIONS",
+        :description => "Add options to curl when install chef-client",
+        :proc        => Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
 
       def knife_ssh
         ssh = Chef::Knife::BootstrapSsh.new
@@ -127,6 +127,10 @@ class Chef
         ssh
       end
 
+      alias :default_run :run
+      def run
+        default_run
+      end
     end
   end
 end

data/lib/knife-zero/bootstrap_ssh.rb

@@ -3,8 +3,8 @@ require 'chef/knife/ssh'
 class Chef
   class Knife
     class BootstrapSsh < Chef::Knife::Ssh
-      def configure_session
-        host, ssh_port = @name_args[0].split(" ")
+      def configure_session(args = @name_args)
+        host, ssh_port = args[0].split(" ")
         @longest = host.length
 
         Chef::Log.debug("Configration for #{host}")

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "0.0.2"
+    VERSION = "0.1.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: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,12 +61,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - knife-zero.gemspec
 - lib/chef/knife/bootstrap/chef-full-localmode.erb
+- lib/chef/knife/chef_client.rb
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/knife-zero/bootstrap_ssh.rb