knife-tidy 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abbe15f18176b1287e62fc23f1929cf5a539fa3b
-  data.tar.gz: cf42b128b0b9aceb02a52e47088869a13ab24315
+  metadata.gz: 13a4147cae7f0309f48d49dfc0e014b0afa8d62b
+  data.tar.gz: '009379a697f1930e43f149ef2c072eb75238afba'
 SHA512:
-  metadata.gz: d84dfcf81e7b9c6a8056c7b56d391136de029f3d7e53a1dddf141d4c592f98ffa73eba044820e0cae2fcc1bb5c5297f408565a4cbd06d19d484183e686327bff
-  data.tar.gz: 73e2f80192bbd79009de4a7b8225b88807e81eca3962758072ccb4d9d95fc05dbb6e46aa9ee6189176f1ef233ef4362ee780a7651751903a2161fbb0252ebb78
+  metadata.gz: dcbb69f54629feffb1d4709445f8dab998826898fbfaa2c6a4bd195deeb2ac39c88d341b49174feea4cb0fd15d394e481d5aa38e5905d3552dab91bfc9d54f3c
+  data.tar.gz: a1edef340c2bd84270101ff2f7359d3ad990ad9ff07142b42085df01fd11ab56d55de80df057f2cc66e6d2d1fea075293e4792dd779042d4ef3699175ed25fc8

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [0.2.4](https://github.com/chef-customers/knife-tidy/tree/0.2.4) (2017-09-12)
+[Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.2.3...0.2.4)
+
+**Merged pull requests:**
+
+- disable server clean [\#17](https://github.com/chef-customers/knife-tidy/pull/17) ([jeremymv2](https://github.com/jeremymv2))
+- bump patch to 0.2.4 [\#16](https://github.com/chef-customers/knife-tidy/pull/16) ([jeremymv2](https://github.com/jeremymv2))
+- correct any cookbook metadata name issues [\#15](https://github.com/chef-customers/knife-tidy/pull/15) ([jeremymv2](https://github.com/jeremymv2))
+
+## [0.2.3](https://github.com/chef-customers/knife-tidy/tree/0.2.3) (2017-09-11)
+[Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.2.2...0.2.3)
+
+**Merged pull requests:**
+
+- setting required ruby to \>= 2.0.0 [\#14](https://github.com/chef-customers/knife-tidy/pull/14) ([jeremymv2](https://github.com/jeremymv2))
+
 ## [0.2.2](https://github.com/chef-customers/knife-tidy/tree/0.2.2) (2017-09-11)
 [Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.2.1...0.2.2)
 
@@ -31,4 +47,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/chef/knife/tidy_backup_clean.rb

@@ -46,6 +46,7 @@ class Chef
           org_acls.validate_acls
           org_acls.validate_user_acls
           fix_self_dependencies(org)
+          fix_cookbook_names(org)
           load_cookbooks(org)
           generate_new_metadata(org)
         end
@@ -57,11 +58,11 @@ class Chef
         emails_seen = []
         tidy.global_user_names.each do |user|
           email = ''
-          ui.info "Validating #{user}"
+          puts "INFO: Validating #{user}"
           the_user = FFI_Yajl::Parser.parse(::File.read(::File.join(tidy.users_path, "#{user}.json")), symbolize_names: false)
           if the_user['email'].match(/\A[^@\s]+@[^@\s]+\z/)
             if emails_seen.include?(the_user['email'])
-              ui.info "Already saw #{user}'s email, creating a unique one."
+              puts "REPAIRING: Already saw #{user}'s email, creating a unique one."
               email = tidy.unique_email
               new_user = the_user.dup
               new_user['email'] = email
@@ -71,7 +72,7 @@ class Chef
               emails_seen.push(the_user['email'])
             end
           else
-            ui.info "User #{user} does not have a valid email, creating a unique one."
+            puts "REPAIRING: User #{user} does not have a valid email, creating a unique one."
             email = tidy.unique_email
             new_user = the_user.dup
             new_user['email'] = email
@@ -81,19 +82,37 @@ class Chef
         end
       end
 
+      def add_cookbook_name_to_metadata(cookbook_name, rb_path)
+        puts "REPAIRING: Correcting `name` in #{rb_path}"
+        content = IO.readlines(rb_path)
+        new_content = content.select { |line| line !~ /^name.*['"]\S+['"]/ }
+        name_field = "name '#{cookbook_name}'\n"
+        IO.write rb_path, name_field + new_content.join('')
+      end
+
+      def fix_cookbook_names(org)
+        for_each_cookbook_path(org) do |cookbook_path|
+          rb_path = ::File.join(cookbook_path, 'metadata.rb')
+          next unless ::File.exist?(rb_path)
+          cookbook_name = tidy.cookbook_name_from_path(cookbook_path)
+          lines = ::File.readlines(rb_path).select { |line| line =~ /^name.*['"]#{cookbook_name}['"]/ }
+          add_cookbook_name_to_metadata(cookbook_name, rb_path) if lines.empty?
+        end
+      end
+
       def load_cookbooks(org)
         cl = Chef::CookbookLoader.new(tidy.cookbooks_path(org))
         for_each_cookbook_basename(org) do |cookbook|
-          ui.info "Loading #{cookbook}"
+          puts "INFO: Loading #{cookbook}"
           ret = cl.load_cookbook(cookbook)
           if ret.nil?
-            ui.warn "Something's wrong with the #{cookbook} cookbook - cannot load it! Moving to cookbooks.broken folder."
+            puts "ACTION NEEDED: Something's wrong with the #{cookbook} cookbook - cannot load it! Moving to cookbooks.broken folder."
             broken_cookooks_add(org, cookbook)
           end
         end
       rescue LoadError => e
         ui.error e
-        ui.error 'Look at the cookbook above and determine what in the metadata.rb is causing the exception and rectify manually'
+        puts 'ACTION NEEDED: Look at the cookbook above and determine what in the metadata.rb is causing the exception and rectify manually'
         exit 1
       end
 
@@ -116,7 +135,7 @@ class Chef
           name = tidy.cookbook_name_from_path(cookbook_path)
           md_path = ::File.join(cookbook_path, 'metadata.rb')
           unless ::File.exist?(md_path)
-            ui.warn "No metadata.rb in #{cookbook_path} - skipping"
+            puts "INFO: No metadata.rb in #{cookbook_path} - skipping"
             next
           end
           Chef::TidySubstitutions.new.sub_in_file(
@@ -129,10 +148,10 @@ class Chef
       def generate_metadata_from_file(cookbook, path)
         md_path = ::File.join(path, 'metadata.rb')
         unless ::File.exist?(md_path)
-          ui.warn "No metadata.rb in #{path} - skipping"
+          puts "INFO: No metadata.rb in #{path} - skipping"
           return
         end
-        ui.info "Generating new metadata.json for #{path}"
+        puts "INFO: Generating new metadata.json for #{path}"
         md = Chef::Cookbook::Metadata.new
         md.name(cookbook)
         md.from_file(md_path)

data/lib/chef/knife/tidy_server_clean.rb

@@ -1,6 +1,3 @@
-# not enabled
-return
-
 require 'chef/knife/tidy_base'
 
 class Chef
@@ -30,6 +27,10 @@ class Chef
         :description => 'Only delete stale nodes from Chef Server.'
 
       def run
+        # not enabled
+        ui.warn "This feature is not enabled"
+        exit
+
         STDOUT.sync = true
 
         ensure_reports_dir

data/lib/chef/tidy_acls.rb

@@ -18,26 +18,26 @@ class Chef
     end
 
     def load_users
-      Chef::Log.warn "Loading users"
+      puts "INFO: Loading users"
       Dir[::File.join(@tidy.users_path, '*.json')].each do |user|
         @users.push(FFI_Yajl::Parser.parse(::File.read(user), symbolize_names: true))
       end
     end
 
     def load_members
-      Chef::Log.info "Loading members for #{@org}"
+      puts "INFO: Loading members for #{@org}"
       @members = FFI_Yajl::Parser.parse(::File.read(@tidy.members_path(@org)), symbolize_names: true)
     end
 
     def load_clients
-      Chef::Log.info "Loading clients for #{@org}"
+      puts "INFO: Loading clients for #{@org}"
       Dir[::File.join(@tidy.clients_path(@org), '*.json')].each do |client|
         @clients.push(FFI_Yajl::Parser.parse(::File.read(client), symbolize_names: true))
       end
     end
 
     def load_groups
-      Chef::Log.info "Loading groups for #{@org}"
+      puts "INFO: Loading groups for #{@org}"
       Dir[::File.join(@tidy.groups_path(@org), '*.json')].each do |group|
         @groups.push(FFI_Yajl::Parser.parse(::File.read(group), symbolize_names: true))
       end
@@ -48,7 +48,7 @@ class Chef
       load_members
       load_clients
       load_groups
-      Chef::Log.info "#{@org} Actors loaded!"
+      puts "INFO: #{@org} Actors loaded!"
     end
 
     def acl_ops
@@ -105,17 +105,17 @@ class Chef
     end
 
     def fix_ambiguous_actor(actor)
-      Chef::Log.warn "Ambiguous actor! #{actor} removing from #{@tidy.members_path(@org)}"
+      puts "REPAIRING: Ambiguous actor! #{actor} removing from #{@tidy.members_path(@org)}"
       remove_user_from_org(actor)
     end
 
     def add_client_to_org(actor)
       # TODO
-      Chef::Log.warn "Client referenced in acl non-existant: #{actor}"
+      puts "ACTION NEEDED: Client referenced in acl non-existant: #{actor}"
     end
 
     def add_actor_to_members(actor)
-      Chef::Log.warn "Invalid actor: #{actor} adding to #{@tidy.members_path(@org)}"
+      puts "REPAIRING: Invalid actor: #{actor} adding to #{@tidy.members_path(@org)}"
       user = { user: { username: actor } }
       @members.push(user)
       write_new_file(@members, @tidy.members_path(@org))
@@ -134,7 +134,7 @@ class Chef
     end
 
     def remove_group_from_acl(group, acl_file)
-      Chef::Log.warn "Removing invalid group: #{group} from #{acl_file}"
+      puts "REPAIRING: Removing invalid group: #{group} from #{acl_file}"
       acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
       acl_ops.each do |op|
         acl[op]['groups'].reject! { |the_group| the_group == group }

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake