reenrb 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083216d43618c82f4f477057c5b388be39385ce3afe3984fdbb6ba59d2e9ab1c'
-  data.tar.gz: 15d221f549392c5830f2b709d98078d572cf4638a6f5a661ab2d495626868d9e
+  metadata.gz: ef0b76de4c05fb0949d2b65b6b7f79d3265fb1474e109de5186a788b1c32602c
+  data.tar.gz: 5c4a47408deed235d05236615380fdc35a099f4049d7fce833e3a06af48c2d96
 SHA512:
-  metadata.gz: 782c7fdb66213cf0d5de16acacdea2cacfc3a01b87ad0e8376e7729434a29cc2577209477faaef9c23d14513e6050b7997697f365d8f40e2aa9665f73ebfe4c5
-  data.tar.gz: db2ef58c4c56b262a60c85b0a70b6b12dda8d05dcf7fd504c44fce710f89a0709802e8e378f0a56fb551b1c9ea8cad6d623877de5c594787206ea6fa496b7a84
+  metadata.gz: 3fe1b3c16fb10bdaa39c095acef4611822c2c07934081dfc1d223f2103d3cf07a3d819b50b5a1351cec1538d0fb24e03fd77d58eeef2bb212405a1c624b2f602
+  data.tar.gz: 88bd9ad15855e04911bd87b2d620843a254c31c0b84a4919c18cdaa314b8bd8c6953280450e8cefbbc32af1489e4c5034322bff26c4a63cdc2a9c57810b04348

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reenrb (0.1.0)
+    reenrb (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -43,7 +43,7 @@ Use programmatically using the `reenrb` gem. In the example below, we specify th
 require 'reenrb'
 
 glob = Dir.glob("*")
-reen = Reenrb::Reen.new(options: { mock_editor: true })
+reen = Reenrb::Reen.new(editor: nil)
 
 reen.execute(glob) do |tmpfile_path|
   lines = File.read(tmpfile_path).split("\n")
@@ -55,6 +55,8 @@ reen.execute(glob) do |tmpfile_path|
 end
 ```
 
+You may also pass a block with an editor specified, in which case the block is run after the editor has finished.
+
 ## 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/bin/reen

@@ -17,6 +17,6 @@ exit_with_error(EDITOR_MSG) if editor.empty?
 
 results = Reenrb::Reen.new(editor: editor).execute(file_list)
 
-changes = Reenrb::Changes.new(results).change_requested
+changes = results.change_requested
 
 puts changes.summarize

data/lib/change.rb

@@ -40,22 +40,6 @@ module Reenrb
       end
     end
 
-    def request_directory?
-      Dir.exist? @original
-    end
-
-    def request_delete?
-      @change == CHANGE::DELETE
-    end
-
-    def request_empty_directory?
-      Dir.empty? @original
-    end
-
-    def request_full_directory?
-      request_directory? && !request_empty_directory?
-    end
-
     def consider
       if request_full_directory? && request_delete?
         @status = STATUS::REJECTED
@@ -65,12 +49,8 @@ module Reenrb
       end
     end
 
-    def executed_or_rejected
-      %i[executed rejected].include? @status
-    end
-
     def execute
-      return(self) if executed_or_rejected
+      return(self) if executed_or_rejected?
 
       case @change
       when :rename
@@ -83,6 +63,34 @@ module Reenrb
       self
     end
 
+    # Inspection
+
+    def request_directory?
+      Dir.exist? @original
+    end
+
+    def request_delete?
+      @change == CHANGE::DELETE
+    end
+
+    def request_empty_directory?
+      Dir.empty? @original
+    end
+
+    def executed?
+      @status == STATUS::EXECUTED
+    end
+
+    def request_full_directory?
+      request_directory? && !request_empty_directory?
+    end
+
+    def executed_or_rejected?
+      %i[executed rejected].include? @status
+    end
+
+    # Decoration
+
     def to_s
       file_desc =
         case @change

data/lib/changes.rb

@@ -9,10 +9,13 @@ module Reenrb
       @list = changes_list
     end
 
-    def none
-      Changes.new(@list.select { |c| c.change == :none })
+    def execute!
+      @list.map(&:execute)
+      self
     end
 
+    # Inspection
+
     def rename_requested
       Changes.new(@list.select { |c| c.change == :rename })
     end
@@ -37,10 +40,30 @@ module Reenrb
       Changes.new(@list.select { |c| c.status == :executed })
     end
 
+    def count
+      @list.size
+    end
+
+    # Decoration
+
     def summarize
       return "Nothing changed" if @list.empty?
 
       @list.map(&:to_s).join("\n")
     end
+
+    # Predicates
+
+    def no_changes_requested?
+      list.map(&:change).all? :none
+    end
+
+    def changes_requested?
+      !no_changes_requested?
+    end
+
+    def all_executed?
+      @list.all?(&:executed?)
+    end
   end
 end

data/lib/reenrb/version.rb

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

data/lib/reenrb.rb

@@ -9,8 +9,9 @@ module Reenrb
   class Error < StandardError; end
 
   # Renames pattern of files with given editor
-  # Example:
+  # Examples:
   #   Reenrb::Reen.new(editor: "code -w").call("spec/fixtures/example/*")
+  #   Reenrb::Reen.new(editor: nil).call("spec/fixtures/example/*") { ... }
   class Reen
     DEL_ERROR = "Do not delete any file/folder names"
 
@@ -21,20 +22,26 @@ module Reenrb
       @options = options
     end
 
-    def request(original_list, &block)
-      # original_list = Dir.glob(pattern)
+    def request(original_list, &block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       changed_list = ChangesFile.new(original_list).allow_changes do |file|
-        @options[:mock_editor] ? block.call(file.path) : file.blocking_edit(@editor)
+        file.blocking_edit(@editor) if @editor
+
+        if block
+          lines = File.read(file.path).split("\n")
+          new_lines = block.call(lines) || lines
+          File.write(file.path, new_lines.join("\n"))
+        end
       end
 
       raise(Error, DEL_ERROR) if changed_list.size != original_list.size
 
       @changes = compare_lists(original_list, changed_list)
+                 .then { |change_array| Changes.new(change_array) }
     end
 
     def execute(original_list, &block)
       @changes ||= request(original_list, &block)
-      @changes = @changes.map(&:execute)
+      @changes = @changes.execute!
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reenrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Soumya Ray