knife-tidy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d41634bad35e623a19ebe00e33d890aa31c6e4e9
-  data.tar.gz: dc4576d52dc94ea7c5dce5e72d6045dc4ddbb634
+  metadata.gz: 2bc910eba99a7cccb3e6ca423da6c116f1fd09af
+  data.tar.gz: fc67a3f6dd6f653e28336f6907e409b1dc6934c3
 SHA512:
-  metadata.gz: 309ce63b1bd9eb385a901efdc4cc185cc04a2953bf88064a5aad88a28d7beb7109eee64956f0e7f3956eac9a549e954e2b957753d0059f3f55893d48f0feca0d
-  data.tar.gz: c7d6e786d7f4ece31e628d3dd3976cf0f723e4bb2db0815851fa68ecf448f5976461897fac525702761997d1f8b380d4e0a99d88eb490656e40d7198685063fe
+  metadata.gz: 133361ea06a8bc562de3d149e3b0e523627ab3bbdccbdac8d5a8e4205d0acaadfa249395403f9d2659de82b7cb34024e29affbc3d17cf63a523dc7a69027d560
+  data.tar.gz: a80bd192038fb73f4b375098f0958cdbd537c5d4321d0dc8f14251446788429145709016080fcb83edcc7ae2ed6363625cd975bbbe3c46e662d7094d6f172db9

data/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log
 
