sashimi_tanpopo 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f419c456b6bd232d0af91f67a4a990b1207db12b186ee9ace48f736d5f4df7d
-  data.tar.gz: 55128422045397cc07dc296585689bb4554257e3b00ab2478f961c002ca75c2e
+  metadata.gz: 67fece13651795cb4bb095869e0bb4a39605c3538dc7d025000828074249bee0
+  data.tar.gz: 176c9e5283bf71e67204bb750cfe2fac0ea0c252f80ccfc6c346fdb6a8a6bc2b
 SHA512:
-  metadata.gz: 2c1da714d12deab14a91316d82b3aa21e1b7feb87d68ef0bdc2c21afbec363bfd55aa84cc7b01f69e9ff9367c0237a07b46a765e12f7ea26f57a328b5439ee6f
-  data.tar.gz: 8c12b901499604591f683cbf4d11a79243d2abb40c97f414cb3bab33fe01cb9c2b1b06ccea2eb49e5024294c3be5b56884920725768b4dbb94705e781d43314b
+  metadata.gz: 57e5a36438ef78f83f7be086209e00bb8f421ffea722c1c4e0e6696f370fef8d577dae879a0489855535ff9daa1efe8802b9fa935fd23fd6a70bc281e7830e80
+  data.tar.gz: 7b7ad4c992cb797346d58c07bd9e008727d41654e2762222cb8e92ae351d535f538bcd1b06893b66f231e2bd26cdbc95e18124bcff8950be0e358994d09d43ce

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
-[full changelog](http://github.com/sue445/sashimi_tanpopo/compare/v0.3.2...main)
+[full changelog](http://github.com/sue445/sashimi_tanpopo/compare/v0.3.3...main)
+
+## [0.3.3](https://github.com/sue445/sashimi_tanpopo/releases/tag/v0.3.3) - 2025-11-05
+[full changelog](http://github.com/sue445/sashimi_tanpopo/compare/v0.3.2...v0.3.3)
+
+* Fixed an issue where file was not updated when `update_file` was called multiple times on the same file
+  * https://github.com/sue445/sashimi_tanpopo/pull/70
 
 ## [0.3.2](https://github.com/sue445/sashimi_tanpopo/releases/tag/v0.3.2) - 2025-11-02
 [full changelog](http://github.com/sue445/sashimi_tanpopo/compare/v0.3.1...v0.3.2)

data/Dockerfile

@@ -1,7 +1,7 @@
 ARG RUBY_VERSION=3.4
 FROM ruby:${RUBY_VERSION}-alpine
 
-ARG SASHIMI_TANPOPO_VERSION=0.3.1
+ARG SASHIMI_TANPOPO_VERSION=0.3.2
 
 WORKDIR /work
 

data/lib/sashimi_tanpopo/dsl.rb

@@ -122,22 +122,36 @@ module SashimiTanpopo
       def update_file(pattern, &block)
         Dir.glob(pattern).each do |path|
           full_file_path = File.join(@__target_dir__, path)
-          before_content = File.read(full_file_path)
+
+          next unless File.exist?(full_file_path)
+
+          before_content =
+            if changed_files[path]
+              changed_files[path][:after_content]
+            else
+              File.read(full_file_path)
+            end
 
           SashimiTanpopo.logger.info "Checking #{full_file_path}"
 
-          after_content = update_single_file(path, &block)
+          after_content = update_single_file(before_content, &block)
 
           unless after_content
             SashimiTanpopo.logger.info "#{full_file_path} isn't changed"
             next
           end
 
-          changed_files[path] = {
-            before_content: before_content,
-            after_content:  after_content,
-            mode:           File.stat(full_file_path).mode.to_s(8)
-          }
+          File.write(full_file_path, after_content) if !dry_run? && @__is_update_local__
+
+          if changed_files[path]
+            changed_files[path][:after_content] = after_content
+          else
+            changed_files[path] = {
+              before_content: before_content,
+              after_content:  after_content,
+              mode:           File.stat(full_file_path).mode.to_s(8)
+            }
+          end
 
           if dry_run?
             SashimiTanpopo.logger.info "#{full_file_path} will be changed (dryrun)"
@@ -149,28 +163,23 @@ module SashimiTanpopo
 
       private
 
-      # @param path [String]
+      # @param content [String]
       #
       # @yieldparam content [String] content of file
       #
       # @return [String] Content of changed file if file is changed
       # @return [nil] file isn't changed
-      def update_single_file(path)
-        return nil unless File.exist?(path)
+      def update_single_file(content)
+        after_content = content.dup
 
-        content = File.read(path)
-        before_content = content.dup
-
-        yield content
+        yield after_content
 
         # File isn't changed
-        return nil if content == before_content
-
-        show_diff(before_content, content)
+        return nil if after_content == content
 
-        File.write(path, content) if !dry_run? && @__is_update_local__
+        show_diff(content, after_content)
 
-        content
+        after_content
       end
 
       # @param str1 [String]

data/lib/sashimi_tanpopo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SashimiTanpopo
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/rbs_collection.lock.yaml

@@ -33,6 +33,10 @@ gems:
     revision: 04ed82d7df5d5ee825d7864abfa29d624b52e549
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: date
+  version: '0'
+  source:
+    type: stdlib
 - name: dbm
   version: '0'
   source:

data/sig/sashimi_tanpopo/dsl.rbs

@@ -45,7 +45,7 @@ module SashimiTanpopo
 
       private
 
-      def update_single_file: (String path) { (String) -> void } -> String?
+      def update_single_file: (String content) { (String) -> void } -> String?
 
       def show_diff: (String str1, String str2) -> void
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sashimi_tanpopo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - sue445