knife 17.0.246 → 17.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9714474b9e1fa45b9d6cec91dce108b10ee8a07f29d0ced04185f336b2edbd4
-  data.tar.gz: 5744d5b2b0cb712525109664125c80a2f76651b7ff329a8eba8a32b8338568b8
+  metadata.gz: dfdc3eb6fcda5623dfcc18f91ebb49ce954ad0601d07a2c8d4dfff3ef2a3ff09
+  data.tar.gz: 68dabbc229978345b7b1057a890ca6936d6209a3040a245d700071e76ecccc0d
 SHA512:
-  metadata.gz: 769e008266429502e41065ee613eff2a163724dcc7891ba0538d98fe46c78acddcc552d1da75d788e934ea531f3becd2563ba5b07311c9864e9e35c72933122a
-  data.tar.gz: 6bffc2801f85586d019540689e4cb5c6ca92eeb8315f903de9e5637d9fb625791a2927add053eedcb5844241ec4988bdcf93c307cd2b1097f38ed4fe39b93696
+  metadata.gz: 19fabdab9e993be664662b6f7281ab8b81c65a75b2b7764a8945d48a31a301bd32e9abbda920b61fa7e764b5382ba6a97833827ad6e76f4049c57d768f231437
+  data.tar.gz: d865c45c0532429a8939ac61c6ca5af5f378719a9cc178d2ad6cfca40008e09188b7bf9f75a522ef149a532cd7a7886ed1c9cc7a21c54c3156673b645185a856

data/Gemfile

@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 
+gem "knife", path: "."
+
 group(:development, :test) do
   gem "cheffish", ">= 14" # testing only , but why didn't this need to explicit in chef?
   gem "webmock" # testing only
@@ -8,11 +10,6 @@ group(:development, :test) do
   gem "chef-bin", path: "../chef-bin"
 end
 
-group(:ruby_prof) do
-  # ruby-prof 1.3.0 does not compile on our centos6 builders/kitchen testers
-  gem "ruby-prof", "< 1.3.0"
-end
-
 group(:omnibus_package, :pry) do
   gem "pry"
   gem "pry-byebug"

data/Rakefile

@@ -25,12 +25,7 @@ begin
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.verbose = false
     t.rspec_opts = %w{--profile}
-    t.pattern = FileList["../spec/unit/knife/**/*_spec.rb"] +
-      FileList["../spec/unit/knife_spec.rb"] +
-      FileList["../spec/unit/application/knife_spec.rb"] +
-      FileList["../spec/integration/knife/*_spec.rb"] +
-      FileList["../spec/functional/knife/*_spec.rb"]
-    t.ruby_opts = "-I ../spec"
+    t.pattern = FileList["spec/**/*_spec.rb"]
 
   end
 rescue LoadError

data/knife.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 17.0"
-  s.add_dependency "ffi", ">= 1.9.25", "< 1.14.0" # 1.14 breaks i386 windows. It should be fixed in 1.14.3
+  s.add_dependency "ffi", ">= 1.15" # 1.14 versions are broken on i386 windows
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 5.1", "< 7"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w{ lib }
   s.files = %w{Gemfile Rakefile LICENSE knife.gemspec} +
-    Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
+    Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/chef/chef/issues",

data/lib/chef/knife/configure.rb

@@ -29,7 +29,6 @@ class Chef
         require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
         require_relative "client_create"
         require_relative "user_create"
-        require "ohai" unless defined?(Ohai)
         Chef::Knife::ClientCreate.load_deps
         Chef::Knife::UserCreate.load_deps
       end
@@ -131,6 +130,7 @@ class Chef
 
       # @return [String] our best guess at what the servername should be using Ohai data and falling back to localhost
       def guess_servername
+        require "ohai" unless defined?(Ohai::System)
         o = Ohai::System.new
         o.all_plugins(%w{ os hostname fqdn })
         o[:fqdn] || o[:machinename] || o[:hostname] || "localhost"

data/lib/chef/knife/org_user_add.rb

@@ -29,7 +29,7 @@ class Chef
         description: "Add user to admin group"
 
       deps do
-        require_relative "../org"
+        require "chef/org"
       end
 
       def run

data/lib/chef/knife/ssl_fetch.rb

@@ -28,7 +28,7 @@ class Chef
         require "socket" unless defined?(Socket)
         require "uri" unless defined?(URI)
         require "openssl" unless defined?(OpenSSL)
-        require "chef/mixin/mixin/proxified_socket" unless defined?(Chef::Mixin::ProxifiedSocket)
+        require "chef/mixin/proxified_socket" unless defined?(Chef::Mixin::ProxifiedSocket)
 
         include Chef::Mixin::ProxifiedSocket
       end

data/lib/chef/knife/version.rb

@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "17.0.246".freeze
+    VERSION = "17.2.18".freeze
   end
 end
 

data/spec/data/apt/chef-integration-test-1.0/debian/changelog

@@ -0,0 +1,5 @@
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.0/debian/compat

@@ -0,0 +1 @@
+7

data/spec/data/apt/chef-integration-test-1.0/debian/control

@@ -0,0 +1,13 @@
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.0/debian/copyright

@@ -0,0 +1,34 @@
+This work was packaged by:
+
+    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
+
+Upstream Author(s):
+
+    Opscode, Inc.
+
+Copyright:
+
+    Copyright 2010-2016, Chef Software Inc.
+
+License:
+
+    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.
+
+The Debian packaging is:
+
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
+
+
+and is licensed under the Apache 2.0 license.
+
+See "/usr/share/common-licenses/Apache-2.0"

data/spec/data/apt/chef-integration-test-1.0/debian/files

@@ -0,0 +1 @@
+chef-integration-test_1.0-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.0/debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.0/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

data/spec/data/apt/chef-integration-test-1.1/debian/changelog

@@ -0,0 +1,11 @@
+chef-integration-test (1.1-1) unstable; urgency=low
+
+  * New upstream release (1.1)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 10:09:34 -0600
+
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.1/debian/compat

@@ -0,0 +1 @@
+7

data/spec/data/apt/chef-integration-test-1.1/debian/control

@@ -0,0 +1,13 @@
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.1/debian/copyright

@@ -0,0 +1,34 @@
+This work was packaged by:
+
+    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
+
+Upstream Author(s):
+
+    Opscode, Inc.
+
+Copyright:
+
+    Copyright 2010-2016, Chef Software Inc.
+
+License:
+
+    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.
+
+The Debian packaging is:
+
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
+
+
+and is licensed under the Apache 2.0 license.
+
+See "/usr/share/common-licenses/Apache-2.0"

data/spec/data/apt/chef-integration-test-1.1/debian/files

@@ -0,0 +1 @@
+chef-integration-test_1.1-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.1/debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.1/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

data/spec/data/apt/chef-integration-test2-1.0/debian/changelog

@@ -0,0 +1,5 @@
+chef-integration-test2 (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.debhelper.log

@@ -0,0 +1,45 @@
+dh_auto_configure
+dh_auto_build
+dh_auto_test
+dh_prep
+dh_installdirs
+dh_auto_install
+dh_install
+dh_installdocs
+dh_installchangelogs
+dh_installexamples
+dh_installman
+dh_installcatalogs
+dh_installcron
+dh_installdebconf
+dh_installemacsen
+dh_installifupdown
+dh_installinfo
+dh_pysupport
+dh_installinit
+dh_installmenu
+dh_installmime
+dh_installmodules
+dh_installlogcheck
+dh_installlogrotate
+dh_installpam
+dh_installppp
+dh_installudev
+dh_installwm
+dh_installxfonts
+dh_bugfiles
+dh_lintian
+dh_gconf
+dh_icons
+dh_perl
+dh_usrlocal
+dh_link
+dh_compress
+dh_fixperms
+dh_strip
+dh_makeshlibs
+dh_shlibdeps
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.substvars

@@ -0,0 +1 @@
+misc:Depends=

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/conffiles

@@ -0,0 +1 @@
+/usr/share/doc/chef-integration-test2/copyright

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/control

@@ -0,0 +1,10 @@
+Package: chef-integration-test2
+Version: 1.0-1
+Architecture: amd64
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Installed-Size: 36
+Section: ruby
+Priority: extra
+Homepage: http://tickets.opscode.com
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/md5sums

@@ -0,0 +1 @@
+8b3b9ff6cdfe7d7b2b8b8d4f7b9e381f  usr/share/doc/chef-integration-test2/changelog.Debian.gz

data/spec/data/apt/chef-integration-test2-1.0/debian/compat

@@ -0,0 +1 @@
+7

data/spec/data/apt/chef-integration-test2-1.0/debian/conffiles

@@ -0,0 +1 @@
+/usr/share/doc/chef-integration-test2/copyright

data/spec/data/apt/chef-integration-test2-1.0/debian/control

@@ -0,0 +1,13 @@
+Source: chef-integration-test2
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test2-1.0/debian/copyright

@@ -0,0 +1,34 @@
+This work was packaged by:
+
+    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
+
+Upstream Author(s):
+
+    Opscode, Inc.
+
+Copyright:
+
+    Copyright 2010-2016, Chef Software Inc.
+
+License:
+
+    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.
+
+The Debian packaging is:
+
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
+
+
+and is licensed under the Apache 2.0 license.
+
+See "/usr/share/common-licenses/Apache-2.0"

data/spec/data/apt/chef-integration-test2-1.0/debian/files

@@ -0,0 +1 @@
+chef-integration-test2_1.0-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test2-1.0/debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test2-1.0/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)