knife-zero 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75c856acf221ffb4f0c2f039b9c2d8b53a55504
-  data.tar.gz: 93efdd9ce4a2b526e7739e563ca294a2552175e0
+  metadata.gz: b8b3705dafa27da903873188a610945eeefd35d3
+  data.tar.gz: da2ad9277a6742c1c0ae3b80e73d524e319319e0
 SHA512:
-  metadata.gz: a731fe554d0eafd4fe498aac475036c5eda96d3169964fea3f833d8df15db4eb8760615edb73016d4aaa1d91879108532d946b3a82755445a4ca19c409f039c3
-  data.tar.gz: b9c487c465e67c09dc295459a0966205d4c0c1976497fd19b6802db6047315b8fc3aa5b10029a6591e2187c8b64d6f825a24be8f38b8d3d3f99631b65941b497
+  metadata.gz: d92be972b08258f7ff93818c20c1a669b63590a79556eaa9aae8543137bbe1d0f0b3bea5bdf7649548d148467ff3a3634f54321d5e1bc1f5a71693057831617d
+  data.tar.gz: e769d2d860c44d4bfeee9aa3ef34211ba6d1dec8ad5d6fded9c0b257aac5e903b35a2e08c722ff04bd7f6a2caacb137762d8656d7e6253f7f05b217ddd8000fb

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog of knife-zero
 
+## Unrelesed
+
+## v1.2.0
+
+- change filename knife/chef_client to zero_chef_client
+- New function diagnose
+
 ## v1.1.6
 
 - Minor update: update bootstrap template for chef 11,12

data/Guardfile

@@ -0,0 +1,5 @@
+clearing :on
+
+guard :shell do
+  watch(%r{^(?:test|lib)/.+\.rb$}) { `ruby test/run_test.rb -v --notify` }
+end

data/README.md

@@ -45,6 +45,7 @@ $ chef gem install knife-zero
 ** ZERO COMMANDS **
 knife zero bootstrap FQDN (options)
 knife zero chef_client QUERY (options)
+knife zero diagnose # show configuration from file
 ```
 
 ### knife zero bootstrap
@@ -336,6 +337,58 @@ $ knife zero chef_client "name:*" -x vagrant -i ./.vagrant/machines/default/virt
 192.168.33.10 resolving cookbooks for run list: []
 ```
 
+## Debug for Configration
+
+`knife zero diagnose` shows configration from file(Such as knife.rb).
+
+```
+$ knife zero diagnose
+
+Chef::Config
+====================
+---
+:local_mode: true
+:verbosity: 
+:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound/knife.rb"
+:color: true
+:log_level: :error
+:chef_repo_path: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound"
+:log_location: !ruby/object:IO {}
+:chef_server_url: http://localhost:8889
+:repo_mode: everything
+
+Knife::Config
+====================
+---
+:verbosity: 0
+:color: true
+:editor: vim
+:disable_editing: false
+:format: summary
+:ssh_user: root
+:host_key_verify: true
+:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound/knife.rb"
+
+Zero Boostrap Config
+====================
+---
+:ssh_user: root
+:host_key_verify: true
+:distro: chef-full-localmode
+:template_file: false
+:run_list: []
+:first_boot_attributes: {}
+
+Zero ChefClient Config
+====================
+---
+:ssh_user: root
+:host_key_verify: true
+:concurrency: 
+:override_runlist: 
+```
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/knife-zero/fork )

data/circle.yml

@@ -0,0 +1,7 @@
+---
+machine:
+  ruby:
+    version: 2.1.5
+test:
+  override:
+    - bundle exec ruby test/run_test.rb -v

data/knife-zero.gemspec

@@ -20,6 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "test-unit-rr"
+  spec.add_development_dependency "test-unit-notify"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-shell"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-rcov"
 
   spec.add_runtime_dependency "chef"
 end

data/lib/chef/knife/zero_diagnose.rb

@@ -0,0 +1,51 @@
+require 'chef/knife'
+require 'chef/knife/bootstrap'
+require 'chef/knife/zero_base'
+
+class Chef
+  class Knife
+    class ZeroDiagnose < Knife
+      include Chef::Knife::ZeroBase
+
+      deps do
+        require 'knife-zero/core/bootstrap_context'
+        require 'chef/knife/zero_bootstrap'
+        require 'chef/knife/zero_chef_client'
+        Chef::Knife::ZeroBootstrap.load_deps
+        Chef::Knife::ZeroChefClient.load_deps
+      end
+
+      banner "knife zero diagnose # show configuration from file"
+
+      def initialize(argv = [])
+        super
+        @bootstrap = Chef::Knife::ZeroBootstrap.new
+        @chef_client = Chef::Knife::ZeroChefClient.new
+      end
+
+      def run
+        ui.msg "Chef::Config"
+        ui.msg "===================="
+        ui.msg Chef::Config.configuration.to_yaml
+        ui.msg ""
+
+        ui.msg "Knife::Config"
+        ui.msg "===================="
+        ui.msg config.to_yaml
+        ui.msg ""
+
+        ui.msg "Zero Boostrap Config"
+        ui.msg "===================="
+        bootstrap = Chef::Knife::ZeroBootstrap.new
+        @bootstrap.merge_configs
+        ui.msg @bootstrap.config.to_yaml
+        ui.msg ""
+
+        ui.msg "Zero ChefClient Config"
+        ui.msg "===================="
+        @chef_client.merge_configs
+        ui.msg @chef_client.config.to_yaml
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

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