-## [0.1.1](https://github.com/jeremymv2/knife-tidy/tree/0.1.1) (2017-08-11)
-[Full Changelog](https://github.com/jeremymv2/knife-tidy/compare/0.1.1...0.1.1)
+## [0.1.0](https://github.com/jeremymv2/knife-tidy/tree/0.1.0) (2017-08-15)
+[Full Changelog](https://github.com/jeremymv2/knife-tidy/compare/0.2.0...0.1.0)
 
 **Merged pull requests:**
 
+- bump version to 0.2.0 [\#6](https://github.com/jeremymv2/knife-tidy/pull/6) ([jeremymv2](https://github.com/jeremymv2))
+
+## [0.2.0](https://github.com/jeremymv2/knife-tidy/tree/0.2.0) (2017-08-16)
+[Full Changelog](https://github.com/jeremymv2/knife-tidy/compare/0.1.1...0.2.0)
+
+**Merged pull requests:**
+
+- moved all common functions to tidy\_common.rb [\#5](https://github.com/jeremymv2/knife-tidy/pull/5) ([jeremymv2](https://github.com/jeremymv2))
+- Jeremymv2/acl items [\#4](https://github.com/jeremymv2/knife-tidy/pull/4) ([jeremymv2](https://github.com/jeremymv2))
+- updated changelog [\#3](https://github.com/jeremymv2/knife-tidy/pull/3) ([jeremymv2](https://github.com/jeremymv2))
 - bump version to 0.1.1 [\#2](https://github.com/jeremymv2/knife-tidy/pull/2) ([jeremymv2](https://github.com/jeremymv2))
 
 
 
-\* *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/README.md

@@ -31,7 +31,7 @@ The following options are supported across all subcommands:
   * `--orgs ORG1,ORG2`:
     Only apply to objects in the named organizations (default: all orgs)
 
-# knife tidy server report (options)
+## $ knife tidy server report (options)
 
 Cookbooks and nodes account for the largest objects in your Chef Server.
 If you want to keep it lean and mean and easy to port the object data, you must
@@ -51,7 +51,7 @@ org_threshold_numdays_stale_nodes.json | Nodes in that org that have not checked
 org_cookbook_count.json | Number of cookbook versions for each cookbook that that org.
 org_unused_cookbooks.json | List of cookbooks and versions that do not appear to be in-use for that org. This is determined by checking the versioned run list of each of the nodes in the org.
 
-# knife tidy backup clean (options)
+## $ knife tidy backup clean (options)
 
 ## Options
 
@@ -90,9 +90,9 @@ org_unused_cookbooks.json | List of cookbooks and versions that do not appear to
   * DONE: metadata self-dependency correction
   * DONE: user email validation
   * DONE: ensure user emails do not cause primary key violation
-  * TODO: ambiguous actors (acl actor exists as client and user)
-  * TODO: users/clients referenced as actors in acls that do not exist in users/clients
-  * TODO: nonexistent groups referenced in acls
+  * DONE: ambiguous actors (acl actor exists as client and user)
+  * DONE: users/clients referenced as actors in acls that do not exist in users/clients
+  * DONE: nonexistent groups referenced in acls
 
 ## Summary and Credits
 

data/Rakefile

@@ -72,7 +72,7 @@ namespace :changelog do
 
     GitHubChangelogGenerator::RakeTask.new :changelog do |config|
       config.since_tag = '0.1.1'
-      config.future_release = '0.1.1'
+      config.future_release = '0.1.0'
     end
   end
 end

data/conf/substitutions.json.example

@@ -2,12 +2,12 @@
   "chef-sugar":{
     "organizations/*/cookbooks/chef-sugar*/metadata.rb":[
       {
-        "pattern":"require +File.expand_path('../lib/chef/sugar/version', __FILE__)",
+        "pattern":"^require .*/lib/chef/sugar/version",
         "replace":"# require          File.expand_path('../lib/chef/sugar/version', __FILE__)"
       },
       {
         "pattern":"version *Chef::Sugar::VERSION",
-        "replace":"# version          !COOKBOOK_VERSION!"
+        "replace":"version          !COOKBOOK_VERSION!"
       }
     ]
   }

data/lib/chef/knife/tidy_backup_clean.rb

@@ -4,15 +4,17 @@ class Chef
   class Knife
     class TidyBackupClean < Knife
 
-      include Knife::TidyBase
-
       deps do
         require 'chef/cookbook_loader'
         require 'chef/cookbook/metadata'
         require 'chef/tidy_substitutions'
+        require 'chef/tidy_acls'
+        require 'chef/tidy_common'
         require 'ffi_yajl'
       end
 
+      include Knife::TidyBase
+
       option :backup_path,
         :long => '--backup-path path/to/backup',
         :description => 'The path to the knife-ec-backup backup directory'
@@ -22,75 +24,72 @@ class Chef
         :description => 'The path to the file used for substitutions. If non-existant, a boiler plate one will be created.'
 
       def run
-        unless config[:backup_path]
-          ui.error 'Must specify --backup-path'
+        unless config[:backup_path] && ::File.directory?(config[:backup_path])
+          ui.error 'Must specify valid --backup-path'
           exit 1
         end
 
-        validate_user_emails!
+        validate_user_emails
 
         if config[:gsub_file]
           unless ::File.exist?(config[:gsub_file])
             Chef::TidySubstitutions.new(substitutions_file).boiler_plate
             exit
           else
-            Chef::TidySubstitutions.new(substitutions_file, backup_path_expanded).run_substitutions
+            Chef::TidySubstitutions.new(substitutions_file, tidy).run_substitutions
           end
         end
 
         orgs.each do |org|
+          org_acls = Chef::TidyOrgAcls.new(tidy, org)
+          org_acls.validate_acls
+          org_acls.validate_user_acls
           fix_self_dependencies(org)
           load_cookbooks(org)
           generate_new_metadata(org)
         end
       end
 
-      def validate_user_emails!
+      def tidy
+        @tidy ||= Chef::TidyCommon.new(config[:backup_path])
+      end
+
+      def validate_user_emails
         emails_seen = []
-        global_users.each do |user|
+        tidy.global_user_names.each do |user|
           email = ''
           ui.info "Validating #{user}"
-          the_user = FFI_Yajl::Parser.parse(::File.read(::File.join(global_users_path_expanded, "#{user}.json")), symbolize_names: false)
+          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."
-              email = unique_email
+              email = tidy.unique_email
               new_user = the_user.dup
               new_user['email'] = email
-              save_user(new_user)
+              tidy.save_user(new_user)
               emails_seen.push(email)
             else
               emails_seen.push(the_user['email'])
             end
           else
             ui.info "User #{user} does not have a valid email, creating a unique one."
-            email = unique_email
+            email = tidy.unique_email
             new_user = the_user.dup
             new_user['email'] = email
-            save_user(new_user)
+            tidy.save_user(new_user)
             emails_seen.push(email)
           end
         end
       end
 
-      def unique_email
-        (0...8).map { (65 + rand(26)).chr }.join.downcase +
-        '@' + (0...8).map { (65 + rand(26)).chr }.join.downcase + '.com'
-      end
-
-      def save_user(user)
-        ::File.open(::File.join(global_users_path_expanded, "#{user['username']}.json"), 'w+') do |f|
-          f.write(FFI_Yajl::Encoder.encode(user, pretty: true))
-        end
-      end
-
       def load_cookbooks(org)
-        cl = Chef::CookbookLoader.new(cookbooks_path_expanded(org))
+        cl = Chef::CookbookLoader.new(tidy.cookbooks_path(org))
         for_each_cookbook_basename(org) do |cookbook|
           ui.info "Loading #{cookbook}"
           ret = cl.load_cookbook(cookbook)
           if ret.nil?
-            ui.error "Something's wrong with the #{cookbook} cookbook - cannot load it!"
+            ui.warn "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
@@ -99,15 +98,23 @@ class Chef
         exit 1
       end
 
+      def broken_cookooks_add(org, cookbook)
+        broken_path = ::File.join(tidy.org_path(org), 'cookbooks.broken')
+        FileUtils.mkdir(broken_path) unless ::File.directory?(broken_path)
+        Dir[::File.join(tidy.cookbooks_path(org), "#{cookbook}*")].each do |cb|
+          FileUtils.mv(cb, broken_path, :verbose => true, :force => true)
+        end
+      end
+
       def generate_new_metadata(org)
         for_each_cookbook_path(org) do |cookbook_path|
-          generate_metadata_from_file(cookbook_name_from_path(cookbook_path), cookbook_path)
+          generate_metadata_from_file(tidy.cookbook_name_from_path(cookbook_path), cookbook_path)
         end
       end
 
       def fix_self_dependencies(org)
         for_each_cookbook_path(org) do |cookbook_path|
-          name = cookbook_name_from_path(cookbook_path)
+          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"
@@ -142,8 +149,33 @@ class Chef
         exit 1
       end
 
-      def validate_user(user)
-        ui.info "Validating user #{user}"
+      def substitutions_file
+        @substitutions_file ||= ::File.expand_path(config[:gsub_file])
+      end
+
+      def orgs
+        @orgs ||= if config[:org_list]
+                    config[:org_list].split(',')
+                  else
+                    Dir[::File.join(tidy.backup_path, 'organizations', '*')].map { |dir| ::File.basename(dir) }
+                  end
+      end
+
+      def for_each_cookbook_basename(org)
+        cookbooks_seen = []
+        Dir[::File.join(tidy.cookbooks_path(org), '**-**')].each do |cookbook|
+          name = tidy.cookbook_name_from_path(cookbook)
+          unless cookbooks_seen.include?(name)
+            cookbooks_seen.push(name)
+            yield name
+          end
+        end
+      end
+
+      def for_each_cookbook_path(org)
+        Dir[::File.join(tidy.cookbooks_path(org), '**')].each do |cookbook|
+          yield cookbook
+        end
       end
     end
   end

data/lib/chef/knife/tidy_base.rb

@@ -47,55 +47,6 @@ class Chef
       def rest
         @rest ||= Chef::ServerAPI.new(server.root_url, {:api_version => "0"})
       end
-
-      def backup_path_expanded
-        ::File.expand_path(config[:backup_path])
-      end
-
-      def cookbook_name_from_path(path)
-        ::File.basename(path, '-*')
-      end
-
-      def cookbooks_path_expanded(org)
-        ::File.expand_path(::File.join(backup_path_expanded, 'organizations', org, 'cookbooks'))
-      end
-
-      def global_users_path_expanded
-        ::File.expand_path(::File.join(backup_path_expanded, 'users'))
-      end
-
-      def substitutions_file
-        ::File.expand_path(config[:gsub_file])
-      end
-
-      def global_users
-        Dir[::File.join(backup_path_expanded, 'users', '*')].map { |dir| ::File.basename(dir, '.json') }
-      end
-
-      def orgs
-        if config[:org_list]
-          config[:org_list].split(',')
-        else
-          Dir[::File.join(backup_path_expanded, 'organizations', '*')].map { |dir| ::File.basename(dir) }
-        end
-      end
-
-      def for_each_cookbook_basename(org)
-        cookbooks_seen = []
-        Dir[::File.join(cookbooks_path_expanded(org), '**-**')].each do |cookbook|
-          name = cookbook_name_from_path(cookbook)
-          unless cookbooks_seen.include?(name)
-            cookbooks_seen.push(name)
-            yield name
-          end
-        end
-      end
-
-      def for_each_cookbook_path(org)
-        Dir[::File.join(cookbooks_path_expanded(org), '**')].each do |cookbook|
-          yield cookbook
-        end
-      end
     end
   end
 end

data/lib/chef/tidy_acls.rb

@@ -0,0 +1,180 @@
+require 'ffi_yajl'
+require 'fileutils'
+require 'chef/log'
+
+class Chef
+  class TidyOrgAcls
+    attr_accessor :members, :clients, :groups, :users
+
+    def initialize(tidy, org)
+      @tidy = tidy
+      @backup_path = @tidy.backup_path
+      @org = org
+      @clients = []
+      @members = []
+      @groups = []
+      @users = []
+      load_actors
+    end
+
+    def load_users
+      Chef::Log.warn "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}"
+      @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}"
+      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}"
+      Dir[::File.join(@tidy.groups_path(@org), '*.json')].each do |group|
+        @groups.push(FFI_Yajl::Parser.parse(::File.read(group), symbolize_names: true))
+      end
+    end
+
+    def load_actors
+      load_users
+      load_members
+      load_clients
+      load_groups
+      Chef::Log.info "#{@org} Actors loaded!"
+    end
+
+    def acl_ops
+      %w( create read update delete grant )
+    end
+
+    def acl_actors_groups(acl)
+      actors_seen = []
+      groups_seen = []
+      acl_ops.each do |op|
+        acl[op]['actors'].each do |actor|
+          actors_seen.push(actor) unless actors_seen.include?(actor)
+        end
+        acl[op]['groups'].each do |group|
+          groups_seen.push(group) unless groups_seen.include?(group)
+        end
+      end
+      { actors: actors_seen, groups: groups_seen }
+    end
+
+    def valid_org_member?(actor)
+      ! @members.select { |user| user[:user][:username] == actor }.empty?
+    end
+
+    def valid_org_client?(actor)
+      ! @clients.select { |client| client[:name] == actor }.empty?
+    end
+
+    def valid_global_user?(actor)
+      ! @users.select { |user| user[:username] == actor }.empty?
+    end
+
+    def invalid_group?(actor)
+      @groups.select { |group| group[:name] == actor }.empty? &&
+        actor != '::server-admins' &&
+        actor != "::#{@org}_read_access_group"
+    end
+
+    def ambiguous_actor?(actor)
+      valid_org_member?(actor) && valid_org_client?(actor)
+    end
+
+    def missing_from_members?(actor)
+      valid_global_user?(actor) && !valid_org_member?(actor) && !valid_org_client?(actor)
+    end
+
+    def missing_org_client?(actor)
+      !valid_global_user?(actor) && !valid_org_member?(actor) && !valid_org_client?(actor)
+    end
+
+    def org_acls
+      @org_acls ||= Dir[::File.join(@tidy.org_acls_path(@org), '**.json')] +
+        Dir[::File.join(@tidy.org_acls_path(@org), '**', '*.json')]
+    end
+
+    def fix_ambiguous_actor(actor)
+      Chef::Log.warn "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}"
+    end
+
+    def add_actor_to_members(actor)
+      Chef::Log.warn "Invalid actor: #{actor} adding to #{@tidy.members_path(@org)}"
+      user = { user: { username: actor } }
+      @members.push(user)
+      write_new_file(@members, @tidy.members_path(@org))
+    end
+
+    def write_new_file(contents, path)
+      FileUtils.cp(path, "#{path}.orig") unless ::File.exist?("#{path}.orig")
+      ::File.open(path, 'w+') do |f|
+         f.write(FFI_Yajl::Encoder.encode(contents, pretty: true))
+      end
+    end
+
+    def remove_user_from_org(actor)
+      @members.reject! { |user| user[:user][:username] == actor }
+      write_new_file(@members, @tidy.members_path(@org))
+    end
+
+    def remove_group_from_acl(group, acl_file)
+      Chef::Log.warn "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 }
+      end
+      write_new_file(acl, acl_file)
+    end
+
+    def validate_acls
+      org_acls.each do |acl_file|
+        acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
+        actors_groups = acl_actors_groups(acl)
+        actors_groups[:actors].each do |actor|
+          next if actor == 'pivotal'
+          if ambiguous_actor?(actor)
+            fix_ambiguous_actor(actor)
+          elsif missing_from_members?(actor)
+            add_actor_to_members(actor)
+          elsif missing_org_client?(actor)
+            add_client_to_org(actor)
+          end
+        end
+        actors_groups[:groups].each do |group|
+          if invalid_group?(group)
+            remove_group_from_acl(group, acl_file)
+          end
+        end
+      end
+    end
+
+    def validate_user_acls
+      @members.each do |member|
+        user_acl_path = ::File.join(@tidy.user_acls_path, "#{member[:user][:username]}.json")
+        user_acl = FFI_Yajl::Parser.parse(::File.read(user_acl_path), symbolize_names: false)
+        actors_groups = acl_actors_groups(user_acl)
+        actors_groups[:groups].each do |group|
+          if invalid_group?(group)
+            remove_group_from_acl(group, user_acl_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/tidy_common.rb

@@ -0,0 +1,70 @@
+require 'ffi_yajl'
+require 'fileutils'
+
+class Chef
+  class TidyCommon
+    attr_accessor :backup_path
+
+    def initialize(backup_path)
+      @backup_path = ::File.expand_path(backup_path)
+    end
+
+    def users_path
+      @users_path ||= File.expand_path(::File.join(@backup_path, 'users'))
+    end
+
+    def members_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'members.json'))
+    end
+
+    def clients_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'clients'))
+    end
+
+    def groups_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'groups'))
+    end
+
+    def org_acls_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'acls'))
+    end
+
+    def user_acls_path
+      @user_acls_path ||= ::File.expand_path(::File.join(@backup_path, 'user_acls'))
+    end
+
+    def cookbooks_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'cookbooks'))
+    end
+
+    def org_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org))
+    end
+
+    def unique_email
+      (0...8).map { (65 + rand(26)).chr }.join.downcase +
+        '@' + (0...8).map { (65 + rand(26)).chr }.join.downcase + '.com'
+    end
+
+    def save_user(user)
+      ::File.open(::File.join(users_path, "#{user['username']}.json"), 'w+') do |f|
+        f.write(FFI_Yajl::Encoder.encode(user, pretty: true))
+      end
+    end
+
+    def write_new_file(contents, path)
+      FileUtils.cp(path, "#{path}.orig") unless ::File.exist?("#{path}.orig")
+      ::File.open(path, 'w+') do |f|
+         f.write(FFI_Yajl::Encoder.encode(contents, pretty: true))
+      end
+    end
+
+    def cookbook_name_from_path(path)
+      ::File.basename(path, '-*')
+    end
+
+    def global_user_names
+      @global_user_names ||= Dir[::File.join(@backup_path, 'users', '*')].map { |dir| ::File.basename(dir, '.json') }
+    end
+  end
+end

