safe_monkey_patching 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb049b9fe1a86ac335d025d222022636d7ecb8e4ef6cc7c25a86c58968090d2a
-  data.tar.gz: e9f903c2226c3a2750666d2f5dc63afd55d8ea8081a82082b439c3bd51cfbae3
+  metadata.gz: 9cc771a21035ae487d38091ccc66b924ced972aac8240d0588c0591979308641
+  data.tar.gz: f35f5d81b079a5a53b1735e2e463653b35dc5b7b1b487ea2f918d83a61c4c6cf
 SHA512:
-  metadata.gz: bb8e560c538bd800ede19b5ae9f8bc2919ccd48868facd6f562cd326a80b7a409e82d957f53bc8e6ccbb4ed62d253eea041f10f103afe1d084028531e0e4c138
-  data.tar.gz: 753c0171e3fed5a0246ca5286d62ad59efb76a08844c31c489affbe27b86869f3b563537097e623f80e25177d29cec1a69c94ab8d69d39e2eb736895d30ac32a
+  metadata.gz: db1f4770c03d722b98efac8e702defa8bfb7fa2dad4996676c2e8938d49f1c7a8254985330704c52990315abd3775189386377c65f1f2c355d8a869a365edeb8
+  data.tar.gz: c0c51109a4a1152a37cf3683b0f81038aaca8b3fe18870d81ef97581e36f4c1cf41ec7ebbef750c332e7d2d339679275f1cecf2858c5807d897ba9db5ece993c

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,41 @@ class Object
 end
 
 at_exit do
-  break unless Rails.env.test?
+  generate_file = ENV.key?('MONKEY') || ENV.key?('GITHUB_SHA')
+  written = false
+
   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
 
-    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! \n But if they are correct, then just commit 'monkey_patches-old.yml'".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)
+      unless written
+        written = true
+        $stderr.puts
+        $stderr.puts "Wrong monkey_patches! Did you changed something?".red.bold
+        $stderr.puts "to correct them:"
+        $stderr.puts "#{"-".blue.bold} Rerun rspec with variable #{ "MONKEY=1".green }" unless generate_file
+        $stderr.puts "#{"-".blue.bold} Commit generated file #{ "monkey_patches-old.yml".green }"
+      end
+
+      if generate_file
+        $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)
+        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.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Andrzej Bisewski
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Safe monkey patching