classifile 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c188cda8d916ed432b19c5d81cf714248cdaebfb0ef07a94d0c4d7daf0f06387
-  data.tar.gz: 0aa717603eb6e0c4db4414af494b9dd451c1a720d28d9bc72f4279e7b9adb639
+  metadata.gz: 0cce93eb73710a688753be83c9cb3d8e4b52b53b0d2331fc5e0a8089189da42b
+  data.tar.gz: aea6312d952170098e7137d37fe1ca71ee3e2431081f29f57bf1d10cb3bbf8f9
 SHA512:
-  metadata.gz: 5f243782cc523bc87873eefbb8d9f76c1bbe46d3efc08ad25903853294af3635f31f6610d5370bb078e492e920bb7b6a77b7b9edbeeb820de36681fdb6bc4e56
-  data.tar.gz: 9c7e972a8c91fdb3323a70ee150d8fdaec571eeefba044423ef98f1e1c3953e987aa1d247fc32a25f70bb643e50d54745a4b31da677b981183a8cd363810611c
+  metadata.gz: 8d1c5ef63757218780334243155a69fe0eda53b5f0c11a23c14ecb378265797c4481e65959b7581a1cbbc8e9288aea0ec4ad8046479052e9251540e854e3d9a7
+  data.tar.gz: e6f80dd7ef81e0922adcfa2e93d54d2d9ee03b1a00f98f9013b72254b6ccd0705b40bc525c78764757f99b26241fd3334ea97b053ace996b1cb272d315337553

data/.idea/classifile.iml

@@ -13,22 +13,60 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.27, ruby-3.0.2-p107) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.2, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="docile (v1.4.0, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.4, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v1.20.1, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parser (v3.0.2.0, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, ruby-3.0.2-p107) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.3, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rbs (v1.0.4, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.1.1, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.20.0, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.11.0, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.21.2, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.3, ruby-3.0.2-p107) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov_json_formatter (v0.1.3, ruby-3.0.2-p107) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.0.0, ruby-3.0.2-p107) [gem]" level="application" />
   </component>
   <component name="RakeTasksCache">
     <option name="myRootTask">
-      <RakeTaskImpl id="rake" />
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build classifile-0.1.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if classifile-0.1.0.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 classifile-0.1.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install classifile-0.1.0.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 classifile-0.1.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RuboCop" fullCommand="rubocop" id="rubocop" />
+          <RakeTaskImpl id="rubocop">
+            <subtasks>
+              <RakeTaskImpl description="Auto-correct RuboCop offenses" fullCommand="rubocop:auto_correct" id="auto_correct" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Run tests" fullCommand="test" id="test" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
     </option>
   </component>
 </module>

data/Gemfile

@@ -10,3 +10,5 @@ gem "rake", "~> 13.0"
 gem "minitest", "~> 5.0"
 
 gem "rubocop", "~> 1.7"
+
+gem "simplecov", "~> 0.21"

data/README.md

@@ -1,8 +1,11 @@
 # Classifile
 
