dekiru 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfeff250b0e1ec21cc8ed1f4ccf284ac5430ad41be129f0f04a6fa73b6f36b7
-  data.tar.gz: dc7557d4f6a91491fad5cd70d938a0050e8b98405ded870825564ee037401156
+  metadata.gz: c890a48f2abca1d753301d1d95b568306896da734616e4ecf18b1f65fef89126
+  data.tar.gz: fdddce1a0ff1db098175aa86abf02c0e1327ee2ede909364e08c14919151b0d2
 SHA512:
-  metadata.gz: 447ab174db16c187dab03db7ecef25d217036ea688442c5594dd0d82382cde3bf2ce10e6e7fb27382b6f9702d4c7292fe01c583f7055cd365921f1bf97d4f1ed
-  data.tar.gz: 723725e05e52c1beef024d39787c2dd5c834b14e1c5c7d18374c0dea57c4bf6441c1e618d8287c5bb44210865ea9b7d63eb554486f5293fa19c78f9a7e280d92
+  metadata.gz: 76a86a4250d2633f379078535034596067d3331c23e4c4c3f55aaf38dfcb3fcabdc82c695c0829bf3b5990c86fab6095318dde10c4be86a9b2d4677ed868d52e
+  data.tar.gz: f7e3a2065a7c58537e070d066b40d3ef9805caa0712b53372bff8db5806a2e07c8e375ba680f9f0ca622c7fe16c4ee2c3480f5795b80e8c290ccab8232ccb3dc

data/.github/labels.yml

@@ -0,0 +1,18 @@
+- name: add
+  description: Add new features.
+  color: "0e8a16"
+- name: change
+  description: Change existing functionality.
+  color: "fbca04"
+- name: deprecate
+  description: Mark as soon-to-be removed features.
+  color: "d93f0b"
+- name: remove
+  description: Remove features.
+  color: "b60205"
+- name: fix
+  description: Fix bug.
+  color: "5319e7"
+- name: security
+  description: In case of vulnerabilities.
+  color: "0052cc"

data/.github/release.yml

@@ -0,0 +1,23 @@
+changelog:
+  categories:
+    - title: Added
+      labels:
+        - add
+    - title: Changed
+      labels:
+        - change
+    - title: Deprecated
+      labels:
+        - deprecate
+    - title: Fixed
+      labels:
+        - fix
+    - title: Removed
+      labels:
+        - remove
+    - title: Security
+      labels:
+        - security
+    - title: Others
+      labels:
+        - "*"

data/.github/workflows/github-label-sync.yml

@@ -0,0 +1,16 @@
+name: github-label-sync
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - .github/labels.yml
+      - .github/workflows/github-label-sync.yml
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: r7kamura/github-label-sync-action@v0

data/dekiru.gemspec

@@ -6,7 +6,11 @@ Gem::Specification.new do |gem|
   gem.email         = ["matsumura.aki@gmail.com"]
   gem.description   = %q{Usefull helper methods for Ruby on Rails}
   gem.summary       = %q{Usefull helper methods for Ruby on Rails}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/SonicGarden/dekiru"
+
+  gem.metadata["homepage_uri"] = gem.homepage
+  gem.metadata["source_code_uri"] = "https://github.com/SonicGarden/dekiru"
+  gem.metadata["changelog_uri"] = "https://github.com/SonicGarden/dekiru/releases"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/dekiru/data_migration_operator.rb

@@ -2,7 +2,9 @@ require 'ruby-progressbar'
 
 module Dekiru
   class DataMigrationOperator
-    attr_reader :title, :stream, :result, :canceled, :started_at, :ended_at, :error
+    class NestedTransactionError < StandardError ; end
+
+    attr_reader :title, :stream, :logger, :result, :canceled, :started_at, :ended_at, :error
 
     def self.execute(title, options = {}, &block)
       self.new(title, options).execute(&block)
@@ -11,6 +13,7 @@ module Dekiru
     def initialize(title, options = {})
       @title = title
       @options = options
+      @logger = @options.fetch(:logger) { Logger.new(Rails.root.join("log/data_migration_#{Time.current.strftime("%Y%m%d%H%M")}.log")) }
       @stream = @options.fetch(:output, $stdout)
       @without_transaction = @options.fetch(:without_transaction, false)
       @side_effects = Hash.new do |hash, key|
@@ -25,8 +28,11 @@ module Dekiru
         run(&block)
         @result = true
       else
-        @result = ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
+        raise NestedTransactionError if current_transaction_open?
+
+        @result = ActiveRecord::Base.transaction do
           run(&block)
+          log "Finished execution: #{title}"
           confirm?("\nAre you sure to commit?")
         end
       end
@@ -65,8 +71,13 @@ module Dekiru
 
     private
 
+    def current_transaction_open?
+      ActiveRecord::Base.connection.current_transaction.open?
+    end
+
     def log(message)
       stream.puts(message)
+      logger&.info(message.squish)
     end
 
     def confirm?(message = 'Are you sure?')
@@ -84,7 +95,7 @@ module Dekiru
     end
 
     def newline
-      log ''
+      stream.puts('')
     end
 
     def cancel!

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/spec/dekiru/data_migration_operator_spec.rb

@@ -27,7 +27,11 @@ describe Dekiru::DataMigrationOperator do
     Dekiru::DummyStream.new
   end
   let(:without_transaction) { false }
-  let(:operator) { Dekiru::DataMigrationOperator.new('dummy', output: dummy_stream, without_transaction: without_transaction) }
+  let(:operator) do
+    op = Dekiru::DataMigrationOperator.new('dummy', output: dummy_stream, logger: nil, without_transaction: without_transaction)
+    allow(op).to receive(:current_transaction_open?) { false }
+    op
+  end
 
   describe '#execute' do
     it 'confirm で yes' do
@@ -76,6 +80,14 @@ describe Dekiru::DataMigrationOperator do
       expect(operator.stream.out).to include('Total time:')
     end
 
+    context 'トランザクション内で呼び出された場合' do
+      before { allow(operator).to receive(:current_transaction_open?) { true } }
+
+      it '例外が発生すること' do
+        expect { operator.execute { log 'processing'; sleep 1.0 } }.to raise_error(Dekiru::DataMigrationOperator::NestedTransactionError)
+      end
+    end
+
     context 'without_transaction: true のとき' do
       let(:without_transaction) { true }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -129,6 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/labels.yml"
+- ".github/release.yml"
+- ".github/workflows/github-label-sync.yml"
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".ruby-version"
@@ -161,9 +164,12 @@ files:
 - spec/spec_helper.rb
 - spec/supports/action_mailer.rb
 - spec/supports/mock_active_record.rb
-homepage: ''
+homepage: https://github.com/SonicGarden/dekiru
 licenses: []
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/SonicGarden/dekiru
+  source_code_uri: https://github.com/SonicGarden/dekiru
+  changelog_uri: https://github.com/SonicGarden/dekiru/releases
 post_install_message: 
 rdoc_options: []
 require_paths: