dekiru 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645b46b3968939b35e0d81f7af7cb370c9a1120b489081df02cac5de31d9eb22
-  data.tar.gz: 87e792def5e10912c14cdd25f002eeb6a4c6db2de08c9d95a0663c2944656a19
+  metadata.gz: c6561c9b0821c11571527dc126a5014304352c8b58a5915e03dcaffdcfe9987b
+  data.tar.gz: d599fef1eb98d58389da140f638ef317c2866583c77d29c403e2d72ad4a1517b
 SHA512:
-  metadata.gz: acd32ab352485b4be6c5fd8ea0277bf06338cfe6cdaade9930fdd81b344ba9a9177b691c1cc55f7b08b443d84530267b805a20347679ec0cc47d367324f3ce2a
-  data.tar.gz: b342ebd2a82fafdf44b5776407f502412c8fb541cee51d7c889f7dede805bb5ea4c70f90ea6f0c4826a5710c613b432f6fdb7df2f8925e0cfef7a57139580a2d
+  metadata.gz: 8bcbe875ecbbab54ca72d7dbed1d63988d7a5dfa403c5aeb75d657a606d64e1669e3470daaacbf459a6b72a321b32bea70efed6a0b058b4a88938708d03a0b5a
+  data.tar.gz: b53319d34f655be66216a88c71c31d4119289a1beea0929bcf20bee6eed6edd4f8350c540ca5d53cfd785ff0ac2422ab0c03154ebf4bb3774f61146cba88e412

data/README.md

@@ -154,6 +154,34 @@ Finished successfully: Demo migration
 Total time: 6.35 sec
 ```
 
+また`warning_side_effects: true`オプションを付けて実行することで、データ移行作業で発生した副作用が表示されるようになります。
+
+```ruby
+Dekiru::DataMigrationOperator.execute('Demo migration', warning_side_effects: true) do
+  # ...
+end
+```
+
+```
+$ bin/rails r scripts/demo.rb
+Start: Demo migration at 2019-05-24 18:29:57 +0900
+
+all targets count: 30
+Time: 00:00:00 |=================>>| 100% Progress
+updated user count: 30
+
+Write Queries!!
+30 call: Update "users" SET ...
+
+Enqueued Jobs!!
+10 call: NotifyJob
+
+Deliverd Mailers!!
+10 call: UserMailer
+
+Are you sure to commit? (yes/no) > yes
+```
+
 ## Refinements
 
 ### Dekiru::CamelizeHash

data/lib/dekiru/capybara/matchers.rb

@@ -2,14 +2,14 @@ module Dekiru
   module Capybara
     module Matchers
       class JsNoErrorMatcher
-        def matches?(page)
-          errors = page.driver.browser.manage.logs.get(:browser)
-          errors.find_all { |error| error.level == 'WARNING' }.each do |error|
+        def matches?(page_or_logs)
+          logs = page_or_logs.respond_to?(:driver) ? page_or_logs.driver.browser.manage.logs.get(:browser) : page_or_logs
+          logs.find_all { |log| log.level == 'WARNING' }.each do |log|
             STDERR.puts 'WARN: javascript warning'
-            STDERR.puts error.message
+            STDERR.puts log.message
           end
 
-          @severe_errors = errors.find_all { |error| error.level == 'SEVERE' }
+          @severe_errors = logs.find_all { |log| log.level == 'SEVERE' }
           @severe_errors.empty?
         end
 

data/lib/dekiru/data_migration_operator.rb

@@ -10,18 +10,22 @@ module Dekiru
 
     def initialize(title, options = {})
       @title = title
-      @stream = options[:output] || $stdout
-    end
-
-    def log(message)
-      stream.puts(message)
+      @options = options
+      @stream = @options[:output] || $stdout
+      @side_effects = Hash.new do |hash, key|
+        hash[key] = Hash.new(0)
+      end
     end
 
     def execute(&block)
       @started_at = Time.current
       log "Start: #{title} at #{started_at}\n\n"
       @result = ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
-        instance_eval(&block)
+        if @options[:warning_side_effects]
+          warning_side_effects(&block)
+        else
+          instance_eval(&block)
+        end
         confirm?("\nAre you sure to commit?")
       end
       log "Finished successfully: #{title}" if @result == true
@@ -56,6 +60,12 @@ module Dekiru
       pb.finish
     end
 
+    private
+
+    def log(message)
+      stream.puts(message)
+    end
+
     def confirm?(message = 'Are you sure?')
       loop do
         stream.print "#{message} (yes/no) > "
@@ -78,5 +88,34 @@ module Dekiru
       log "Canceled: #{title}"
       raise ActiveRecord::Rollback
     end
+
+    def handle_notification(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+
+      increment_side_effects(:enqueued_jobs, event.payload[:job].class.name)  if event.payload[:job]
+      increment_side_effects(:deliverd_mailers, event.payload[:mailer]) if event.payload[:mailer]
+
+      if event.payload[:sql] && /\A\s*(insert|update|delete)/i.match?(event.payload[:sql])
+        increment_side_effects(:write_queries, event.payload[:sql])
+      end
+    end
+
+    def increment_side_effects(type, value)
+      @side_effects[type][value] += 1
+    end
+
+    def warning_side_effects(&block)
+      ActiveSupport::Notifications.subscribed(method(:handle_notification), /^(sql|enqueue|deliver)/) do
+        instance_eval(&block)
+      end
+
+      @side_effects.each do |name, items|
+        newline
+        log "#{name.to_s.titlecase}!!"
+        items.sort_by { |v, c| c }.reverse.slice(0, 20).each do |value, count|
+          log "#{count} call: #{value}"
+        end
+      end
+    end
   end
 end

data/lib/dekiru/task_with_logger.rb

@@ -4,16 +4,17 @@ module TaskWithLogger
 
       def task(*args, &block)
         new_block = proc do |_task, _args|
-          __echo__ "[START] #{_task.name} #{_args.to_h} (#{Time.current})"
+          TaskWithLogger.echo("[START] #{_task.name} #{_args.to_h} (#{Time.current})")
           yield(_task, _args)
-          __echo__ "[END] #{_task.name} #{_args.to_h} (#{Time.current})"
+          TaskWithLogger.echo("[END] #{_task.name} #{_args.to_h} (#{Time.current})")
         end
         super(*args, &new_block)
       end
+  end
 
-      def __echo__(str)
-        Rails.logger.info(str)
-        puts(str)
-      end
+  def echo(str)
+    Rails.logger.info(str)
+    puts(str)
   end
+  module_function :echo
 end

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.1.6'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language