+[![status](https://github.com/kurehajime/classifile/actions/workflows/main_test.yml/badge.svg?branch=main)](https://github.com/kurehajime/classifile/actions/workflows/main_test.yml)
+
 Classifile is a tool for classifying files by Ruby DSL.
 
 ## Installation
+Ruby 3.0.0 or higher is required.
 
     $ gem install classifile
 
@@ -68,6 +71,19 @@ temp/
 　　└─dancing_cat.mpg
 ```
 
+## Options
+
+Command line options are here.
+
+|  Sort option  |  Long option  | Description  |
+| ---- | ---- |---- |
+|  -d  *PATH* |  --dsl *PATH*  |DSL path  |
+|  -f *PATH* |  --from *PATH*  |Source directory path  |
+|  -t *PATH* |  --to *PATH*  |Output directory path  |
+|  -p  |  --preview  |Preview Mode(don't move,don't copy)  |
+|  -c  |  --copy  |Copy Mode(don't move)  |
+|  -h  |  --help  |Show this help  |
+
 ## Syntax
 
 ### Classifile rules.
@@ -108,6 +124,18 @@ end
 
 `dog.png -> /Dogs/dog.png`
 
+#### del block
+
+`del` block deletes the file.
+
+```ruby
+del do
+   end_with? ".tmp"
+end
+```
+
+`temp.tmp  will be deleted.`
+
 ### Check methods
 
 The check method checks if the file should be stored in that directory.

data/classifile.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", ">= 13.0"
   spec.add_development_dependency "rubocop", ">= 1.7"
+  spec.add_development_dependency "simplecov", ">= 0.21"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: "https://github.com/kurehajime/classifile"

data/lib/classifile/checker/assert_checker.rb

@@ -36,6 +36,7 @@ module Classifile
     end
 
     def respond_to_missing?(sym, *)
+      @assert = Asserter.new if @assert.nil?
       if sym.to_s.include?("assert")
         @assert.respond_to?(sym) ? true : super
       else

data/lib/classifile/const/file_types.rb

@@ -4,6 +4,6 @@
 # extension
 module Classifile
   FILE_TYPE_IMAGE = %w[.gif .jpg .jpeg .jpe .jfif .png .bmp .dib .rle .ico .ai .art .psd .tif .tiff .nsk .webp].freeze
-  FILE_TYPE_SOUND = %w[.mp3 .wma .asf .3gp .3g2 .aac .ogg .oga .mov .m4a .alac .flac .wav].freeze
-  FILE_TYPE_MOVIE = %w[.avi .flv .mpg .mpeg .mp4 .mkv .mov .qt .wmv .asf .m2ts .ts .m4a .webm .ogm].freeze
+  FILE_TYPE_SOUND = %w[.mp3 .wma .3gp .3g2 .aac .ogg .oga .m4a .alac .flac .wav].freeze
+  FILE_TYPE_MOVIE = %w[.avi .flv .mpg .mpeg .mp4 .mkv .mov .qt .wmv .asf .m2ts .ts .webm .ogm].freeze
 end

data/lib/classifile/const/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Classifile
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/classifile/execute.rb

@@ -9,17 +9,24 @@ module Classifile
     # However, it does not actually move the file,
     # but outputs the mv command as a string.
     def test(dsl_path, from_paths, to_path)
-      classify(dsl_path, from_paths, to_path).each do |ft|
-        puts "mv \"#{ft.from}\"  \"#{ft.to}\" "
+      classify(dsl_path, from_paths, to_path).each do |result|
+        puts "mv \"#{result.from}\"  \"#{result.to}\" " if result.is_a? MoveFile
+        puts "rm \"#{result.from}\" " if result.is_a? RemoveFile
       end
     end
 
     ##
     # Classify the files by DSL.
     def move(dsl_path, from_paths, to_path)
-      classify(dsl_path, from_paths, to_path).each do |ft|
-        FileTools.move(ft.from, ft.to)
-        ft.after_save_procs.each(&:call)
+      classify(dsl_path, from_paths, to_path).each do |result|
+        if result.is_a? MoveFile
+          FileTools.move(result.from, result.to)
+          result.after_save_procs.each(&:call)
+        end
+        if result.is_a? RemoveFile
+          FileUtils.remove(result.from)
+          result.after_save_procs.each(&:call)
+        end
       end
     end
 
@@ -27,14 +34,17 @@ module Classifile
     # Classify the files by DSL.
     # However, the original file will remain.
     def copy(dsl_path, from_paths, to_path)
-      classify(dsl_path, from_paths, to_path).each do |ft|
-        FileTools.move(ft.from, ft.to, copy: true)
-        ft.after_save_procs.each(&:call)
+      classify(dsl_path, from_paths, to_path).each do |result|
+        if result.is_a? MoveFile
+          FileTools.move(result.from, result.to, copy: true)
+          result.after_save_procs.each(&:call)
+        end
+        result.after_save_procs.each(&:call) if result.is_a? RemoveFile
       end
     end
 
     ##
-    # Classify files by DSL and return an array of FromTo classes.
+    # Classify files by DSL and return an array of MoveFile classes.
     def classify(dsl_path, from_paths, to_path)
       arr = []
       dsl = FileTools.read_dsl(dsl_path)

data/lib/classifile/result/move_file.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Classifile
+  ##
+  # Source and destination classes for file
+  class MoveFile < Result
+    attr_accessor :to
+
+    def initialize(from, to)
+      @to = to
+      super from
+    end
+  end
+end

data/lib/classifile/result/remove_file.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Classifile
+  ##
+  # Source and destination classes for file
+  class RemoveFile < Result
+  end
+end

data/lib/classifile/result/result.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Classifile
+  ##
+  # Result for classify
+  class Result
+    attr_accessor :from, :after_save_procs
+
+    def initialize(from)
+      @from = from
+      @after_save_procs = []
+    end
+  end
+end

data/lib/classifile/state.rb

@@ -33,21 +33,30 @@ module Classifile
       return if @gotcha
 
       child = make_child dir_name
-      child.instance_exec(@file, &block)
+      child_run!(child, block) do
+        @gotcha = MoveFile.new(File.expand_path(@file.full_path),
+                               File.expand_path(File.join(child.to_path, child.save_name)))
+        sets_after_save_proc(child)
+      end
+    end
 
-      if child.gotcha
-        @gotcha = child.gotcha
-      else
-        raise Failed if dir_name.empty? || child.empty?
+    def group(_group_name = "", &block)
+      return if @gotcha
 
-        gotcha_child(child)
+      child = make_child ""
+      child_run!(child, block) do
+        # Ignored
       end
-    rescue Failed
-      # Ignored
     end
 
-    def group(_group_name = "", &block)
-      dir("", &block)
+    def del(&block)
+      return if @gotcha
+
+      child = make_child ""
+      child_run!(child, block) do
+        @gotcha = RemoveFile.new(File.expand_path(@file.full_path))
+        sets_after_save_proc(child)
+      end
     end
 
     def empty_dir!
@@ -60,9 +69,21 @@ module Classifile
 
     private
 
-    def gotcha_child(child)
-      @gotcha = FromTo.new(File.expand_path(@file.full_path),
-                           File.expand_path(File.join(child.to_path, child.save_name)))
+    def child_run!(child, proc)
+      child.instance_exec(@file, &proc)
+
+      if child.gotcha
+        @gotcha = child.gotcha
+      else
+        raise Failed if child.empty?
+
+        yield
+      end
+    rescue Failed
+      # Ignored
+    end
+
+    def sets_after_save_proc(child)
       child.after_save_syms.each do |sym|
         @gotcha.after_save_procs << child.method(sym)
       end

data/lib/classifile.rb

@@ -7,7 +7,9 @@ require_relative "classifile/checker/name_checker"
 require_relative "classifile/checker/extension_checker"
 require_relative "classifile/checker/assert_checker"
 require_relative "classifile/io/file_tools"
-require_relative "classifile/from_to"
+require_relative "classifile/result/result"
+require_relative "classifile/result/remove_file"
+require_relative "classifile/result/move_file"
 require_relative "classifile/classify"
 require_relative "classifile/target_file"
 require_relative "classifile/state"

data/sandbox/dsl/dsl.rb

@@ -60,3 +60,7 @@ dir "Markdown" do |_file|
     puts "Please read #{file.to_path}"
   end
 end
+
+del do
+  end_with? ".tmp"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classifile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kurehajime
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: classify file by ruby DSL.
 email:
 - xiidec@gmail.com
@@ -82,12 +96,15 @@ files:
 - lib/classifile/const/version.rb
 - lib/classifile/error/failed.rb
 - lib/classifile/execute.rb
-- lib/classifile/from_to.rb
 - lib/classifile/io/file_tools.rb
+- lib/classifile/result/move_file.rb
+- lib/classifile/result/remove_file.rb
+- lib/classifile/result/result.rb
 - lib/classifile/state.rb
 - lib/classifile/target_file.rb
 - sandbox/dsl/dsl.rb
 - sandbox/from/hello.md
+- sandbox/from/remove.tmp
 - sandbox/from/test.txt
 - sandbox/from/xyz.txt
 - sandbox/from/zzz.ini

data/lib/classifile/from_to.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Source and destination classes for file
-class FromTo
-  attr_accessor :from, :to, :after_save_procs
-
-  def initialize(from, to)
-    @from = from
-    @to = to
-    @after_save_procs = []
-  end
-end