recode 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2caac89edbf1003a3a6d9d48f391098a7fa5f3fd063edf9152aaccc0ae224d3
-  data.tar.gz: 40d28e5a4eade760c85694b0b89437013948df35edc59f71e11301588fefae39
+  metadata.gz: 2128ff9e04d8cfb769e6d86a37cd9f86f641f279f9ac252cb87a3b595f293fa6
+  data.tar.gz: 91f57f66757d7b0d1831620e3c1537c2a49c5b36fafad37c97c371a19e846c60
 SHA512:
-  metadata.gz: e25dccd66128657f8d32e6031fcd1c04e555ef3dc001839dbf29d3011e44d88a5bd1f8a83da977effa40605c105f705a61b219e9832c0e26d6cb47be1b14edea
-  data.tar.gz: c49731b417af6c8f193f2215a89da54fcf7bdb6231b93ee53c87bce222401628d143ecc4e47a1841e6ddc8de68d6a44ebad9585442fab524f6b2fdd73fde358f
+  metadata.gz: 297830b73fd0a5260decd1f710e2bec7cb304f5a4be44faf0c938903274088b2805c20d0c847d04598959e5149eeb0f13a4b06eb1fb9f9e51b765a262682cd6d
+  data.tar.gz: e69e6f88d4c0468d9daf8f5534bc7533ea4de9d16965e08275e133da3a22da42af8165e8ce50ae26646fac5f04a66dd8cb35e58ce5d0ac3a7bf765b25d433c21

data/bin/recode

@@ -11,6 +11,6 @@ rescue Interrupt, Recode::Abort
   exit 1
 rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
-  say! "!txtred!#{e.class}: #{e.message}"
+  say! "r`#{e.class}: #{e.message}`"
   exit 1
-end
+end

data/lib/recode/change_variations.rb

@@ -1,14 +1,15 @@
 module Recode
   module ChangeVariations
     using Strings::Inflection::Extensions
+    using Recode::Refinements
 
     def change_variations(old_string, new_string)
       result = []
-      result << [old_string.pluralize.downcase, new_string.pluralize.downcase]
+      result << [old_string.pluralize.underscore, new_string.pluralize.underscore]
       result << [old_string.pluralize, new_string.pluralize]
-      result << [old_string.downcase, new_string.downcase]
+      result << [old_string.underscore, new_string.underscore]
       result << [old_string, new_string]
       result.uniq
     end
   end
-end
+end

data/lib/recode/cli.rb

@@ -1,13 +1,12 @@
 require 'mister_bin'
 require 'recode'
 require 'recode/command'
+require 'recode/version'
 
 module Recode
   class CLI
     def self.router
-      router = MisterBin::Runner.new version: VERSION
-      router.route_all to: Command
-      router
+      MisterBin::Runner.new version: VERSION, handler: Command
     end
   end
 end

data/lib/recode/command.rb

@@ -1,26 +1,26 @@
 module Recode
   class Command < MisterBin::Command
-    help "Code Refactoring Utility"
+    help 'Code Refactoring Utility'
 
-    usage "recode OLD [to] NEW [in] EXTENSIONS... [options]"
-    usage "recode (-h|--help)"
+    usage 'recode OLD [to] NEW [in] EXTENSIONS... [options]'
+    usage 'recode (-h|--help)'
 
-    option "-a --apply", "Apply changes"
-    option "-p --prompt", "Apply changes interactively "
+    option '-a --apply', 'Apply changes'
+    option '-p --prompt', 'Apply changes interactively '
 
-    param "OLD", "Old string, singular and capitalized"
-    param "NEW", "New string, singular and capitalized"
-    param "EXTENSIONS", "Space delimited file extensions"
+    param 'OLD', 'Old string, singular and capitalized'
+    param 'NEW', 'New string, singular and capitalized'
+    param 'EXTENSIONS', 'Space delimited file extensions'
 
-    example "recode Member User rb"
-    example "recode Member to User in rb js"
-    example "recode Member to User in rb js --apply"
-    example "recode Member to User in rb js -p"
+    example 'recode Member User rb'
+    example 'recode Member to User in rb js'
+    example 'recode Member to User in rb js --apply'
+    example 'recode Member to User in rb js -p'
 
     def run
-      runner = Runner.new path: path, 
-        extensions: extensions, 
-        old_string: old_string, 
+      runner = Runner.new path: path,
+        extensions: extensions,
+        old_string: old_string,
         new_string: new_string
 
       runner.execute handler
@@ -39,9 +39,9 @@ module Recode
     end
 
     def path
-      "."
+      '.'
     end
-    
+
     def extensions
       args['EXTENSIONS']
     end
