knife-zero 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc675803ccbf5f586711666bfee3b4a9ec46687
-  data.tar.gz: f00a5d34ae9b64a051c62f97b45b09e2b7312a33
+  metadata.gz: 6ab2834fd2beeea31094b0febd081c29a15db310
+  data.tar.gz: 189892d9e4dedadeaec7f94ca9f2e25e7aad4528
 SHA512:
-  metadata.gz: 54bac746bf8b408d0eec0d669c25527c8e8ade834f35534340931cc807219786740e804e42ed796d8a482f3d28b374b93fb5b950b11a811be4a3ace07eab0efc
-  data.tar.gz: dc710abf2017e12553ed1ae187e6fe4358f1d899b8ba55b862269bf90c36de9a23756eefa11e1a9800d372770dccff82d699fa0044749715f30314a86418d495
+  metadata.gz: 731464bccd0cbe722eac85f62191d0345ae86ad77fa4969a30f8ef055d741b3defb8d589db89091c379fd02990ec4afc0bf9c1798961172313a35b32fae60dfb
+  data.tar.gz: 2fe821ece3692371730f722942d55d0c74f9f1faea4d4655d132be4257d6c142f7e65fa9a07fa8dd9109713e1e748c6f9f4f6fd6087afe1e1a12eb66bafb60c1

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v1.8.4
+
+- Patched `net-ssh-multi`s from "1.1.0", "1.2.0" to "1.1.0", "1.2.0", "1.2.1"
+    - and create issue #62
+
 ## v1.8.3
 
 - include Chef#3900 until merge.

data/knife-zero.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "Apache2"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = Dir['README.md','CHANGELOG.md','knife-zero.gemspec','lib/**/*']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/knife-zero/net-ssh-multi-patch.rb

@@ -1,6 +1,6 @@
 require 'net/ssh/multi/version'
 
-if Net::SSH::Multi::Version::STRING == "1.1.0" || Net::SSH::Multi::Version::STRING == "1.2.0"
+if Net::SSH::Multi::Version::STRING == "1.1.0" || Net::SSH::Multi::Version::STRING == "1.2.0" || Net::SSH::Multi::Version::STRING == "1.2.1"
 
   require 'net/ssh/multi'
 

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.8.3"
+    VERSION = "1.8.4"
     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.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,18 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - CHANGELOG.md
-- Dockerfile
-- Gemfile
-- Guardfile
-- LICENSE.txt
 - README.md
-- Rakefile
-- circle.yml
-- integration_test/chef-repo/knife.rb
-- integration_test/chef-repo/run.sh
-- integration_test/pre/Dockerfile
 - knife-zero.gemspec
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
@@ -181,13 +171,6 @@ files:
 - 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
-- test/chef/knife/test_zero_chef_client.rb
-- test/knife-zero/core/test_bootstrap_context.rb
-- test/knife-zero/core/test_zerohelper.rb
-- test/knife-zero/test_bootstrap_ssh.rb
-- test/knife-zero/test_versioin.rb
-- test/run_test.rb
 homepage: ''
 licenses:
 - Apache2
@@ -213,12 +196,5 @@ 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/chef/knife/test_zero_bootstrap.rb
-- test/chef/knife/test_zero_chef_client.rb
-- test/knife-zero/core/test_bootstrap_context.rb
-- test/knife-zero/core/test_zerohelper.rb
-- test/knife-zero/test_bootstrap_ssh.rb
-- test/knife-zero/test_versioin.rb
-- test/run_test.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,43 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-# Created by http://www.gitignore.io
-
-### vim ###
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-
-## Development
-
-.rvmrc
-
-## Integration
-nodes/
-roles/
-environments/
-data_bags/
-clients/
-cookbooks/

data/Dockerfile

@@ -1,25 +0,0 @@
-FROM higanworks/knife-zero-edgebase
-MAINTAINER sawanoboriyu@higanworks.com
-
-ADD .git/index /index
-
-WORKDIR /home
-RUN wget https://codeload.github.com/chef/chef/legacy.tar.gz/master
-RUN tar xvzf master && mv chef-chef-* chef
-
-WORKDIR /home/chef
-
-RUN gem build chef.gemspec
-RUN gem install -V -b chef*.gem --no-ri --no-rdoc
-
-ADD . /home/knife-zero/
-ADD integration_test/chef-repo /chef-repo/
-
-WORKDIR /home/knife-zero
-
-RUN gem build knife-zero.gemspec
-RUN gem install -V -l knife-zero-*.gem
-
-WORKDIR /chef-repo
-
-CMD ["sh", "run.sh"]

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in knife-zero.gemspec
-gemspec

data/Guardfile

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

data/LICENSE.txt

@@ -1,13 +0,0 @@
-Copyright (c) 2014-2015 sawanoboly@higanworks.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/circle.yml