data/lib/chef/tidy_substitutions.rb

@@ -9,15 +9,11 @@ class Chef
 
     attr_accessor :file_path, :backup_path, :data
 
-    def initialize(file_path = nil, backup_path = nil)
+    def initialize(file_path = nil, tidy_common = nil)
       @file_path = file_path
-      @backup_path = backup_path
+      @backup_path = tidy_common.backup_path if tidy_common
     end
 
-    # Load the substitutions from disk
-    #
-    # @return [Hash]
-    #
     def load_data
       Chef::Log.info "Loading substitutions from #{file_path}"
       @data = FFI_Yajl::Parser.parse(::File.read(@file_path), symbolize_names: false)
@@ -53,7 +49,7 @@ class Chef
           end
         end
         temp_file.close
-        FileUtils.mv(path, "#{path}.orig") unless ::File.exist?("#{path}.orig")
+        FileUtils.cp(path, "#{path}.orig") unless ::File.exist?("#{path}.orig")
         FileUtils.mv(temp_file.path, path)
       ensure
         temp_file.close
@@ -66,7 +62,7 @@ class Chef
       @data.keys.each do |entry|
         @data[entry].keys.each do |glob|
           Chef::Log.info "Running substitutions for #{entry} -> #{glob}"
-          Dir[::File.join(backup_path, glob)].each do |file|
+          Dir[::File.join(@backup_path, glob)].each do |file|
             @data[entry][glob].each do |substitution|
               search = Regexp.new(substitution['pattern'])
               replace = substitution['replace'].dup

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
   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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,6 +113,8 @@ files:
 - lib/chef/knife/tidy_backup_clean.rb
 - lib/chef/knife/tidy_base.rb
 - lib/chef/knife/tidy_server_report.rb
+- lib/chef/tidy_acls.rb
+- lib/chef/tidy_common.rb
 - lib/chef/tidy_server.rb
 - lib/chef/tidy_substitutions.rb
 - lib/knife-tidy/version.rb