knife-depsolver 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd5a344b9fcfc7c4e08e5199122981852f396f1
-  data.tar.gz: 7973c0cd7d13687bc3fe81575e6f6b9bff430f04
+  metadata.gz: b2dd2e1ec1022caf3f4fc83c14292241b592240f
+  data.tar.gz: c67dec4e629b5b7395e7b4336aad1d386f4e88ee
 SHA512:
-  metadata.gz: 733d5a061fc6bbaa400af405f8fd1419fef2f0fe2b313360dc91d5adf4e99b2b55c4293d2fea475a452f8260f12ef37e144dc098cbc58432db171121fc9f3a35
-  data.tar.gz: dca4c199d6ba80069efd8ca2db97d2c94af28580fd8f7ecbcac146d865345d920e12b422739e9153584ffe5608fbb63465ec24dd7726cf1c8c2dcedea7a99838
+  metadata.gz: 98bfafbc8cd1d017c7eae71f5662d1058181d388e27118d34518100ad7288249301a4778e51e271cab4f37d3c32934050aaba66728d69cfa52b1e04dc26b12d7
+  data.tar.gz: c3659a8adf16243f9f5a12a314cf2429855a2ff29d0476053a53dc79c69d8ae9b8da86dcfe90cc39a0801baee7648a2d65e6f7c4e84086b1edb6a6850768ba8a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.3 (2017-05-12)
+
+* Correctly print version if patch level was missing
+* Only set DepSelector::Debug.log.level if DepSelector::Debug is defined
+* Improve regex to avoid unwanted string replacement
+
 ## 2.0.2 (2017-05-11)
 
 * Set DepSelector log level to INFO

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 rehearsal-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --universe automate-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 --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
 ```
 
 Now it is easy to modify the environment cookbook version constraints or the cookbook universe input files to see the impact on the depsolver.
@@ -121,7 +121,7 @@ knife depsolver --env-constraints production-environment-2017-05-01-18.52.40-5f5
 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.
 
 ```
-knife depsolver --env-constraints rehearsal-environment-2017-05-01-18.52.40-5f5843d819ecb0b174f308d76d4336bb7bbfacbf.txt --universe automate-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 --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
 ```
 
 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.

data/lib/chef/knife/depsolver.rb

@@ -1,6 +1,15 @@
 require 'chef/knife'
 require 'digest'
 
+module DepSelector
+  class VersionConstraint
+    def to_s
+      version = @missing_patch_level ? "#{@version.major}.#{@version.minor}" : @version.to_s
+      "#{@op} #{version}"
+    end
+  end
+end
+
 class Chef
   class Knife
     class Depsolver < Knife
@@ -49,7 +58,7 @@ class Chef
 
       def run
         begin
-          DepSelector::Debug.log.level = Logger::INFO
+          DepSelector::Debug.log.level = Logger::INFO if defined?(DepSelector::Debug)
           use_local_depsolver = false
           if config[:env_constraints_filter_universe]
             if config[:node] || config[:environment] || config[:timeout] || config[:capture] || config[:expanded_run_list] || config[:csv_universe_to_json]
@@ -380,7 +389,7 @@ 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')}
+          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]]

data/lib/knife-depsolver/version.rb

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

metadata

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