dekiru 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118e02daae0f7eea68172f325ac8465830aa9d44eae089dd27244f0ed517b820
-  data.tar.gz: 13cf2c26e1bed62aad8dc32760e2b4ef071f19d55f080db3bdc2d2c7254927ec
+  metadata.gz: c0f03d8577117755bdd83832d5385e841f9b9062ed9280ff113126678fe246b4
+  data.tar.gz: 6b1b4051c93f6fbacdf95feb0d5f89daafaf4b86ee8c871d8d35dd4c86e9aea7
 SHA512:
-  metadata.gz: 047e7598645d7dc800b440a3ba85d67d45d1aa482927a8c944fe5cb929afc37d683081b2c2714359b5a16d3ef92abe3b0bb054cbaf37ebdeb77fcb8dba8a5217
-  data.tar.gz: 5c3c7f2a719bd56ca3c2c4cca1838739235f1d6113734c372193b83e1753811afd3df35abca57740a1afe530f6b8312650bce570b364bd051dc8a5b10de2e435
+  metadata.gz: 15bd327a6571a4d56c7f0ea1fb3931c517496b02003f709a7185e052abb42fc66e5555eec0ba8fa3824cc4f64b4ab3e234517d5615f8287e97e6c6b30aa21a53
+  data.tar.gz: adc18f216af47e11d68daaeb86304a6e0d00351a019bdc516ce14afa89b6e69338248c6c7a29aef7c610cf1ab69945dae7653e107c662f50f57ae9a80f2c6c9f

data/lib/dekiru/data_migration_operator.rb

@@ -53,22 +53,26 @@ module Dekiru
       ((self.ended_at || Time.current) - self.started_at)
     end
 
-    def find_each_with_progress(target_scope, options = {})
-      total = options.delete(:total)
-      opt = {
-        format: '%a |%b>>%i| %p%% %t',
-      }.merge(options).merge(
-        total: total || target_scope.count,
-        output: stream
-      )
-      @pb = ::ProgressBar.create(opt)
-      target_scope.find_each do |target|
-        yield target
+    def each_with_progress(enum, options = {})
+      options = options.dup
+      options[:total] ||= ((enum.size == Float::INFINITY ? nil : enum.size) rescue nil)
+      options[:format] ||= options[:total] ? '%a |%b>>%i| %p%% %t' : '%a |%b>>%i| ??%% %t'
+      options[:output] = stream
+
+      @pb = ::ProgressBar.create(options)
+      enum.each do |item|
+        yield item
         @pb.increment
       end
       @pb.finish
     end
 
+    def find_each_with_progress(target_scope, options = {}, &block)
+      # `LocalJumpError: no block given (yield)` が出る場合、 find_each メソッドが enumerator を返していない可能性があります
+      # 直接 each_with_progress を使うか、 find_each が enumerator を返すように修正してください
+      each_with_progress(target_scope.find_each, options, &block)
+    end
+
     private
 
     def current_transaction_open?

data/lib/dekiru/tasks/db.rake

@@ -4,7 +4,7 @@ namespace :db do
     task check_conflict: :environment do
       migrations_status =
         if ActiveRecord::Base.connection.respond_to?(:migration_context)
-          ActiveRecord::Base.connection.migration_context.migrations_status
+          ActiveRecord::Base.connection.migration_context.current_version.zero? ? [] : ActiveRecord::Base.connection.migration_context.migrations_status
         else
           paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
           ActiveRecord::Migrator.migrations_status(paths)

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/spec/dekiru/data_migration_operator_spec.rb

@@ -106,17 +106,38 @@ describe Dekiru::DataMigrationOperator do
     end
   end
 
-  describe '#find_each_with_progress' do
+  describe '#each_with_progress' do
     it '進捗が表示される' do
+      record = (0...10)
+
+      allow(STDIN).to receive(:gets) do
+        "yes\n"
+      end
+
+      sum = 0
+      operator.execute do
+        each_with_progress(record, title: 'count up number') do |num|
+          sum += num
+        end
+      end
+
+      expect(sum).to eq(45)
+      expect(operator.result).to eq(true)
+      expect(operator.error).to eq(nil)
+      expect(operator.stream.out).to include('Are you sure to commit?')
+      expect(operator.stream.out).to include('count up number:')
+      expect(operator.stream.out).to include('Finished successfully:')
+      expect(operator.stream.out).to include('Total time:')
+    end
+
+    it 'total をオプションで渡すことができる' do
       class Dekiru::DummyRecord
         def self.count
-          10
+          raise "won't call"
         end
 
-        def self.find_each
-          (0...count).to_a.each do |num|
-            yield(num)
-          end
+        def self.each
+          yield 99
         end
       end
 
@@ -126,7 +147,34 @@ describe Dekiru::DataMigrationOperator do
 
       sum = 0
       operator.execute do
-        find_each_with_progress(Dekiru::DummyRecord, title: 'count up number') do |num|
+        each_with_progress(Dekiru::DummyRecord, title: 'pass total as option', total: 1) do |num|
+          sum += num
+        end
+      end
+
+      expect(sum).to eq(99)
+      expect(operator.result).to eq(true)
+      expect(operator.error).to eq(nil)
+      expect(operator.stream.out).to include('Are you sure to commit?')
+      expect(operator.stream.out).to include('pass total as option:')
+      expect(operator.stream.out).to include('Finished successfully:')
+      expect(operator.stream.out).to include('Total time:')
+    end
+  end
+
+  describe '#find_each_with_progress' do
+    it '進捗が表示される' do
+      record = (0...10).to_a.tap do |r|
+        r.singleton_class.alias_method(:find_each, :each)
+      end
+
+      allow(STDIN).to receive(:gets) do
+        "yes\n"
+      end
+
+      sum = 0
+      operator.execute do
+        find_each_with_progress(record, title: 'count up number') do |num|
           sum += num
         end
       end
@@ -147,7 +195,11 @@ describe Dekiru::DataMigrationOperator do
         end
 
         def self.find_each
-          yield 99
+          if block_given?
+            yield 99
+          else
+            Enumerator.new { |y| y << 99 }
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails