safe_monkey_patching 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a27b544541b1a019556b6e4835a4fa499957fde547835dec37587fe6123c0e
-  data.tar.gz: 7088de066fbdeccc9140c5b6321f7675fe96865ccd2c1f4b78be36f92edf5caa
+  metadata.gz: c508d0db24c17c17b38f91f3a895c7199c7d15a5ec16ab290cf4277b1d484a91
+  data.tar.gz: 4d1da46476acbe900b87dfdd9876629f76ee18e6e91d8db661bf2969acf29def
 SHA512:
-  metadata.gz: 1d033085a48e5314ed0e307bea9b183f4b7eabfc523cc0d4161a0e2072e2df3322ab06785df40c77b385d24af42fa91015c80ccb3ea6303c3582b91a27de107d
-  data.tar.gz: e1265bcabb0b17762463320bb989c7ee91f66a353ce96f2a1f2fc176be3187512a9b3d7d9eb10b5f7f04da7134f5077b6481750269547a9601b429f7a33640af
+  metadata.gz: 8a45b2ea9a111a896bfe124512209696cb77e254d43476ebf107526a656d639ab1b4cff83472ca873d7393f6b88756bb7a32940d24161a74a326ae1c2100759f
+  data.tar.gz: 3ade656056a11a2970dbf7bd81af1fd2cbc0d936f354a7b7ab9352723cd967c9a080b7975dfa8bf405b46eff03740e37d1b519c3cc0142444e3bac01c04751e7

data/README.md

@@ -8,7 +8,7 @@ module ActiveJob
       monkey_patch :deserialize
 
       def deserialize(job_data)
-        ...
+        # ...
       end
     end
   end
@@ -27,7 +27,7 @@ a więc, gdy podbijemy railsy i zmieni się kod źródłowy, to `gif diff` nam o
 
 ```diff
 
-diff --git a/monkey_patchs.yml b/monkey_patchs.yml
+diff --git a/monkey_patches-old.yml b/monkey_patches-old.yml
 
  ActiveJob::Core::ClassMethods:
    deserialize:
@@ -35,5 +35,11 @@ diff --git a/monkey_patchs.yml b/monkey_patchs.yml
 +    sha1: 131d3acf24768b30a3ccb1052591b1cdb603f0cd
 ```
 
-Dzięki temu będziemy wiedzieli, że trzeba tam zajrzeć 🥳
+Również pokażą się pliki `monkey_patches-old.yml` i `WRONG_MONKEY_PATCHES.txt`, który pokazuje niekompatybilności z gemów.
+
+Aby zaktualizować łatki, to trzeba zcomitować `monkey_patches-old.yml` i będzie :ok:.
+
+Dzięki temu gemu nie będzie trzeba pamiętać o przejrzeniu patchów przy podbijaniu gemów 🥳
+
+
 

data/lib/safe_monkey_patching.rb

@@ -45,7 +45,7 @@ module SafeMonkeyPatching
       method_entry = { method.owner.to_s => { method.name.to_s =>
                                                 { 'sha1' => Digest::SHA1.hexdigest(method.source) } } }
 
-      new_database = database.merge(method_entry)
+      new_database = database.deep_merge(method_entry)
       File.open(File.join(gem_path, 'monkey_patches-new.yml'), 'w') do |f|
         f.puts(new_database.to_yaml)
       end
@@ -58,28 +58,34 @@ class Object
 end
 
 at_exit do
-  break unless Rails.env.test?
+  generate_file = ENV.key?('MONKEY') || ENV.key?('GITHUB_SHA')
+
   SafeMonkeyPatching::Behavior.gems_with_patches.each do |gem_path|
-    old_patches = SafeMonkeyPatching::Behavior.load_store(File.join(gem_path, "monkey_patches-old.yml").sort.to_h).to_yaml
-    new_patches = SafeMonkeyPatching::Behavior.load_store(File.join(gem_path, "monkey_patches-new.yml").sort.to_h).to_yaml
+    old_patches = SafeMonkeyPatching::Behavior.load_store(File.join(gem_path, "monkey_patches-old.yml")).sort.to_h.to_yaml
+    new_patches = SafeMonkeyPatching::Behavior.load_store(File.join(gem_path, "monkey_patches-new.yml")).sort.to_h.to_yaml
 
-    File.write(File.join(gem_path, "monkey_patches-old.yml"), old_patches)
-    File.write(File.join(gem_path, "monkey_patches-new.yml"), new_patches)
+    if generate_file
+      File.write(File.join(gem_path, "monkey_patches-old.yml"), old_patches)
+      File.write(File.join(gem_path, "monkey_patches-new.yml"), new_patches)
 
-    FileUtils.mv(File.join(gem_path, "monkey_patches-new.yml"),
-                 File.join(gem_path, "monkey_patches-old.yml"))
+      FileUtils.mv(File.join(gem_path, "monkey_patches-new.yml"),
+                   File.join(gem_path, "monkey_patches-old.yml"))
+    end
 
     diff = Diffy::Diff.new(old_patches, new_patches)
 
     if diff.to_s.size.positive?
-      $stderr.puts 'Wrong monkeypatches!'.red.bold
-      $stderr.puts gem_path
-      $stderr.puts diff.to_s(:color)
-
-      open(ERROR_LOCATION, 'a') do |f|
-        f.puts("\n")
-        f.puts(gem_path)
-        f.puts(diff.to_s)
+      $stderr.puts "Wrong monkey_patches! Did you changed something?".red.bold
+      $stderr.puts "If you want see and correct them then:"
+      $stderr.puts "#{"1".blue.bold}. Rerun rspec with variable #{ "MONKEY=1".green }"
+      $stderr.puts "#{"2".blue.bold}. Commit generated file #{ "monkey_patches-old.yml".green }"
+
+      if generate_file
+        open(ERROR_LOCATION, 'a') do |f|
+          f.puts("\n")
+          f.puts(gem_path)
+          f.puts(diff.to_s)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_monkey_patching
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrzej Bisewski