@@ -1,15 +0,0 @@
----
-machine:
-  ruby:
-    version: 2.1.5
-  services:
-    - docker
-test:
-  override:
-    - bundle exec ruby test/run_test.rb -v
-deployment:
-  integration:
-    branch: integration_testedge
-    commands:
-      - docker build -t local/knife-zero .
-      - docker run -it local/knife-zero sh run.sh

data/integration_test/chef-repo/knife.rb

@@ -1,2 +0,0 @@
-local_mode true
-chef_repo_path "."

data/integration_test/chef-repo/run.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-/usr/sbin/sshd -E /tmp/log -o 'LogLevel DEBUG'
-knife zero diagnose
-knife zero bootstrap 127.0.0.1 -N zerohost -x docker -P docker --sudo -V
-knife node show zerohost
-knife zero chef_client "name:zerohost" -a ipaddress -x docker -P docker --sudo -V
-

data/integration_test/pre/Dockerfile

@@ -1,11 +0,0 @@
-FROM ubuntu:15.04
-MAINTAINER sawanoboriyu@higanworks.com
-
-RUN apt-get -y update
-RUN apt-get -y install sudo git build-essential ruby2.1 ruby2.1-dev openssh-server wget vim net-tools
-
-
-RUN mkdir /var/run/sshd
-RUN useradd -p $(perl -e'print crypt("docker", "docker")') -m docker
-RUN echo '%docker ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/docker
-CMD ["/bin/true"]

data/test/chef/knife/test_zero_bootstrap.rb

@@ -1,33 +0,0 @@
-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 true from Chef::Config[:knife_zero]" do
-      assert_equal({}, Chef::Config[:knife_zero])
-    end
-
-    test "returns expected bootstrap template(for notice changes of core to me)" do
-      assert_equal("chef-full", @app.default_bootstrap_template)
-    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_configuration 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

@@ -1,18 +0,0 @@
-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 true from Chef::Config[:knife_zero]" do
-      assert(Chef::Config[:knife_zero])
-    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/core/test_bootstrap_context.rb

@@ -1,20 +0,0 @@
-require 'chef/knife/zero_chef_client'
-require 'knife-zero/core/bootstrap_context'
-
-class TC_BootstrapContext < Test::Unit::TestCase
-  def setup
-    Chef::Config[:validation_key] = nil
-    app = Chef::Knife::ZeroBootstrap.new
-    app.merge_configs
-    @bsc = Chef::Knife::Core::BootstrapContext.new(app.config, [], Chef::Config.configuration)
-    stub(OpenSSL::PKey::RSA).new{"knife-zerozero"}
-  end
-
-  test "Should use aliased validation_key" do
-    assert_equal("knife-zerozero", @bsc.validation_key)
-  end
-
-  test "Should use aliased start_chef" do
-    assert_match('-S http://127.0.0.1', @bsc.start_chef)
-  end
-end

data/test/knife-zero/core/test_zerohelper.rb

@@ -1,43 +0,0 @@
-require 'chef/knife/zero_base'
-require 'knife-zero/helper'
-
-class TC_ZeroHelper < Test::Unit::TestCase
-  def setup
-    @config = Chef::Config
-  end
-
-  test "Should returns 18889 as zero_remote_port by default" do
-    assert_equal(18889, ::Knife::Zero::Helper.zero_remote_port)
-  end
-
-  sub_test_case "override" do
-    test "Should returns 10000 + chef_zero_port as zero_remote_port" do
-      @config[:chef_zero_port] = 2500
-      assert_equal(12500, ::Knife::Zero::Helper.zero_remote_port)
-    end
-
-    test "Should returns 10000 + knife:chef_zero_port as zero_remote_port" do
-      @config[:knife][:chef_zero_port] = 2500
-      assert_equal(12500, ::Knife::Zero::Helper.zero_remote_port)
-    end
-
-    def teardown
-      @config[:chef_zero_port] = nil
-      @config[:knife][:chef_zero_port] = nil
-    end
-  end
-
-  sub_test_case "force set by remote_chef_zero_port" do
-
-    test "Should returns passed remote_chef_zero_port as zero_remote_port" do
-      @config[:remote_chef_zero_port] = 8888
-      @config[:chef_zero_port] = 2500
-      assert_equal(8888, ::Knife::Zero::Helper.zero_remote_port)
-    end
-
-    def teardown
-      @config[:remote_chef_zero_port] = nil
-      @config[:chef_zero_port] = nil
-    end
-  end
-end

data/test/knife-zero/test_bootstrap_ssh.rb

@@ -1,8 +0,0 @@
-require 'knife-zero/bootstrap_ssh'
-
-class TC_BootstrapSsh < Test::Unit::TestCase
-  def setup
-    @app = Chef::Knife::BootstrapSsh.new
-    @app.merge_configs
-  end
-end

data/test/knife-zero/test_versioin.rb

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

data/test/run_test.rb

@@ -1,25 +0,0 @@
-#!/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)