knife-windows 3.0.15 → 3.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chef/knife/bootstrap_windows_ssh.rb +2 -12
  3. data/lib/chef/knife/bootstrap_windows_winrm.rb +2 -14
  4. data/lib/chef/knife/{bootstrap_windows_base.rb → helpers/bootstrap_windows_base.rb} +1 -8
  5. data/lib/chef/knife/{knife_windows_base.rb → helpers/knife_windows_base.rb} +0 -0
  6. data/lib/chef/knife/{winrm_base.rb → helpers/winrm_base.rb} +0 -0
  7. data/lib/chef/knife/{winrm_knife_base.rb → helpers/winrm_knife_base.rb} +0 -0
  8. data/lib/chef/knife/{winrm_session.rb → helpers/winrm_session.rb} +0 -0
  9. data/lib/chef/knife/{winrm_shared_options.rb → helpers/winrm_shared_options.rb} +0 -0
  10. data/lib/chef/knife/{wsman_endpoint.rb → helpers/wsman_endpoint.rb} +0 -0
  11. data/lib/chef/knife/windows_cert_generate.rb +1 -1
  12. data/lib/chef/knife/windows_cert_install.rb +1 -1
  13. data/lib/chef/knife/windows_listener_create.rb +1 -1
  14. data/lib/chef/knife/winrm.rb +3 -3
  15. data/lib/chef/knife/wsman_test.rb +2 -2
  16. data/lib/knife-windows/version.rb +1 -1
  17. data/spec/unit/knife/winrm_session_spec.rb +1 -1
  18. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f5fbbec60197053e26aceab8398496393e38a25d0c6c5f79902a9bd1e394083f
4
- data.tar.gz: 4838ed078b2fa860e782b455a56ab873a131ca522aa5a274c6d6e54c9e485a97
3
+ metadata.gz: 5bf9ee2c613479ede8ca7162dc326889a69a3936c794d0f8898a014676aa7373
4
+ data.tar.gz: 7bd86644459d72d726f04a05ebf5556681c7c9500d7265f462bf2faed021fcdf
5
5
  SHA512:
6
- metadata.gz: 7793a226c83203460df2b9e9dc9de02be5dc51774bb504402e6a1b1e0264ab7c33ee7c85a7878aaa27e885668f1b02a107d7f7e25b5a98c4995184ef23efd52b
7
- data.tar.gz: 9802968c5d5d5053618b50ae74918be38d74e92408f3559b731952113ac763b1754d3e28c960d94f3f259b6892dd726e7146f97f17286f71a924f9fd385e4b37
6
+ metadata.gz: c47e0e9ce82edda40813b9bb78756efa366df609e14fa2b8f35c08e122f1704882576e7edc9a7d82a151befeac2833f05b82f46172c2dae3323fdd9546f75c8c
7
+ data.tar.gz: d57e52ac773a16fd50274ad0a39a5222fc0b1cea5cc5e3ff2b1b4cec26f49a4ac14b4b8fe72ff0daa53857b6dfb7b01a0fa67e706b77b4e4163f06cb799440b4
data/lib/chef/knife/bootstrap_windows_ssh.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Seth Chisamore (<schisamo@chef.io>)
3
- # Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) 2011-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
17
17
  #
18
18
 
19
19
  require "chef/knife"
20
- require_relative "bootstrap_windows_base"
20
+ require_relative "helpers/bootstrap_windows_base"
21
21
 
22
22
  class Chef
23
23
  class Knife
@@ -25,16 +25,6 @@ class Chef
25
25
 
26
26
  include Chef::Knife::BootstrapWindowsBase
27
27
 
28
- deps do
29
- require "chef/json_compat"
30
- require "tempfile"
31
- require "highline"
32
- require "net/ssh"
33
- require "net/ssh/multi"
34
- Chef::Knife::Ssh.load_deps
35
- Chef::Knife::Bootstrap.load_deps
36
- end
37
-
38
28
  banner "knife bootstrap windows ssh FQDN (options) DEPRECATED"
39
29
 
40
30
  option :ssh_user,
data/lib/chef/knife/bootstrap_windows_winrm.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Seth Chisamore (<schisamo@chef.io>)
3
- # Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) 2011-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,25 +17,13 @@
17
17
  #
18
18
 
19
19
  require "chef/knife"
20
- require_relative "bootstrap_windows_base"
21
- require_relative "winrm_base"
22
- require_relative "winrm_knife_base" # WinrmCommandSharedFunctions
20
+ require_relative "helpers/bootstrap_windows_base"
23
21
 
24
22
  class Chef
25
23
  class Knife
26
24
  class BootstrapWindowsWinrm < Bootstrap
27
25
 
28
26
  include Chef::Knife::BootstrapWindowsBase
29
- include Chef::Knife::WinrmBase
30
- include Chef::Knife::WinrmCommandSharedFunctions
31
-
32
- deps do
33
- require_relative "winrm"
34
- require "chef/json_compat"
35
- require "tempfile"
36
- Chef::Knife::Winrm.load_deps
37
- Chef::Knife::Bootstrap.load_deps
38
- end
39
27
 
