knife-pinnings 1.4.3 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e81fa9bc64472ebd0bb1e0301fb1932940eea236
-  data.tar.gz: f871a393b8abcb87387d769e1c69b6ea3d5518af
+SHA256:
+  metadata.gz: 3ad64b484bbe7620e835a84ffc03af5f7104ba60fd622245e8498752221ba758
+  data.tar.gz: 2d274e292d546a38376619d8990e79b6007d9f54f647f64668bba2a6bee7bf03
 SHA512:
-  metadata.gz: 37f3e3f5ddbc6556586d864f5c713859b83eae479298ba81a6a935997b98d996a9f74b54f0cb036c27c97f6c3ba4f95876e4fc6bbd5cbc14c3ccb6da4af482ce
-  data.tar.gz: c9aa4da87c27c97b720ea05679afc929f8efa458ffff4af5af496dfbc5937abe6b0cc2987c21bdd15529e47c4c82505edcc49b020354681d510276fc7c2778cb
+  metadata.gz: d45c0c78051022234f8319813fa9fb703f2b074fc57a92e46e5bb4bb21a0999d80501160adc65072b8d56eca7bd1a0d3cebc17ea8b5317ac47c03475facf0816
+  data.tar.gz: 2e45dab67c3eaa3572da34f9ac9e6ec6bda84b1ef8068781002999d4fb14167fb4aee26208cf24f05a4bec9786f1f9276ff225fbed38452ddcc03dd905b35624

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/README.md

@@ -1,5 +1,6 @@
 # knife-pinnings
 
+
 This gem extends Chef's knife command to manage version pinnings in your Chef environments
 
 * Set a cookbook pinning explicitly or by using metadata.rb

data/knife-pinnings.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Chef knife plugin to set, list, compare, copy and delete cookbook pinnings across environments'
   spec.description   = 'Chef knife plugin to set, list, compare, copy and delete cookbook pinnings across environments'
   spec.homepage      = 'https://github.com/trickyearlobe/knife-pinnings'
-  spec.license       = 'Apache 2.0'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
@@ -21,11 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rake'
-  spec.add_development_dependency 'guard-shell'
-  spec.add_development_dependency 'guard-rubocop'
 end

data/lib/chef/knife/pinnings_compare.rb

@@ -14,7 +14,7 @@
 
 class Chef
   class Knife
-    # This class implements knife pinnings list ['environment_regex'] ['cookbook_regex']
+    # This class implements knife pinnings compare ['environment_regex'] ['cookbook_regex']
     class PinningsCompare < Chef::Knife
       require 'chef/knife/pinnings_mixin'
       banner 'knife pinnings compare [ENV_REGEX] [COOKBOOK_REGEX]'

data/lib/chef/knife/pinnings_local_cookbook.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'chef/cookbook/metadata'
+
 class Chef
   class Knife
     # This class implements knife pinnings get local METADATA_ITEM

data/lib/chef/knife/pinnings_mixin.rb

@@ -75,13 +75,11 @@ def build_pinnings_table(environments, cookbook_regex)
   cookbooks_grid
 end
 
-def set_environnment_pinnings(environment, pinnings) 
-
+def set_environnment_pinnings(environment, pinnings)
   pinnings.each do |name,pinning|
     environment.cookbook_versions[name] = pinning
   end
   environment.save
-
 end
 
 def add_color(row)
@@ -128,19 +126,21 @@ def cookbooks_used_by(rest, environment)
   roles = []
   nodes = nodes_in(rest, environment)
   nodes.each do |node|
-    response = rest.get_rest("/nodes/#{node}").run_list
-    _recipes = response.recipe_names 
+    response=Chef::RunList.new(rest.get_rest("/nodes/#{node}")['run_list'].join(','))
+    _recipes = response.recipe_names
     _roles = response.role_names
     recipes = recipes | (if (_recipes==nil) then [] else _recipes end)
     roles = roles | (if (_roles==nil) then [] else _roles end)
   end
   recipes_from_roles = []
-  roles.each do |role| 
+  roles.each do |role|
     run_list = [Chef::RunList::RunListItem.new("role[#{role}]")]
     expansion = Chef::RunList::RunListExpansionFromAPI.new(environment, run_list, rest)
     expansion.expand
     recipes_from_roles = recipes_from_roles | expansion.recipes
   end
