knife-tidy 1.2.0 → 2.0.0

data/lib/chef/tidy_acls.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'fileutils'
-require 'chef/log'
+require "ffi_yajl"
+require "fileutils"
+require "chef/log"
 
 class Chef
   class TidyOrgAcls
@@ -18,8 +18,8 @@ class Chef
     end
 
     def load_users
-      @tidy.ui.stdout.puts 'INFO: Loading users'
-      Dir[::File.join(@tidy.users_path, '*.json')].each do |user|
+      @tidy.ui.stdout.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
@@ -31,14 +31,14 @@ class Chef
 
     def load_clients
       @tidy.ui.stdout.puts "INFO: Loading clients for #{@org}"
-      Dir[::File.join(@tidy.clients_path(@org), '*.json')].each do |client|
+      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
       @tidy.ui.stdout.puts "INFO: Loading groups for #{@org}"
-      Dir[::File.join(@tidy.groups_path(@org), '*.json')].each do |group|
+      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
@@ -52,17 +52,17 @@ class Chef
     end
 
     def acl_ops
-      %w( create read update delete grant )
+      %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|
+        acl[op]["actors"].each do |actor|
           actors_seen.push(actor) unless actors_seen.include?(actor)
         end
-        acl[op]['groups'].each do |group|
+        acl[op]["groups"].each do |group|
           groups_seen.push(group) unless groups_seen.include?(group)
         end
       end
@@ -83,7 +83,7 @@ class Chef
 
     def invalid_group?(actor)
       @groups.select { |group| group[:name] == actor }.empty? &&
-        actor != '::server-admins' &&
+        actor != "::server-admins" &&
         actor != "::#{@org}_read_access_group"
     end
 
@@ -100,8 +100,8 @@ class Chef
     end
 
     def org_acls
-      @org_acls ||= Dir[::File.join(@tidy.org_acls_path(@org), '**.json')] +
-                    Dir[::File.join(@tidy.org_acls_path(@org), '**', '*.json')]
+      @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)
@@ -130,7 +130,7 @@ class Chef
       @tidy.ui.stdout.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 }
+        acl[op]["groups"].reject! { |the_group| the_group == group }
       end
       @tidy.write_new_file(acl, acl_file)
     end
@@ -139,13 +139,13 @@ class Chef
     def ensure_global_group_acls(acl_file)
       acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
       acl_ops.each do |op|
-        unless acl[op]['groups'].include? '::server-admins'
+        unless acl[op]["groups"].include? "::server-admins"
           @tidy.ui.stdout.puts "REPAIRING: Adding #{op} acl for ::server-admins in #{acl_file}"
-          acl[op]['groups'].push('::server-admins')
+          acl[op]["groups"].push("::server-admins")
         end
-        if op == 'read' && !acl[op]['groups'].include?("::#{@org}_read_access_group")
+        if op == "read" && !acl[op]["groups"].include?("::#{@org}_read_access_group")
           @tidy.ui.stdout.puts "REPAIRING: Adding #{op} acl for ::#{@org}_read_access_group in #{acl_file}"
-          acl[op]['groups'].push("::#{@org}_read_access_group")
+          acl[op]["groups"].push("::#{@org}_read_access_group")
         end
       end
       @tidy.write_new_file(acl, acl_file)
@@ -153,10 +153,10 @@ class Chef
 
     def ensure_client_read_acls(acl_file)
       acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
-      %w(users admins).each do |group|
-        unless acl['read']['groups'].include? group
+      %w{users admins}.each do |group|
+        unless acl["read"]["groups"].include? group
           @tidy.ui.stdout.puts "REPAIRING: Adding read acl for #{group} in #{acl_file}"
-          acl['read']['groups'].push(group)
+          acl["read"]["groups"].push(group)
         end
       end
       @tidy.write_new_file(acl, acl_file)
@@ -167,7 +167,7 @@ class Chef
         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'
+          next if actor == "pivotal"
           if ambiguous_actor?(actor)
             fix_ambiguous_actor(actor)
           elsif missing_from_members?(actor)
@@ -183,19 +183,19 @@ class Chef
     end
 
     def default_user_acl(client)