data/test/chef/knife/test_zero_bootstrap.rb

@@ -0,0 +1,29 @@
+require 'chef/knife/zero_bootstrap'
+
+class TC_ZeroBootstrap < Test::Unit::TestCase
+  sub_test_case "called with no options" do
+    def setup
+      @app = Chef::Knife::ZeroBootstrap.new
+      @app.merge_configs
+      require 'chef/knife/ssh'
+      Chef::Knife::ZeroBootstrap.load_deps
+    end
+
+    test "returns changed value from core" do
+      assert_equal("chef-full-localmode", @app.config[:distro])
+    end
+
+    test "returns BootstrapSsh via knife_ssh" do
+      ssh = @app.knife_ssh
+      assert_kind_of(Chef::Knife::BootstrapSsh, ssh)
+    end
+
+    sub_test_case "overwrite ssh_configration from ssh/config" do
+      test "overwrite port number" do
+        stub(Net::SSH).configuration_for { {port: 10022} }
+        ssh = @app.knife_ssh
+        assert_equal(10022, ssh.config[:port])
+      end
+    end
+  end
+end

data/test/chef/knife/test_zero_chef_client.rb

@@ -0,0 +1,14 @@
+require 'chef/knife/zero_chef_client'
+class TC_ZeroChefClient < Test::Unit::TestCase
+  sub_test_case "called with no options" do
+    def setup
+      @app = Chef::Knife::ZeroChefClient.new
+      @app.merge_configs
+    end
+
+    test "returns changed value from core" do
+      assert_nil(@app.config[:concurrency])
+      assert_nil(@app.config[:override_runlist])
+    end
+  end
+end

data/test/knife-zero/test_bootstrap_ssh.rb

@@ -0,0 +1,18 @@
+require 'knife-zero/bootstrap_ssh'
+
+class TC_BootstrapSsh < Test::Unit::TestCase
+  def setup
+    @app = Chef::Knife::BootstrapSsh.new
+    @app.merge_configs
+  end
+
+  test "RR" do
+    assert_rr do
+      subject = Hash.new
+      mock(subject).to_json("hoge") {
+        "mogemoge"
+      }
+      assert_equal("mogemoge", subject.to_json("hoge"))
+    end
+  end
+end

data/test/knife-zero/test_versioin.rb

@@ -0,0 +1,7 @@
+require "knife-zero/version"
+
+class TC_Version < Test::Unit::TestCase
+  test "returns version correctly" do
+    assert_equal("1.2.0", Knife::Zero::VERSION)
+  end
+end

data/test/run_test.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+lib_dir  = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+$LOAD_PATH.unshift(lib_dir)
+
+require 'test/unit'
+require 'test/unit/rr'
+require 'simplecov'
+require 'simplecov-rcov'
+
+if ENV['CIRCLE_ARTIFACTS']
+  dir = File.join("..", "..", "..", ENV['CIRCLE_ARTIFACTS'], "coverage")
+  SimpleCov.coverage_dir(dir)
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start do
+    add_filter "/vendor/"
+    add_filter "/test/"
+  end
+else
+  require "test/unit/notify"
+end
+
+exit Test::Unit::AutoRunner.run(true, test_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,104 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-notify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -63,19 +161,27 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- circle.yml
 - 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/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/net-ssh-multi-patch.rb
 - lib/knife-zero/version.rb
+- test/chef/knife/test_zero_bootstrap.rb
+- test/chef/knife/test_zero_chef_client.rb
+- test/knife-zero/test_bootstrap_ssh.rb
+- test/knife-zero/test_versioin.rb
+- test/run_test.rb
 homepage: ''
 licenses:
 - Apache2
@@ -101,4 +207,9 @@ signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
   port fowarding.
-test_files: []
+test_files:
+- test/chef/knife/test_zero_bootstrap.rb
+- test/chef/knife/test_zero_chef_client.rb
+- test/knife-zero/test_bootstrap_ssh.rb
+- test/knife-zero/test_versioin.rb
+- test/run_test.rb