knife-tidy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f8cd82c1128a57a08b0f4d566b6f4c0fab57e0
-  data.tar.gz: '00768c3e853bb6bdbde3d183f84094a933e6b08f'
+  metadata.gz: 86a06790188fb399074453b78a289aa193e8bbfe
+  data.tar.gz: 01cb25a9b19338ce0cbaa5f121295d32f785fdf4
 SHA512:
-  metadata.gz: 10ae87a0e2bc3248cc63aa67817e61567ea631df7bb5e644947e97aae7f43db29c3bfec3ef7f78ab4e52aeaf5f690d2d03d1d51bd5e3d41646083eecd1895eb1
-  data.tar.gz: 9719b04e58c3c9227a6c2839bbb3e0b02e21487885fcb94f7c20a15d5279754c431cff97f4988fa369b4e42710cb6b004c7f4ea898f34db565170971283df5c2
+  metadata.gz: d8f7c576dce15f9a36e78b53249245e247c89244e8a3cb325bc17ddbe168b9b374ac8001283463062093df9818a3750555cb62974ef47ce89e544c84a25efc6d
+  data.tar.gz: 34660b3e329937c01977c4dd901d3818cabed14f4a7025fbe4d52d9be58441328229c5621a9e2dba154717f901c19c58acbc2ff701c4349d906cfecfd30e8df7

data/lib/chef/knife/tidy_backup_clean.rb

@@ -108,7 +108,7 @@ class Chef
           puts "INFO: Loading #{cookbook}"
           ret = cl.load_cookbook(cookbook)
           if ret.nil?
-            action_needed("ACTION NEEDED: Something's wrong with the #{cookbook} cookbook - cannot load it! Moving to cookbooks.broken folder.")
+            action_needed("ACTION NEEDED: Something's wrong with the #{cookbook} cookbook in org #{org} - cannot load it! Moving to cookbooks.broken folder.")
             broken_cookooks_add(org, cookbook)
           end
         end
@@ -148,6 +148,10 @@ class Chef
 
       def generate_metadata_from_file(cookbook, path)
         md_path = ::File.join(path, 'metadata.rb')
+        json_path = ::File.join(path, 'metadata.json')
+        if !::File.exist?(md_path) && !::File.exist?(json_path)
+          create_minimal_metadata(path)
+        end
         unless ::File.exist?(md_path)
           puts "INFO: No metadata.rb in #{path} - skipping"
           return
@@ -168,6 +172,27 @@ class Chef
         exit 1
       end
 
+      def create_minimal_metadata(cookbook_path)
+        name = tidy.cookbook_name_from_path(cookbook_path)
+        components = cookbook_path.split(File::SEPARATOR)
+        name_version = components[components.index('cookbooks')+1]
+        version = name_version.match(/\d+\.\d+\.\d+/).to_s
+        metadata = {}
+        metadata['name'] = name
+        metadata['version'] = version
+        metadata['description'] = 'the description'
+        metadata['long_description'] = 'the long description'
+        metadata['maintainer'] = 'the maintainer'
+        metadata['maintainer_email'] = 'the maintainer email'
+        rb_file = ::File.join(cookbook_path, 'metadata.rb')
+        puts "REPAIRING: no metadata files exist for #{cookbook_path}, creating #{rb_file}"
+        ::File.open(rb_file, 'w') do |f|
+          metadata.each_pair do |key, value|
+            f.write("#{key} '#{value}'\n")
+          end
+        end
+      end
+
       def substitutions_file
         sub_file_path = ::File.expand_path(config[:gsub_file])
         ui.error "Subtitutions file #{sub_file_path} does not exist!" unless ::File.exist?(sub_file_path)
@@ -205,7 +230,7 @@ class Chef
 
       def action_needed(msg)
         ::File.open(action_needed_file_path, 'a') do |f|
-          f.write(msg)
+          f.write(msg + "\n")
         end
       end
     end

data/lib/knife-tidy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jeremy Miller