irep 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c63f5fea943cedefdde0959f35b308e3779e124
-  data.tar.gz: ffaa7b26938f4aea6107b1a9b44be17fb62b9b21
+SHA256:
+  metadata.gz: 99ca2f7b8ade7f67206c47740c76be56a28f630dff2c85ca256f77742479f099
+  data.tar.gz: a7c9a50bc0a1d50ddc15107d9d33bfe819d331bea51777a5f43e5a58a8a87e37
 SHA512:
-  metadata.gz: 764d0c1932a8eadceffb5bdeff0d5459784c1a35f3095ce9cffda1546423bf42bfbd3d523620371933f188b93ffa5c3dd4d4bcb14ab53fe39001eee956e208ee
-  data.tar.gz: 0c0835d41a0624e3bb8bc1f626dc7d6628817121512fd90e7410973c544f80458aea05a852ac60c42b39fc0217b13b2797877d6a25767942d642770037118781
+  metadata.gz: 4259d16d22489a3612974158b0d3d25dbd4951db594f701950c125cd0426c9c12a58082cc8bec1c2320acc633c639f0de79465a790f5900216f11c28a4f56153
+  data.tar.gz: 9ac2ba1196844636be08bbe1977542ce69457655f10fd43b06822ca0f40024f14ea1f361157897dcd832a51bed749fa370ec2d37eaea59a4aa9888df34c2adad

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/bin/irep

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'irep'
+
+Irep::CLI.execute(STDOUT, ARGV)

data/irep.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |spec|
   spec.name          = "irep"
   spec.version       = Irep::VERSION
   spec.authors       = ["motoki-shun"]
-  spec.email         = ["shuuuuuny@gmail.com"]
 
   spec.summary       = 'A code searching and interactive replacing tool on CLI.'
   spec.homepage      = 'https://github.com/shuuuuun/irep'
@@ -27,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'test-unit'
-  spec.add_development_dependency 'test-unit-rr'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'test-unit', '~> 3.3'
+  spec.add_development_dependency 'test-unit-rr', '~> 1.0'
   spec.add_development_dependency 'pry'
 
   spec.add_dependency 'rainbow'

data/lib/irep/cli.rb

@@ -7,7 +7,9 @@ require 'irep/interface'
 module Irep
   class CLI
     def self.execute(stdout, argv = [])
+      # TODO: 引数が３つのときは最後をpathとして処理したい
       opts, args = parse_options argv
+
       # TODO: implement log level
       # Interface.debug "argv: #{argv}"
       # Interface.debug "opts: #{opts}"
@@ -28,7 +30,7 @@ module Irep
         search.show_results
         exit
       end
-      Replace.replace_by_search_results_interactively search.results, search_text, replace_text
+      Replace.replace_interactively search.results, search_text, replace_text
     end
 
     private

data/lib/irep/interface.rb

@@ -2,10 +2,13 @@ require 'rainbow'
 
 module Irep
   class Interface
+    attr_reader :apply_all_flag
+
     def initialize(cases: [], message:)
       @cases = cases
       @message = message
       @quit = false
+      @apply_all_flag = false
     end
 
     def listen(opts = {})
@@ -34,6 +37,11 @@ module Irep
       @quit = true
     end
 
+    def apply_all
+      @apply_all_flag = true
+      @quit = true
+    end
+
     def self.get_input
       STDIN.gets.chomp
     end

data/lib/irep/replace.rb

@@ -4,33 +4,30 @@ module Irep
   module Replace
     extend self
 
-    def replace_by_search_results(search_results, search_text, replace_text)
-      # TODO: replace_by_search_results
-    end
+    # TODO: replace_immediately
+    # def replace_immediately(search_results, search_text, replace_text)
+    # end
 
-    def replace_by_search_results_interactively(search_results, search_text, replace_text)
+    def replace_interactively(search_results, search_text, replace_text)
       search_results.each do |result|
         next unless result[:preview]
         result[:result_preview] = result[:preview].gsub(search_text, replace_text)
       end
       listened_results = listen_if_replace(search_results)