@@ -53,7 +53,5 @@ module Recode
     def new_string
       args['NEW']
     end
-
-
   end
 end

data/lib/recode/diffing.rb

@@ -15,5 +15,4 @@ module Recode
       Diffy::Diff
     end
   end
-
-end
+end

data/lib/recode/exceptions.rb

@@ -1,3 +1,3 @@
 module Recode
   Abort = Class.new Interrupt
-end
+end

data/lib/recode/handler/apply.rb

@@ -12,4 +12,4 @@ module Recode
       end
     end
   end
-end
+end

data/lib/recode/handler/base.rb

@@ -5,14 +5,14 @@ module Recode
       include Colsole
 
       def show_rename(source:, target:)
-        say "\n!txtpur!" + ("_" * terminal_width)
-        say "!txtpur!rename:"
+        say "\nm`#{'_' * terminal_width}`"
+        say 'm`rename:`'
         puts diff source, target
       end
 
       def show_edit(file:, before:, after:)
-        say "\n!txtblu!" + ("_" * terminal_width)
-        say "!txtblu!edit: #{file}"
+        say "\nb`#{'_' * terminal_width}`"
+        say "b`edit: #{file}`"
         puts diff before, after
       end
 
@@ -26,4 +26,4 @@ module Recode
       end
     end
   end
-end
+end

data/lib/recode/handler/output.rb

@@ -10,4 +10,4 @@ module Recode
       end
     end
   end
-end
+end

data/lib/recode/handler/prompt.rb

@@ -12,25 +12,24 @@ module Recode
         super
         save_file file, after if apply?
       end
-    
+
     private
 
       def apply?
-        say "\nApply? !undgrn!Y!txtrst!es, !undgrn!n!txtrst!o, !undgrn!q!txtrst!uit : "
-        answer = $stdin.getch.downcase
-        
-        if answer == 'q' or answer == "\u0003"
-          say "!txtblu!Quit"
+        say "\nApply? gu`Y`es, gu`n`o, gu`q`uit : "
+
+        case $stdin.getch.downcase
+        when 'q', "\u0003"
+          say 'b`Quit`'
           raise Recode::Abort
-        elsif answer == 'n'
-          say "!txtred!No"
+        when 'n'
+          say 'r`No`'
           false
         else
-          say "!txtgrn!Yes"
+          say 'g`Yes`'
           true
         end
       end
-
     end
   end
-end
+end

data/lib/recode/refinements.rb

@@ -0,0 +1,13 @@
+module Recode
+  module Refinements
+    refine String do
+      def underscore
+        gsub(/::/, '/')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr('-', '_')
+          .downcase
+      end
+    end
+  end
+end

data/lib/recode/runner.rb

@@ -3,12 +3,13 @@ module Recode
     include Colsole
     include ChangeVariations
 
-    attr_accessor :path, :extensions, :old_string, :new_string
-    attr_accessor :handler
+    attr_accessor :path, :extensions, :old_string, :new_string, :handler
 
     def initialize(path: nil, extensions: nil, old_string: nil, new_string: nil)
-      @path, @extensions = path, extensions
-      @old_string, @new_string = old_string, new_string
+      @path = path
+      @extensions = extensions
+      @old_string = old_string
+      @new_string = new_string
     end
 
     def execute(handler)
@@ -31,14 +32,14 @@ module Recode
     def refactor_filename(file)
       target = apply_changes file
       payload = { source: file, target: target }
-      handler.rename **payload unless target == file
+      handler.rename(**payload) unless target == file
     end
 
     def refactor_content(file)
       before = File.read file
       after = apply_changes before
       payload = { file: file, before: before, after: after }
-      handler.edit **payload unless before == after
+      handler.edit(**payload) unless before == after
     end
 
     def apply_changes(string)

data/lib/recode/version.rb

@@ -1,3 +1,3 @@
 module Recode
-  VERSION = "0.1.1"
-end
+  VERSION = '0.1.3'
+end

data/lib/recode.rb

@@ -3,6 +3,7 @@ require 'colsole'
 require 'strings-inflection'
 require 'strings/inflection/extensions'
 
+require 'recode/refinements'
 require 'recode/exceptions'
 require 'recode/diffing'
 require 'recode/handler/base'

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: recode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: strings-inflection
   requirement: !ruby/object:Gem::Requirement
@@ -85,12 +91,14 @@ files:
 - lib/recode/handler/base.rb
 - lib/recode/handler/output.rb
 - lib/recode/handler/prompt.rb
+- lib/recode/refinements.rb
 - lib/recode/runner.rb
 - lib/recode/version.rb
 homepage: https://github.com/dannyben/recode
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Command line utility for refactoring code