-      { create: { actors: ['pivotal', client], groups: ['::server-admins'] },
-        read: { actors: ['pivotal', client], groups: ['::server-admins', "::#{@org}_read_access_group"] },
-        update: { actors: ['pivotal', client], groups: ['::server-admins'] },
-        delete: { actors: ['pivotal', client], groups: ['::server-admins'] },
-        grant: { actors: ['pivotal', client], groups: ['::server-admins'] } }
+      { create: { actors: ["pivotal", client], groups: ["::server-admins"] },
+        read: { actors: ["pivotal", client], groups: ["::server-admins", "::#{@org}_read_access_group"] },
+        update: { actors: ["pivotal", client], groups: ["::server-admins"] },
+        delete: { actors: ["pivotal", client], groups: ["::server-admins"] },
+        grant: { actors: ["pivotal", client], groups: ["::server-admins"] } }
     end
 
     def default_client_acl(client_name)
-      { create: { actors: ['pivotal', "#{@org}-validator", client_name], groups: ['admins'] },
-        read: { actors: ['pivotal', "#{@org}-validator", client_name], groups: %w(admins users) },
-        update: { actors: ['pivotal', client_name], groups: ['admins'] },
-        delete: { actors: ['pivotal', client_name], groups: %w(admins users) },
-        grant: { actors: ['pivotal', client_name], groups: ['admins'] } }
+      { create: { actors: ["pivotal", "#{@org}-validator", client_name], groups: ["admins"] },
+        read: { actors: ["pivotal", "#{@org}-validator", client_name], groups: %w{admins users} },
+        update: { actors: ["pivotal", client_name], groups: ["admins"] },
+        delete: { actors: ["pivotal", client_name], groups: %w{admins users} },
+        grant: { actors: ["pivotal", client_name], groups: ["admins"] } }
     end
 
     def validate_user_acls
@@ -218,7 +218,7 @@ class Chef
 
     def validate_client_acls
       @clients.each do |client|
-        client_acl_path = ::File.join(@tidy.org_acls_path(@org), 'clients', "#{client[:name]}.json")
+        client_acl_path = ::File.join(@tidy.org_acls_path(@org), "clients", "#{client[:name]}.json")
         begin
           client_acl = FFI_Yajl::Parser.parse(::File.read(client_acl_path), symbolize_names: false)
         rescue Errno::ENOENT

data/lib/chef/tidy_common.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'fileutils'
-require 'chef/knife/core/ui'
+require "ffi_yajl"
+require "fileutils"
+require "chef/knife/core/ui"
 
 class Chef
   class TidyCommon
@@ -17,56 +17,56 @@ class Chef
     end
 
     def users_path
-      @users_path ||= ::File.expand_path(::File.join(@backup_path, 'users'))
+      @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'))
+      ::File.expand_path(::File.join(@backup_path, "organizations", org, "members.json"))
     end
 
     def invitations_path(org)
-      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'invitations.json'))
+      ::File.expand_path(::File.join(@backup_path, "organizations", org, "invitations.json"))
     end
 
     def clients_path(org)
-      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'clients'))
+      ::File.expand_path(::File.join(@backup_path, "organizations", org, "clients"))
     end
 
     def client_names(org)
-      Dir[::File.join(clients_path(org), '*')].map { |dir| ::File.basename(dir, '.json') }
+      Dir[::File.join(clients_path(org), "*")].map { |dir| ::File.basename(dir, ".json") }
     end
 
     def groups_path(org)
-      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'groups'))
+      ::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'))
+      ::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'))
+      @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'))
+      ::File.expand_path(::File.join(@backup_path, "organizations", org, "cookbooks"))
     end
 
     def roles_path(org)
-      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'roles'))
+      ::File.expand_path(::File.join(@backup_path, "organizations", org, "roles"))
     end
 
     def org_path(org)
