reenrb 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feea0d19f57dac06caefb00e6350c462c4730dcbbda1fa35085e89ae3e7d1d16
-  data.tar.gz: ca06bec8bbbd2e3d483eea48f7626b38094f3c9c922c25a6b4d0be2b0e7fd003
+  metadata.gz: 7e28aaaf5fa1575c823af2027760cad2904c1d7e248ec79362dbd9c7f3762153
+  data.tar.gz: a300132794589824a89c9d17e75fd277537603b7ce7064a9ac341ba49ef423c7
 SHA512:
-  metadata.gz: c2251f9c77d2f30bdb450d61749d402d1264a24c56aabaf05d14dbe3e5e061e5e3425ac603b6fe3104224b303d6bbb1dc260d3853d4e380b765d5639fe3cfedf
-  data.tar.gz: 001fee56fd50a98c6cfda7bcc8bf551cd446ec6417584f0f6ea8a5e95c0b2c764dfc88a55f13dcc4ea5ffd71ef4f09f5611a183436b64827a111fa0431aa7375
+  metadata.gz: c6aa3d99aa7b58e4c0c22fd109d33b9f5a57348fff6df8aff9874d97ea03125566a97b486b344fe6dcb9ad29d816b47f42c1603adfdad2cbd210a5fd1d183873
+  data.tar.gz: eae4c53636ff0f0146bbc79358b6044214a4e303f65f98aedc80fcd59cf1c37eb9d32ef71fd058936acff7e80a7e87bf525346a980aab55af296ffa05fd8e328

data/README.md

@@ -40,9 +40,55 @@ Examples:
     reen *.md --editor vi   # reen all markdown files using vi
     reen --editor 'code -w' # reen all markdown files using vscode
 
+### Specifying changes through the editor
+
+Upon running Reen on file list, your editor will open with a list of file/folder names. For example:
+
+```
+LICENSE.txt
+README.md
+SETUP.txt
+bin
+bin/help
+bin/myexec
+tests
+tests/fixtures
+tests/fixtures/a.json
+tests/fixtures/b.json
+tests/fixtures/c.json
+tests/helper.code
+tests/tests.code
+```
+
+Specify changes to each file you wish changed modifying it in your editor:
+
+- Change the file/folder name to rename it (the rename could cause a move if you change its path; restrictions will be reported)
+- Prepend using `-` to delete a file or empty folder
+- Prepend using `--` to force delete a file or non-empty folder (recursively)
+
+For example, if we wanted to change the above list of files/folders in the editor to (a) rename `LICENSE.txt` to `LICENSE.md`, (b) delete `SETUP.txt`, and (c) recursively delete the `bin/` folder, then we would change the filenames to look like:
+
+```
+LICENSE.md
+README.md
+-SETUP.txt
+--bin
+bin/help
+bin/myexec
+tests
+tests/fixtures
+tests/fixtures/a.json
+tests/fixtures/b.json
+tests/fixtures/c.json
+tests/helper.code
+tests/tests.code
+```
+
+Upon saving and exiting the editor, Reen will execute all the changes.
+
 ### Ruby application
 
