thrifty_file_applier 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1666a3ee44acad92c754263c4f5293f38ad08c8fd886ad23efcc1695e192c9
-  data.tar.gz: a07a11186f32bc2e6c53a22dd62275f83f0844bcf41024ffd1a5507415fbed2c
+  metadata.gz: 8f6cd08648563d8596214ac2e8787b35656024a371b4d8473189e962477a6d8d
+  data.tar.gz: 31f35bf90ea022b62ae03c01d2218e3ba921cca742390d2271390d77e9309063
 SHA512:
-  metadata.gz: 3207fcb861f4a3da5c22612b10bbfd514e916a13fc5191fa6f640f9d12385e8f7d777e6ab550218484a17ce6b94d93474251f1f8b5f2099dd90ddf053e8c7ed9
-  data.tar.gz: 3e6d5eed91164714ba3a10b630fa8ae676f53f869738992bfd50b661a161684a51a26663910ba47de5182ac12e5ec8db9c3f805b0fa360e6995c5ecbac243635
+  metadata.gz: dc0452f1fe2778ded4133713ff085715307b660fd5073323c7edaecf4b7d02425c35a1b3d62133d2861deeeb5911989c9734ad4f07264aba4f0ea125a96cbb4e
+  data.tar.gz: aa6bcdcd8a6ca9f1400dc3f531e11b1341a778d7f1c39f1faf00185310f1a842543de670ecd3a1b22f095b2ab2c66bcc8c106e6e4382c7261a49200b79efd51f

data/.idea/untitled3.iml

@@ -27,6 +27,8 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.11.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.30.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.18.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-rake (v0.6.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v2.11.1, ruby-3.1.1-p18 (2)) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, ruby-3.1.1-p18 (2)) [gem]" level="application" />
   </component>
@@ -34,21 +36,21 @@
     <option name="myRootTask">
       <RakeTaskImpl id="rake">
         <subtasks>
-          <RakeTaskImpl description="Build thrifty_file_applier-0.1.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Build thrifty_file_applier-0.1.5.gem into the pkg directory" fullCommand="build" id="build" />
           <RakeTaskImpl id="build">
             <subtasks>
-              <RakeTaskImpl description="Generate SHA512 checksum if thrifty_file_applier-0.1.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+              <RakeTaskImpl description="Generate SHA512 checksum if thrifty_file_applier-0.1.5.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
             </subtasks>
           </RakeTaskImpl>
           <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
           <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
-          <RakeTaskImpl description="Build and install thrifty_file_applier-0.1.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl description="Build and install thrifty_file_applier-0.1.5.gem into system gems" fullCommand="install" id="install" />
           <RakeTaskImpl id="install">
             <subtasks>
-              <RakeTaskImpl description="Build and install thrifty_file_applier-0.1.0.gem into system gems without network access" fullCommand="install:local" id="local" />
+              <RakeTaskImpl description="Build and install thrifty_file_applier-0.1.5.gem into system gems without network access" fullCommand="install:local" id="local" />
             </subtasks>
           </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.1.0 and build and push thrifty_file_applier-0.1.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Create tag v0.1.5 and build and push thrifty_file_applier-0.1.5.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
           <RakeTaskImpl description="Run RuboCop" fullCommand="rubocop" id="rubocop" />
           <RakeTaskImpl id="rubocop">
             <subtasks>

data/.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+  NewCops: enable
 
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
+Lint/ScriptPermission:
+  Enabled: false
 
 Style/StringLiteralsInInterpolation:
   Enabled: true
@@ -11,5 +14,9 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
-Style/EndOfLine:
-  EnforcedStyle: lf
+Layout/EndOfLine:
+  EnforcedStyle: lf
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/Gemfile

@@ -10,3 +10,5 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
+gem "rubocop-rake", require: false
+gem "rubocop-rspec", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    thrifty_file_applier (0.1.2)
+    thrifty_file_applier (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -39,6 +39,10 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.1.0)
 
@@ -50,6 +54,8 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.21)
+  rubocop-rake
+  rubocop-rspec
   thrifty_file_applier!
 
 BUNDLED WITH

data/README.md

@@ -29,7 +29,7 @@ applier.apply # => compile
 applier.apply # => nil
 FileUtils.touch "source/file"
 applier.apply # => compile
-FileUtils.rm "source/file"
+FileUtils.rm "tmp/last_application_time"
 applier.apply # => compile
 ```
 
@@ -41,6 +41,14 @@ ThriftyFileApplier.applier("tmp/last_application_time", "source1", "source2") do
 end
 ```
 
+### Shorthands
+If reusing applier was not needed, shorthands are available.
+```ruby
+ThriftyFileApplier.apply("tmp/last_application_time", "source") do
+  puts "compile"
+end # => compile
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/thrifty_file_applier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThriftyFileApplier
-  VERSION = "0.1.3"
+  VERSION = "0.1.6"
 end

data/lib/thrifty_file_applier.rb

@@ -1,71 +1,69 @@
-# frozen_string_literal: true
-
-require_relative "thrifty_file_applier/version"
-require "fileutils"
-
-# Executes specified block only if source file had been updated.
-module ThriftyFileApplier
-  class Error < StandardError; end
-
-  def self.applier(last_execution_log_path, source_path, &executor)
-    Applier.new(last_execution_log_path, source_path, &executor)
-  end
-
-  # Actual applier class.
-  class Applier
-    def initialize(last_execution_log_path, *source_paths, &executor)
-      @last_execution_log_path = Pathname.new last_execution_log_path
-      @update_source_paths = source_paths.map { Pathname.new _1 }
-      @executor = executor
-    end
-
-    def apply
-      exec_if_needed(&@executor)
-    end
-
-    def exec_if_needed(&block)
-      return if last_execution_time >= last_update_time
-
-      log_execution(&block)
-    end
-
-    private
-
-    def log_execution
-      execution_time = Time.now.to_f
-      result = yield
-      FileUtils.mkdir_p(@last_execution_log_path.dirname)
-      @last_execution_log_path.open("wb") { |f| f.write(execution_time) }
-      result
-    end
-
-    def last_update_time
-      @update_source_paths.map { last_update_time_in _1 }.max
-    end
-
-    def last_update_time_in(path)
-      return Time.at 0 unless path.exist?
-
-      if path.directory? && path.children.size.positive?
-        newest_mtime path
-      else
-        path.mtime
-      end
-    end
-
-    def last_execution_time
-      time_float = if @last_execution_log_path.exist?
-                     @last_execution_log_path.read.to_f
-                   else
-                     0.0
-                   end
-      Time.at time_float
-    end
-
-    def newest_mtime(path)
-      path.each_child
-          .map { File.mtime(_1) }
-          .max
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "thrifty_file_applier/version"
+require "fileutils"
+
+# Executes specified block only if source file had been updated.
+module ThriftyFileApplier
+  class Error < StandardError; end
+
+  def self.applier(applied_time_path, *source_paths, &executor)
+    Applier.new(applied_time_path, *source_paths, &executor)
+  end
+
+  def self.apply(applied_time_path, *source_paths, &executor)
+    applier(applied_time_path, *source_paths, &executor).apply
+  end
+
+  # Actual applier class.
+  class Applier
+    def initialize(applied_time_path, *source_paths, &executor)
+      @last_applied_log_path = Pathname.new applied_time_path
+      @source_paths = source_paths.map { Pathname.new _1 }
+      @executor = executor
+    end
+
+    def apply
+      exec_if_updated(&@executor)
+    end
+
+    def exec_if_updated(&block)
+      update_time_f = source_update_time.to_f
+      exec_with_log(update_time_f, &block) if update_time_f > last_applied_time_f
+    end
+
+    private
+
+    def exec_with_log(time_f)
+      result = yield
+
+      FileUtils.mkdir_p(@last_applied_log_path.dirname)
+      @last_applied_log_path.open("wb") { |f| f.write(time_f) }
+
+      result
+    end
+
+    def source_update_time
+      @source_paths.map do |path|
+        path.exist? ? newest_mtime(path) : Time.at(0)
+      end.max
+    end
+
+    def newest_mtime(path)
+      return path.mtime if !path.directory? ||
+                           (path.directory? && path.children.size.zero?)
+
+      path.children
+          .map { newest_mtime(_1) }
+          .max
+    end
+
+    def last_applied_time_f
+      if @last_applied_log_path.exist?
+        @last_applied_log_path.read.to_f
+      else
+        0.0
+      end
+    end
+  end
+end

data/sample/sample.rb

@@ -10,5 +10,12 @@ applier.apply # => compile
 applier.apply # => nil
 FileUtils.touch "source/file"
 applier.apply # => compile
-FileUtils.rm "source/file"
+FileUtils.rm "tmp/last_application_time"
 applier.apply # => compile
+
+FileUtils.rm "tmp/last_application_time"
+ThriftyFileApplier.apply("tmp/last_application_time", "source") do
+  puts "compile"
+end
+
+FileUtils.rm "source/file"

data/sig/lib/thrifty_file_applier.rbs

@@ -0,0 +1,28 @@
+# Executes specified block only if source file had been updated.
+module ThriftyFileApplier
+  class Error < StandardError
+  end
+
+  def self.applier: [T] (String applied_time_path, *String source_paths) { () -> T } -> T
+
+  def self.apply: [T] (String applied_time_path, *String source_paths) { () -> T } -> T
+
+  # Actual applier class.
+  class Applier[T]
+    def initialize: (String applied_time_path, *String source_paths) { () -> T } -> void
+
+    def apply: () -> T
+
+    def exec_if_updated: [U] () { () -> U } -> U
+
+    private
+
+    def exec_with_log: [U] (Float time_f) { () -> U } -> U
+
+    def source_update_time: () -> Time
+
+    def newest_mtime: (Pathname path) -> Time
+
+    def last_applied_time_f: () -> Float
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrifty_file_applier
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Yudai Tanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -33,6 +33,7 @@ files:
 - lib/thrifty_file_applier.rb
 - lib/thrifty_file_applier/version.rb
 - sample/sample.rb
+- sig/lib/thrifty_file_applier.rbs
 - sig/update_watcher.rbs
 homepage: https://github.com/ytnk531/thrifty_file_applier
 licenses:
@@ -40,6 +41,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ytnk531/thrifty_file_applier
   source_code_uri: https://github.com/ytnk531/thrifty_file_applier
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -48,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="