knife-depsolver 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2dd2e1ec1022caf3f4fc83c14292241b592240f
-  data.tar.gz: c67dec4e629b5b7395e7b4336aad1d386f4e88ee
+  metadata.gz: 20ead315f5ba6d98327f23b83076eb7204362143
+  data.tar.gz: 8431be0109945a59cba7b7e6498a240ff611ec12
 SHA512:
-  metadata.gz: 98bfafbc8cd1d017c7eae71f5662d1058181d388e27118d34518100ad7288249301a4778e51e271cab4f37d3c32934050aaba66728d69cfa52b1e04dc26b12d7
-  data.tar.gz: c3659a8adf16243f9f5a12a314cf2429855a2ff29d0476053a53dc79c69d8ae9b8da86dcfe90cc39a0801baee7648a2d65e6f7c4e84086b1edb6a6850768ba8a
+  metadata.gz: d292509903debe72d884dc499e202782a01bcf51c8251d55542bc4460ddc54e9a4bc51e0873c78272698ed7206cc9b033d9fb399edbe69480e6148e58befbccf
+  data.tar.gz: 7378fc8d7d0b78722f634b670affd99f918c478f964a1f0b4edb51501882168a3da4b7bbb40bc8aff74063c61efba237b4c8b6d056fce5795b7b107995cd694f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.1.0 (2017-05-15)
+
+* Replace --print-constrained-cookbook-set with --print-trimmed-universe
+
 ## 2.0.3 (2017-05-12)
 
 * Correctly print version if patch level was missing

data/README.md

@@ -103,7 +103,7 @@ Now use the "--env-constraints", "universe" and "expanded-run-list" options to p
 For example:
 
 ```
-knife depsolver --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt
+knife depsolver --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt
 ```
 
 Now it is easy to modify the environment cookbook version constraints or the cookbook universe input files to see the impact on the depsolver.
@@ -113,21 +113,29 @@ Now it is easy to modify the environment cookbook version constraints or the coo
 Sometimes it can help to give the depsolver more than the default five seconds to perform its calculations. This can be done by using the "--timeout <seconds>" option to change the depsolver timeout.
 
 ```
-knife depsolver --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt --timeout 120
+knife depsolver --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --timeout 120
 ```
 
-#### --print-constrained-cookbook-set
+#### --print-trimmed-universe
 
-Sometimes you want to only see the list of cookbooks, and their cookbook dependency version constraints, that ultimately would be sent to the depsolver without actually triggering the depsolver calculation. This is especially helpful when the depsolver isn't returning any results because it can't calculate a solution in a reasonable amount of time. This can be done by using the `--print-constrained-cookbook-set` option.
+Sometimes you want to only see the list of cookbooks, and their cookbook dependency version constraints, that ultimately would be sent to the depsolver without actually triggering the depsolver calculation. This is especially helpful when the depsolver isn't returning any results because it can't calculate a solution in a reasonable amount of time. This can be done by using the `--print-trimmed-universe` option.
 
 ```
-knife depsolver --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt --print-constrained-cookbook-set
+knife depsolver --expanded-run-list expanded-run-list-2017-05-01-18.52.40-387d90499514747792a805213c30be13d830d31f.txt --universe my-org-universe-2017-05-01-18.52.40-1c8e59e23530b1e1a8e0b3b3cc5236a29c84e469.txt --env-constraints production-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --print-trimmed-universe
 ```
 
 Now you can review the output to see if you can find anything that could be causing problems for the depsolver. You can make changes to the input files to see the impact on the list of cookbooks that would be sent to the depsolver.
 
 If necessary you could also use the list of cookbooks as a starting point for setting version constraints in the environment input file. Then you can modify that set of version constraints and run the depsolver in an effort to get a solution in a reasonable amount of time or to isolate the problem.
 
+#### /tmp/DepSelectorDebugOn
+
+If you really want to enable the dep_selector gem's debug level output then you can simply create the `touch /tmp/DepSelectorDebugOn` file on your workstation's disk.
+
+```
+touch /tmp/DepSelectorDebugOn
+```
+
 ### Chef Server < 12.4.0
 
 knife-depsolver requires cookbook universe data in order to use Chef DK's embedded depsolver. The "/universe" API endpoint was added in the Chef Server 12.4.0 release.

data/lib/chef/knife/depsolver.rb

@@ -3,10 +3,7 @@ require 'digest'
 
 module DepSelector
   class VersionConstraint
-    def to_s
-      version = @missing_patch_level ? "#{@version.major}.#{@version.minor}" : @version.to_s
-      "#{@op} #{version}"
-    end
+    attr_reader :missing_patch_level
   end
 end
 
@@ -52,9 +49,9 @@ class Chef
            long: '--env-constraints-filter-universe',
            description: 'Filter the cookbook universe using the environment cookbook version constraints.'
 
-      option :print_constrained_cookbook_set,
-           long: '--print-constrained-cookbook-set',
-           description: 'Only print the constrained cookbook set that would be sent to the depsolver.'
+      option :print_trimmed_universe,
+           long: '--print-trimmed-universe',
+           description: 'Print the cookbooks and dependency data that would be sent to the depsolver.'
 
       def run
         begin
@@ -258,8 +255,8 @@ class Chef
 
             data = {environment_constraints: env_ckbk_constraints, all_versions: all_versions, run_list: expanded_run_list_with_split_versions, timeout_ms: timeout}
 
-            if config[:print_constrained_cookbook_set]
-              print_constrained_cookbook_set(data)
+            if config[:print_trimmed_universe]
+              puts JSON.pretty_generate(get_trimmed_universe(data))
               exit!
             end
 
@@ -341,8 +338,7 @@ class Chef
         end
       end
 
-      def print_constrained_cookbook_set(data)
-        begin
+      def get_trimmed_universe(data)
           # create dependency graph from cookbooks
           graph = DepSelector::DependencyGraph.new
 
@@ -389,11 +385,18 @@ class Chef
           selector = DepSelector::Selector.new(graph, (timeout_ms / 1000.0))
 
           constrained_cookbook_set = selector.send(:trim_unreachable_packages, selector.dep_graph, run_list)
-          constrained_cookbook_set.sort {|x,y| x.name <=> y.name}.each {|c| puts c.to_s.gsub(/^Package/, 'Cookbook')}
-
-        rescue => e
-          puts = [:error, :exception, e.message, [e.backtrace]]
-        end
+          trimmed_universe = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = Hash.new } } }
+          constrained_cookbook_set.each do |ckbk|
+            ckbk.versions.each do |ckbk_version|
+              trimmed_universe[ckbk.name][ckbk_version.version]["dependencies"] = Hash.new
+              ckbk_version.dependencies.each do |ckbk_version_dep|
+                constraint = ckbk_version_dep.constraint
+                constraint_version = constraint.missing_patch_level ? "#{constraint.version.major}.#{constraint.version.minor}" : "#{constraint.version}"
+                trimmed_universe[ckbk.name][ckbk_version.version]["dependencies"][ckbk_version_dep.package.name] = "#{constraint.op} #{constraint_version}"
+              end
+            end
+          end
+          trimmed_universe
       end
     end
   end

data/lib/knife-depsolver/version.rb

@@ -1,3 +1,3 @@
 module KnifeDepsolver
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-depsolver
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies: []
 description: Knife plugin that uses Chef Server to calculate cookbook dependencies
   for a given run_list.