-      ::File.expand_path(::File.join(@backup_path, 'organizations', 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'
+        "@" + (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|
+      ::File.open(::File.join(users_path, "#{user['username']}.json"), "w+") do |f|
         f.write(FFI_Yajl::Encoder.encode(user, pretty: true))
       end
     end
@@ -75,21 +75,21 @@ class Chef
       if ::File.exist?(path) && backup
         FileUtils.cp(path, "#{path}.orig") unless ::File.exist?("#{path}.orig")
       end
-      ::File.open(path, 'w+') do |f|
+      ::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, '-*')
+      ::File.basename(path, "-*")
     end
 
     def global_user_names
-      @global_user_names ||= Dir[::File.join(@backup_path, 'users', '*')].map { |dir| ::File.basename(dir, '.json') }
+      @global_user_names ||= Dir[::File.join(@backup_path, "users", "*")].map { |dir| ::File.basename(dir, ".json") }
     end
 
     def reports_dir
-      @reports_dir ||= ::File.join(Dir.pwd, 'reports')
+      @reports_dir ||= ::File.join(Dir.pwd, "reports")
     end
   end
 end

data/lib/chef/tidy_server.rb

@@ -7,7 +7,7 @@ class Chef
     end
 
     def self.from_chef_server_url(url)
-      url = url.gsub(/\/organizations\/+[^\/]+\/*$/, '')
+      url = url.gsub(/\/organizations\/+[^\/]+\/*$/, "")
       Chef::Server.new(url)
     end
   end

data/lib/chef/tidy_substitutions.rb

@@ -1,7 +1,7 @@
-require 'ffi_yajl'
-require 'tempfile'
-require 'fileutils'
-require 'chef/log'
+require "ffi_yajl"
+require "tempfile"
+require "fileutils"
+require "chef/log"
 
 class Chef
   class TidySubstitutions
@@ -23,14 +23,14 @@ class Chef
     end
 
     def boiler_plate
-      bp = ::File.join(File.dirname(__FILE__), '../../conf/substitutions.json.example')
+      bp = ::File.join(File.dirname(__FILE__), "../../conf/substitutions.json.example")
       @tidy.ui.stdout.puts "INFO: Creating boiler plate gsub file: 'substitutions.json'"
-      FileUtils.cp(bp, ::File.join(Dir.pwd, 'substitutions.json'))
+      FileUtils.cp(bp, ::File.join(Dir.pwd, "substitutions.json"))
     end
 
     def cookbook_version_from_path(path)
       components = path.split(File::SEPARATOR)
-      name_version = components[components.index('cookbooks') + 1]
+      name_version = components[components.index("cookbooks") + 1]
       name_version.match(/\d+\.\d+\.\d+/).to_s
     end
 
@@ -38,9 +38,9 @@ class Chef
     end
 
     def sub_in_file(path, search, replace)
-      temp_file = Tempfile.new('tidy')
+      temp_file = Tempfile.new("tidy")
       begin
-        File.open(path, 'r') do |file|
+        File.open(path, "r") do |file|
           file.each_line do |line|
             if line.match(search)
               temp_file.puts replace
@@ -66,8 +66,8 @@ class Chef
           @tidy.ui.stdout.puts "INFO: Running substitutions for #{entry} -> #{glob}"
           Dir[::File.join(@backup_path, glob)].each do |file|
             @data[entry][glob].each do |substitution|
-              search = Regexp.new(substitution['pattern'])
-              replace = substitution['replace'].dup
+              search = Regexp.new(substitution["pattern"])
+              replace = substitution["replace"].dup
               replace.gsub!(/\!COOKBOOK_VERSION\!/) { |_m| "'" + cookbook_version_from_path(file) + "'" }
               sub_in_file(file, search, replace)
             end

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = '1.2.0'.freeze
-  MAJOR, MINOR, TINY = VERSION.split('.')
+  VERSION = "2.0.0".freeze
+  MAJOR, MINOR, TINY = VERSION.split(".")
 end

metadata

@@ -1,99 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2019-01-16 00:00:00.000000000 Z
+dependencies: []
 description: Report on stale Chef Server nodes and cookbooks and clean up data integrity
   issues in a knife-ec-backup object based backup
 email:
@@ -102,16 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
 - LICENSE
-- README.md
-- Rakefile
-- TODO.md
-- conf/substitutions.json.example
-- knife-tidy.gemspec
 - lib/chef/knife/tidy_backup_clean.rb
 - lib/chef/knife/tidy_base.rb
 - lib/chef/knife/tidy_notify.rb
@@ -122,12 +29,9 @@ files:
 - lib/chef/tidy_server.rb
 - lib/chef/tidy_substitutions.rb
 - lib/knife-tidy/version.rb
-- spec/chef/knife/tidy_backup_clean_spec.rb
-- spec/chef/knife/tidy_base_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/chef-customers/knife-tidy
 licenses:
-- Apache License, v2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -137,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="