+  recipes.delete ""
+  recipes_from_roles.delete ""
   (recipes | recipes_from_roles).map { |r| r.split('@').first.split('::').first }
 end
 
@@ -178,7 +178,7 @@ def solve_recipes(rest, environment, cookbooks_with_contraints)
   response = rest.post_rest("/environments/#{environment}/cookbook_versions",{:run_list => cookbooks_with_contraints})
   solution = Hash.new
   response.sort.each do |name, cb|
-    solution[name]=cb.version
+    solution[name]=cb['version']
   end
   return solution
 end

data/lib/chef/knife/pinnings_set.rb

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'chef/cookbook/metadata'
+
 class Chef
   class Knife
-    # This class implements knife pinnings list ['environment_regex'] ['cookbook_regex']
+    # This class implements knife pinnings set <environment> [cookbook version]
     class PinningsSet < Chef::Knife
       banner 'knife pinnings set ENVIRONMENT [COOKBOOK VERSION]'
 

data/lib/chef/knife/pinnings_set_auto.rb

@@ -14,11 +14,11 @@
 
 class Chef
   class Knife
-    # This class knife pinnings set auto ['environment'] ['cookbook_regex']
+    # This class implements knife pinnings set auto <environment> [cookbook[@version]]
     class PinningsSetAuto < Chef::Knife
       require 'chef/knife/pinnings_mixin'
       banner 'knife pinnings set auto ENVIRONMENT [COOKBOOK_VERSION_CONSTRAINTS]'
-      FakeChefEnvironmentStruct = Struct.new :name, :cookbook_versions 
+      FakeChefEnvironmentStruct = Struct.new :name, :cookbook_versions
 
       def run
         case name_args.length
@@ -35,7 +35,7 @@ class Chef
           exit 255
         end
         @environment = Environment.load(@environment_name)
-        nodes = nodes_in(rest, @environment)  
+        nodes = nodes_in(rest, @environment)
         ui.info("#{nodes.length} nodes have been found in environment #{@environment_name}: #{nodes.to_s}")
         cookbooks = cookbooks_used_by(rest, @environment_name)
         ui.info("#{cookbooks.length} recipes have been found for the nodes: #{cookbooks.to_s}")
@@ -54,7 +54,7 @@ class Chef
         environments.push(@environment)
         environments.push(FakeChefEnvironmentStruct.new('chef_resolver_solution',solution_cookbook_versions))
         display_pinnings_table(environments, @cookbook_regex)
-        
+
         ui.msg('')
         ui.confirm("Do you want to set these cookbook versions on chef environment:#{@environment_name} ")
         ui.msg('')

data/lib/chef/knife/pinnings_wipe.rb

@@ -14,7 +14,7 @@
 
 class Chef
   class Knife
-    # This class implements knife pinnings list ['environment_regex'] ['cookbook_regex']
+    # This class implements knife pinnings wipe ['environment'] ['cookbook_regex']
     class PinningsWipe < Chef::Knife
       require 'chef/knife/pinnings_mixin'
       banner 'knife pinnings wipe ENVIRONMENT [COOKBOOK_REGEX]'
@@ -29,7 +29,7 @@ class Chef
         environment = Environment.load(name_args[0])
         display_environments([environment], cookbook_regex)
         ui.msg('')
-        ui.confirm("Do you want to wipe cookbooks in #{environment.name}")
+        ui.confirm("Do you want to wipe cookbook constraints in #{environment.name}")
         ui.msg('')
         wipe(environment, cookbook_regex)
       end
@@ -39,7 +39,7 @@ class Chef
           name =~ /#{cookbook_regex}/
         end
         environment.save
-        ui.msg('Done')
+        ui.msg("Cookbook constraints wiped from #{environment.name}")
       end
     end
   end

data/lib/knife-pinnings/version.rb

@@ -15,7 +15,7 @@
 # rubocop:disable Style/Documentation
 module Knife
   module Pinnings
-    VERSION = '1.4.3'
+    VERSION = '1.4.7'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-pinnings
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.7
 platform: ruby
 authors:
 - Richard Nixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -26,62 +26,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-shell
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,7 +94,7 @@ files:
 - lib/knife-pinnings/version.rb
 homepage: https://github.com/trickyearlobe/knife-pinnings
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -167,11 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Chef knife plugin to set, list, compare, copy and delete cookbook pinnings
   across environments
 test_files: []
-has_rdoc: