rbname 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGY3MWE4ZTMxYWE2ZmE0OTVhMWMyOTFlOTI1OTMzNzQ0ZWFmNGM2MQ==
+  data.tar.gz: !binary |-
+    NDg5MDE3YzllNWJlNDY1MTk4YjkxYzU2ZjJkZDhlMTRmY2YyM2VkMw==
+SHA512:
+  metadata.gz: !binary |-
+    ODFiYzZjNGRjNWEyZWYxNDdiZWI3OWJjYmQ5MzRmY2I0MGE0ODdhYTRlYmEw
+    NjExOGJlYWZmMjNjN2E2NDI3NTYwZTM3YmQ2MjQ3ZTAyZTAyZDMyZGU1MDkw
+    MjM3MjJmNzE4NzdiNmQxNTAzNzYwOTk5ZTU3NzVmMzU3MzJlOTE=
+  data.tar.gz: !binary |-
+    NjlkNzEyYWJjNzg5MWRmMWVkYWM4MjlhNGRmOWM5ODM4M2FmMDJkOGExOTkw
+    M2Q0NTFjZjk1MjM1NTg3N2VmMjdiMmMzNzA1MDAzMTgxY2Q4ZmJmMzdjMjc5
+    M2M3M2UwMzY3MWRiYTdmMDIxZWU2NGY4NTgxZTMyMDNhODVmZmQ=

data/lib/change_prompt.rb

@@ -4,18 +4,19 @@ require 'file_line_presenter'
 class ChangePrompt
   LINES_OF_CONTEXT = 2
   USE_EDITOR = "E"
+  HORIZONTAL_LINE = "-" * 100
 
   attr_reader :user_input
 
   def self.prompt(pattern, file_line, replacements)
     present_line(file_line, pattern)
     puts("How would you like to update the above line? Options below.  Hit return to do nothing\n\n")
-    puts "------------------------------"
+    puts HORIZONTAL_LINE
     puts("#{USE_EDITOR}:  Edit in Vi")
     replacements.each_with_index do |replacement, index|
       puts "#{index}:  #{replacement.suggest(file_line.raw_contents)}"
     end
-    puts "------------------------------"
+    puts HORIZONTAL_LINE
     user_input = gets
     puts("")
     ChangePrompt.new(user_input)
@@ -39,11 +40,11 @@ class ChangePrompt
   private
 
   def self.present_line(file_line, pattern)
-    puts "-----------------------------------"
+    puts HORIZONTAL_LINE
     puts("FILENAME: #{file_line.path}")
-    puts "-----------------------------------"
+    puts HORIZONTAL_LINE
     puts(FileLinePresenter.present_contents(file_line, pattern, LINES_OF_CONTEXT))
-    puts "-----------------------------------"
+    puts HORIZONTAL_LINE
     puts "\n"
   end
 end

data/lib/main.rb

@@ -4,13 +4,8 @@ require 'replacement_collection'
 
 class Main
   def self.replace_all
-    puts "We will be replacing some text today."
-    puts "What is a pattern describing the text you want to replace?"
-    pattern = gets.chomp
-    puts ""
-    puts "What is root of your search? ('.' would probably work fine)"
-    root_path = gets.chomp
-    puts ""
+
+    pattern, root_path = prompt_search_details
 
     file_lines = FileLine.find_all(pattern, root_path)
     replacement_collection = ReplacementCollection.new
@@ -22,9 +17,9 @@ class Main
         user_input = ChangePrompt.prompt(pattern, file_line, applicable_replacements)
         if user_input.chose_editor?
           edit_with_vim!(file_line, pattern)
-          update_replacement_collection!(replacement_collection, old_contents, file_line)
+          record_manual_replacement!(replacement_collection, old_contents, file_line)
         elsif user_input.integer_input
-          update_according_to_sugestion(user_input.integer_input, applicable_replacements, file_line)
+          take_user_suggestion!(user_input.integer_input, applicable_replacements, file_line)
         end
       end
     end
@@ -32,12 +27,23 @@ class Main
 
   private
 
-  def self.update_replacement_collection!(replacement_collection, old_contents, file_line)
-        new_contents = file_line.raw_contents
-        replacement_collection << Replacement.generate(old_contents, new_contents) unless old_contents == new_contents
+  def self.prompt_search_details
+    puts "We will be replacing some text today."
+    puts "What is a pattern describing the text you want to replace?"
+    pattern = gets.chomp
+    puts ""
+    puts "What is root of your search? ('.' would probably work fine)"
+    root_path = gets.chomp
+    puts ""
+    [pattern, root_path]
+  end
+
+  def self.record_manual_replacement!(replacement_collection, old_contents, file_line)
+    new_contents = file_line.raw_contents
+    replacement_collection << Replacement.generate(old_contents, new_contents) unless old_contents == new_contents
   end
 
-  def self.update_according_to_sugestion(integer_input, applicable_replacements, file_line)
+  def self.take_user_suggestion!(integer_input, applicable_replacements, file_line)
     replacement = applicable_replacements[integer_input]
     new_contents = replacement.suggest(file_line.raw_contents)
     file_line.update_filesystem!(new_contents)

data/lib/replacement.rb

@@ -27,7 +27,7 @@ class Replacement
 
   def suggest(to_change)
     if to_change.match(to_replace)
-      to_change.gsub(to_replace, new_text)
+      to_change.sub(to_replace, new_text)
     end
   end
 

data/lib/replacement_collection.rb

@@ -1,7 +1,7 @@
 class ReplacementCollection < Array
   def applicable_replacements(line_contents)
     select do |replacement|
-      line_contents.match(replacement.to_replace)
+      line_contents.match(Regexp.escape(replacement.to_replace))
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbname
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Wai Lee Chin Feman
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -60,26 +55,25 @@ files:
 homepage: http://github.com/skatenerd
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI Find/Replace
 test_files: []