knife-pinnings 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736339371fde27134633d459027749081e8b97a2
-  data.tar.gz: 6dbf3a1a701dea77ddbc406342a11a2f11beda01
+  metadata.gz: 935707e1593f4d939e25e7a4bc3b229290d805f8
+  data.tar.gz: 1c00659870f5a446c2e5d23dfa7632ae886975c3
 SHA512:
-  metadata.gz: 3b26b524d34e3795895bc7b1d2d3f2df7a4d5bc1936906b0877650c784b63cfbd5fe810b896bd32294186daff2eeda466c136417f0944fe6dabe306dd29677f0
-  data.tar.gz: c0e02d3e7c4e56d1875a00332d668ef87bbd4b7a2714a2e62bc1a0cf4d191616f62fe80652f4fb3db077bbbaf66ce4c3760d609a212c74ccaafc4480e4ea686c
+  metadata.gz: 61bf92763a42fe50efede8766706f31101a35bf2aefb7e741d56661cb1e298c1503398328df7e98727a0f192aa79d4318baee25bff747ba4e300698b7a0372fb
+  data.tar.gz: b2f1ec6319769a5ce6d4c11f6239620caa72f5cec421e53136cd5815758425cca6ed2c8301858f059b038ba35a75d4f75abdf2ccf878e1a3cf8d954be9175083

data/README.md

@@ -30,7 +30,7 @@ To take the name and version from the metadata.rb in the current directory use
 
 	$ knife pinnings set <environment>
 
-To leverage chef resolver to find out all cookbook versions used by all nodes of a given chef environment and set them back in the environment (typically latest versions will be resolved)
+To leverage chef resolver to find out all cookbook versions used by all nodes of a given chef environment and set them back in the environment (typically latest versions will be resolved, but not always)
 
     $ knife pinnings set auto <environment>
 

data/lib/chef/knife/pinnings_mixin.rb

@@ -123,9 +123,10 @@ def nodes_in(rest, environment)
   rest.get_rest("/environments/#{environment}/nodes").keys
 end
 
-def cookbooks_used_by(rest, environment, nodes)
+def cookbooks_used_by(rest, environment)
   recipes = []
   roles = []
+  nodes = nodes_in(rest, environment)
   nodes.each do |node|
     response = rest.get_rest("/nodes/#{node}").run_list
     _recipes = response.recipe_names 

data/lib/chef/knife/pinnings_set_auto.rb

@@ -18,15 +18,18 @@ class Chef
     class PinningsSetAuto < Chef::Knife
       require 'chef/knife/pinnings_mixin'
       banner 'knife pinnings set auto ENVIRONMENT [COOKBOOK_VERSION_CONSTRAINTS]'
+      FakeChefEnvironmentStruct = Struct.new :name, :cookbook_versions 
 
       def run
         case name_args.length
         when 1 # Just environment was specified
           @environment_name = name_args[0]
-        when 2 # Environment, and cookbook version constraints specified
+          @cookbook_regex = '.*'
+        when 2 # Environment, cookbook version constraints specified
           @environment_name = name_args[0]
           @cookbook_version_constraints_string = name_args[1]
           @cookbook_version_constraints = @cookbook_version_constraints_string.split(",")
+          @cookbook_regex = '.*'
         else
           ui.fatal('You must specify ENVIRONMENT or ENVIRONMENT COOKBOOK_CONSTRAINTS (constraints example: "foo","bar","zed@0.0.1")')
           exit 255
@@ -34,7 +37,7 @@ class Chef
         @environment = Environment.load(@environment_name)
         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, nodes)
+        cookbooks = cookbooks_used_by(rest, @environment_name)
         ui.info("#{cookbooks.length} recipes have been found for the nodes: #{cookbooks.to_s}")
         if @cookbook_version_constraints != nil
           cookbooks_with_contraints = cookbooks_merged_with_version_constraints(cookbooks, @cookbook_version_constraints)
@@ -43,18 +46,21 @@ class Chef
           ui.info("No version constraint have been specified as input")
           cookbooks_with_contraints = cookbooks
         end
-        ui.info("will attempt resolving the dependencies with chef resolver...")
-        solution_pinnings = solve_recipes(rest, @environment, cookbooks_with_contraints)
+        ui.info("knife-pinnings will attempt resolving the dependencies with chef resolver...")
+        solution_cookbook_versions = solve_recipes(rest, @environment, cookbooks_with_contraints)
         ui.msg('')
-        ui.info("chef resolved the cookbook dependencies for all nodes from #{@environment_name} as follow:")
-        solution_pinnings.map{|key,val| "#{key} --- #{val}"}.each{|entry| ui.info(entry)}
+
+        environments = []
+        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('')
 
-        set_environnment_pinnings(@environment, solution_pinnings)
-        ui.info("pinnings have been set on #{@environment_name}")
+        set_environnment_pinnings(@environment, solution_cookbook_versions)
+        ui.info("version pinnings have been set on #{@environment_name}")
 
       end
     end

data/lib/knife-pinnings/version.rb

@@ -15,7 +15,7 @@
 # rubocop:disable Style/Documentation
 module Knife
   module Pinnings
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
     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.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Richard Nixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Chef knife plugin to set, list, compare, copy and delete cookbook pinnings