40
28
  banner "knife bootstrap windows winrm FQDN (options) DEPRECATED"
41
29
 
data/lib/chef/knife/{bootstrap_windows_base.rb → helpers/bootstrap_windows_base.rb} RENAMED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Seth Chisamore (<schisamo@chef.io>)
3
- # Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) 2011-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,13 +32,6 @@ class Chef
32
32
  def self.included(includer)
33
33
  includer.class_eval do
34
34
 
35
- deps do
36
- require "chef/knife/bootstrap"
37
- require "chef/encrypted_data_bag_item"
38
- require "readline"
39
- require "chef/json_compat"
40
- end
41
-
42
35
  option :chef_node_name,
43
36
  short: "-N NAME",
44
37
  long: "--node-name NAME",
data/lib/chef/knife/windows_cert_generate.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  #
17
17
 
18
18
  require "chef/knife"
19
- require_relative "winrm_base"
19
+ require_relative "helpers/winrm_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/windows_cert_install.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  #
17
17
 
18
18
  require "chef/knife"
19
- require_relative "winrm_base"
19
+ require_relative "helpers/winrm_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/windows_listener_create.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  #
17
17
 
18
18
  require "chef/knife"
19
- require_relative "winrm_base"
19
+ require_relative "helpers/winrm_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/winrm.rb CHANGED
@@ -17,8 +17,8 @@
17
17
  #
18
18
 
19
19
  require "chef/knife"
20
- require_relative "winrm_knife_base" # WinrmCommandSharedFunctions
21
- require_relative "knife_windows_base"
20
+ require_relative "helpers/winrm_knife_base" # WinrmCommandSharedFunctions
21
+ require_relative "helpers/knife_windows_base"
22
22
 
23
23
  class Chef
24
24
  class Knife
@@ -31,7 +31,7 @@ class Chef
31
31
  require_relative "windows_cert_generate"
32
32
  require_relative "windows_cert_install"
33
33
  require_relative "windows_listener_create"
34
- require_relative "winrm_session"
34
+ require_relative "helpers/winrm_session"
35
35
  require "readline"
36
36
  require "chef/search/query"
37
37
  end
data/lib/chef/knife/wsman_test.rb CHANGED
@@ -17,8 +17,8 @@
17
17
  #
18
18
 
19
19
  require "chef/knife"
20
- require_relative "winrm_knife_base"
21
- require_relative "wsman_endpoint"
20
+ require_relative "helpers/winrm_knife_base"
21
+ require_relative "helpers/wsman_endpoint"
22
22
 
23
23
  class Chef
24
24
  class Knife
data/lib/knife-windows/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Windows
3
- VERSION = "3.0.15".freeze
3
+ VERSION = "3.0.16".freeze
4
4
  MAJOR, MINOR, TINY = VERSION.split(".")
5
5
  end
6
6
  end
data/spec/unit/knife/winrm_session_spec.rb CHANGED
@@ -17,7 +17,7 @@
17
17
  #
18
18
 
19
19
  require "spec_helper"
20
- require_relative "../../../lib/chef/knife/winrm_session"
20
+ require_relative "../../../lib/chef/knife/helpers/winrm_session"
21
21
  require "dummy_winrm_connection"
22
22
 
23
23
  describe Chef::Knife::WinrmSession do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-windows
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.15
4
+ version: 3.0.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Seth Chisamore
@@ -75,19 +75,19 @@ extensions: []
75
75
  extra_rdoc_files: []
76
76
  files:
77
77
  - LICENSE
78
- - lib/chef/knife/bootstrap_windows_base.rb
79
78
  - lib/chef/knife/bootstrap_windows_ssh.rb
80
79
  - lib/chef/knife/bootstrap_windows_winrm.rb
81
- - lib/chef/knife/knife_windows_base.rb
80
+ - lib/chef/knife/helpers/bootstrap_windows_base.rb
81
+ - lib/chef/knife/helpers/knife_windows_base.rb
82
+ - lib/chef/knife/helpers/winrm_base.rb
83
+ - lib/chef/knife/helpers/winrm_knife_base.rb
84
+ - lib/chef/knife/helpers/winrm_session.rb
85
+ - lib/chef/knife/helpers/winrm_shared_options.rb
86
+ - lib/chef/knife/helpers/wsman_endpoint.rb
82
87
  - lib/chef/knife/windows_cert_generate.rb
83
88
  - lib/chef/knife/windows_cert_install.rb
84
89
  - lib/chef/knife/windows_listener_create.rb
85
90
  - lib/chef/knife/winrm.rb
86
- - lib/chef/knife/winrm_base.rb
87
- - lib/chef/knife/winrm_knife_base.rb
88
- - lib/chef/knife/winrm_session.rb
89
- - lib/chef/knife/winrm_shared_options.rb
90
- - lib/chef/knife/wsman_endpoint.rb
91
91
  - lib/chef/knife/wsman_test.rb
92
92
  - lib/knife-windows/version.rb
93
93
  - spec/assets/fake_trusted_certs/excluded.txt