-      replace_in_file_by_results listened_results.select { |r| r[:type] == 'in_file' }, search_text, replace_text
-      listened_results.select { |r| r[:type] == 'filename' || r[:type] == 'directory' }.each do |result|
+      replace_in_file listened_results.select { |r| r[:type] == Search::MatchType::IN_FILE }, search_text, replace_text
+      listened_results.select { |r| r[:type] == Search::MatchType::FILENAME || r[:type] == Search::MatchType::DIRECTORY }.each do |result|
         next unless result[:should_replace]
         rename_path result[:path], search_text, replace_text
       end
     end
 
-    def rename_path(path, before, after)
-      File.rename path, path.gsub(before, after)
-    end
-
-    def replace_in_file(file_path, before, after='')
-      txt = File.read(file_path).gsub(before, after)
-      File.write(file_path, txt)
-    end
+    # TODO: replace_in_file 消してもいいかも
+    # def replace_in_file(file_path, before, after='')
+    #   txt = File.read(file_path).gsub(before, after)
+    #   File.write(file_path, txt)
+    # end
 
-    def replace_in_file_by_results(search_results, search_text, replace_text)
+    def replace_in_file(search_results, search_text, replace_text)
       grouped_results = search_results.group_by { |r| r[:path] }
       grouped_results.each do |path, results|
         file_text = File.read(path)
@@ -52,6 +49,10 @@ module Irep
 
     private
 
+    def rename_path(path, before, after)
+      File.rename path, path.gsub(before, after)
+    end
+
     def listen_if_replace(results)
       interface = Interface.new(message: 'Replace', cases: [{
         cmd: 'y',
@@ -72,7 +73,7 @@ module Irep
         cmd: 'a',
         help: 'all, Apply all replacement after this.',
         func: proc {
-          # TODO
+          interface.apply_all
         }
       # }, {
       #   cmd: 'h',
@@ -94,6 +95,7 @@ module Irep
           result_preview: result[:result_preview],
           proc_args: [result]
         )
+        result[:should_replace] = true if interface.apply_all_flag
       end
       results
     end

data/lib/irep/search.rb

@@ -2,6 +2,13 @@ require 'irep/interface'
 
 module Irep
   class Search
+    module MatchType
+      DIRECTORY = 0
+      FILENAME = 1
+      IN_FILE = 2
+    end
+
+    # TODO: make Result class.
     attr_reader :results
 
     def initialize(opts = {})
@@ -17,7 +24,7 @@ module Irep
       end
       current_results = match_dir_list.map do |path|
         {
-          type: 'directory',
+          type: MatchType::DIRECTORY,
           path: path,
           preview: path,
         }
@@ -31,7 +38,7 @@ module Irep
       end
       current_results = match_file_list.map do |path|
         {
-          type: 'filename',
+          type: MatchType::FILENAME,
           path: path,
           preview: path,
         }
@@ -58,7 +65,7 @@ module Irep
         line_num = match_line_num(file_text, match_data)
         {
           match_data: match_data,
-          type: 'in_file', # in_file, directory, filename
+          type: MatchType::IN_FILE,
           path: file_path, # 'path/to/file_or_directory'
           offset: match_data.begin(0), # x 全体の何文字目か
           line: line_num, # y, row 行数

data/lib/irep/version.rb

@@ -1,3 +1,3 @@
 module Irep
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irep
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - motoki-shun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email:
-- shuuuuuny@gmail.com
+email: 
 executables:
 - irep
 extensions: []
@@ -104,10 +103,12 @@ extra_rdoc_files: []
 files:
 - ".commit_template"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
+- bin/irep
 - bin/setup
 - bin/show_rainbow_colors
 - exe/irep
@@ -138,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A code searching and interactive replacing tool on CLI.