-Use programmatically using the `reenrb` gem. In the example below, we specify that we do not want to use an actual editor to modify the list, but rather alter the list file using a block.
+Use Reen programmatically using the `reenrb` gem. In the example below, we specify that we do not want to use an actual editor to modify the list, but rather alter the list file using a block.
 
 ```ruby
 require 'reenrb'

data/lib/reenrb/actions/delete.rb

@@ -3,7 +3,7 @@
 module Reenrb
   module Actions
     # Deletes a file
-    class FileDelete
+    class Delete
       def initialize(old_name, new_name)
         @old_name = old_name
         @new_name = new_name

data/lib/reenrb/actions/force_delete.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Reenrb
+  module Actions
+    # Deletes a file
+    class ForceDelete
+      def initialize(old_name, new_name)
+        @old_name = old_name
+        @new_name = new_name
+      end
+
+      def call
+        FileUtils.rm_rf(@old_name)
+        nil
+      rescue Errno::ENOENT
+        "Could not force delete"
+      end
+    end
+  end
+end

data/lib/reenrb/actions/{file_rename.rb → rename.rb}

@@ -3,7 +3,7 @@
 module Reenrb
   module Actions
     # Renames files
-    class FileRename
+    class Rename
       def initialize(old_name, new_name)
         @old_name = old_name
         @new_name = new_name

data/lib/reenrb/change.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "actions/delete"
-require_relative "actions/file_rename"
+require_relative "actions/force_delete"
+require_relative "actions/rename"
 require_relative "actions/nothing"
 
 module Reenrb
@@ -19,44 +20,71 @@ module Reenrb
     module CHANGE
       NONE = :none
       DELETE = :delete
+      FORCE_DELETE = :force_delete
       RENAME = :rename
     end
 
+    module OBJECT
+      FILE = :file
+      FOLDER = :folder
+    end
+
     ACTION_HANDLER = {
       CHANGE::NONE => Actions::DoNothing,
-      CHANGE::DELETE => Actions::FileDelete,
-      CHANGE::RENAME => Actions::FileRename
+      CHANGE::DELETE => Actions::Delete,
+      CHANGE::FORCE_DELETE => Actions::ForceDelete,
+      CHANGE::RENAME => Actions::Rename
     }.freeze
 
     CHANGES_DESC = {
       CHANGE::NONE => "Nothing",
       CHANGE::DELETE => "Deleting",
+      CHANGE::FORCE_DELETE => "Force deleting",
       CHANGE::RENAME => "Renaming"
     }.freeze
 
     def initialize(original, requested)
       @original = original
-      @requested = requested
-      @change = compare
-      consider
+      extract_request(requested)
+      decide_object
+      decide_change
+      decide_status_reason
     end
 
-    def compare
-      if original == requested
-        CHANGE::NONE
-      elsif requested.start_with? "-"
-        CHANGE::DELETE
-      else
-        CHANGE::RENAME
-      end
+    def extract_request(str)
+      op_chars = "[-]"
+      obj_chars = "."
+      requested = str.match(/^(?<op>#{op_chars}*)(?<name>#{obj_chars}*)/)
+
+      @operator = requested[:op]
+      @requested = requested[:name].strip
+    end
+
+    def decide_change
+      @change =
+        if @operator == "--"
+          CHANGE::FORCE_DELETE
+        elsif @operator == "-"
+          CHANGE::DELETE
+        elsif @original != @requested
+          CHANGE::RENAME
+        else
+          CHANGE::NONE
+        end
     end
 
-    def consider
+    def decide_object
+      @object = OBJECT::FILE if request_file?
+      @object = OBJECT::FOLDER if request_dir?
+    end
+
+    def decide_status_reason
       if request_full_dir? && request_delete?
         @status = STATUS::REJECTED
         @reason = "Directories with files cannot be changed"
       else
         @status = STATUS::ACCEPTED
+        @reason = ""
       end
     end
 
@@ -64,7 +92,7 @@ module Reenrb
       return(self) if not_accepted?
 
       @status = STATUS::EXECUTED
-      error = ACTION_HANDLER[@change].new(original, requested).call
+      error = ACTION_HANDLER[@change].new(@original, @requested).call
 
       if error
         @status = STATUS::FAILED
@@ -78,6 +106,8 @@ module Reenrb
 
     def request_dir? = Dir.exist?(@original)
 
+    def request_file? = File.file?(@original)
+
     def request_nothing? = @change == CHANGE::NONE
 
     def request_rename? = @change == CHANGE::RENAME

data/lib/reenrb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reenrb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Soumya Ray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -125,8 +125,9 @@ files:
 - bin/reen
 - lib/reenrb.rb
 - lib/reenrb/actions/delete.rb
-- lib/reenrb/actions/file_rename.rb
+- lib/reenrb/actions/force_delete.rb
 - lib/reenrb/actions/nothing.rb
+- lib/reenrb/actions/rename.rb
 - lib/reenrb/change.rb
 - lib/reenrb/changes.rb
 - lib/reenrb/changes_file.rb