knife-chef-retention 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff54c639881e87fffe4a593253d850625f5e642
-  data.tar.gz: aaee45b42f3fa620baaa97e2577e612a9fc8f283
+  metadata.gz: 64496365e38ac8c73e6a775439371e644273661f
+  data.tar.gz: 6543809858bd5146a1fdc557b88c290517ae3a4d
 SHA512:
-  metadata.gz: a57915b45f7229c37813a8d63425f844354f2421da19db823889885e171369f66d72405501c732b89363d8e38b41fff90c87002a6425f6cb6cab0c37f294ec70
-  data.tar.gz: 07ffeaddb0a8396269e83ecc9120ea4f1b35b930bfad2c491e67dacc3e60cd12e114203fdcaed0c01fa7909e6b8a80a4c6a24b07d693ce594cc66be3da61c37c
+  metadata.gz: aa655b05de308773949ccae21c5ef3a869d179c2159c3c3415dd859dbd789cadd8bd117520cec25ab846bbcfde844114adcda4455bd60837abe88f5716a092c7
+  data.tar.gz: 18ecb4ee72db2a82c322b00add0dd7406420160dba99af227846313ae96fe86de5b413ade5f3c344f90eef0f80abcd4b08a87473b4e9e18e5ea430af8bcf49e8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.3.0](https://github.com/cvent/knife-chef-retention/tree/v0.3.0) (2019-04-10)
+[Full Changelog](https://github.com/cvent/knife-chef-retention/compare/v0.2.0...v0.3.0)
+
+**Merged pull requests:**
+
+- Fix cookbook version sorting [\#7](https://github.com/cvent/knife-chef-retention/pull/7) ([majormoses](https://github.com/majormoses))
+
 ## [v0.2.0](https://github.com/cvent/knife-chef-retention/tree/v0.2.0) (2016-10-03)
 [Full Changelog](https://github.com/cvent/knife-chef-retention/compare/v0.0.1...v0.2.0)
 

data/Gemfile

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
 
 group :development do
   gem "bundler", "~> 1.6"
+  gem "github_changelog_generator", "~> 1.13"
   gem "rake", "~> 11.1"
   gem "rubocop", "~> 0.38"
-  gem "github_changelog_generator", "~> 1.13"
 end

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Import other external rake tasks
 Dir.glob("tasks/*.rake").each { |r| import r }
 

data/knife-chef-retention.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 require "knife-chef-retention/version"
 
 Gem::Specification.new do |s|

data/lib/chef/knife/retention_cookbook.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "chef/knife"
 
 class Chef
@@ -24,6 +25,13 @@ class Chef
              description: "The number of extra versions to keep (Default: 1)",
              default: 1
 
+      option :ignore_used,
+             short: "-i",
+             long: "--ignore-used",
+             description: "Ignore used cookbooks, useful where stale inventory is a thing",
+             boolean: true,
+             default: false
+
       def run
         cookbook_name = name_args[0] if name_args.length.positive?
         clobber = config[:clobber]
@@ -89,9 +97,8 @@ class Chef
         unused_versions = cookbook_versions(cookbook).take_while do |version|
           # These are package that are not used and are considered old as they
           # are after the first used version still
-          version unless version[:used]
+          version unless version[:used] && !config[:ignore_used]
         end
-
         save_some_versions(unused_versions, extra_versions)
       end
 
@@ -110,8 +117,7 @@ class Chef
             used: used_by_node
           }
         end
-
-        versions.sort_by { |v| v[:version] }
+        versions.sort { |x, y| Gem::Version.new(x[:version]) <=> Gem::Version.new(y[:version]) }
       end
 
       def search_nodes(query)

data/lib/knife-chef-retention/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module Knife
   module ChefRetention
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/tasks/changelog.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 begin
   require "knife-chef-retention/version"
   require "github_changelog_generator/task"
@@ -6,9 +7,9 @@ begin
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.future_release = "v#{Knife::ChefRetention::VERSION}"
     config.issues = false
-    config.enhancement_labels = %w(enhancement)
-    config.bug_labels = %w(bug)
-    config.exclude_labels = %w(no_changelog)
+    config.enhancement_labels = %w[enhancement]
+    config.bug_labels = %w[bug]
+    config.exclude_labels = %w[no_changelog]
   end
 rescue LoadError
   puts "Problem loading gems please install chef and github_changelog_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chef-retention
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brent Montague
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef