regren 0.0.4 → 0.0.5

data/bin/regren

@@ -5,10 +5,11 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'optparse'
 require 'folder_contents_history'
 require 'filename_history'
+require 'colorize'
 
 def string_prompt(prompt = '>')
   begin
-    print("#{prompt} ")
+    print("#{prompt} ".colorize(:color => :green))
     gets.chomp
   rescue Interrupt
     exit 130
@@ -90,7 +91,7 @@ when :rename
 when :reapply
   history.plan_reapplication('.')
 end
-history.log unless options[:quiet]
+history.log(options[:regexp], options[:replacement]) unless options[:quiet]
 unless options[:dry_run] || options[:mode] == :history
   if !history.changed.empty? && prompt?('Execute the rename?', options)
     history.log_backup(options[:history_file]) if options[:backup]

data/lib/filename_history.rb

@@ -31,7 +31,11 @@ class FileNameHistory
 
   def plan_rename(regexp, replacement)
     new_name = @current.gsub(regexp, replacement)
-    @history << new_name if new_name != current
+    if new_name != current
+      @current_color = @current.gsub(regexp, '\0'.colorize(:color => :green))
+      @last_color = @current.gsub(regexp, replacement.colorize(:color => :cyan))
+      @history << new_name
+    end
   end
 
   def plan_rollback
@@ -60,9 +64,17 @@ class FileNameHistory
     where.print "-> #{@history.join("\n-> ")}\n\n"
   end
 
+  def last_color
+    @last_color || last_name
+  end
+
+  def current_color
+    @current_color || @current
+  end
+
   def log(where = $stdout)
     return unless changed?
-    where.puts(@current)
-    where.puts("-> #{@history.last}")
+    where.puts(current_color)
+    where.puts("-> #{last_color}")
   end
 end

data/lib/folder_contents_history.rb

@@ -1,5 +1,5 @@
 class FolderContentsHistory
-  require 'json'
+  require 'multi_json'
 
   def initialize(entries = {})
     @entries = entries
@@ -51,9 +51,9 @@ class FolderContentsHistory
     end
   end
 
-  def log
+  def log(regexp = '', replacement = '')
     if conflicts?
-      puts <<-NOTE.gsub(/^.*\|/, '')
+      puts <<-NOTE.gsub(/^.*\|/, '').colorize(:color => :red)
       |==================================================
       |!!! Some files would be lost by this operation !!!
       |==================================================
@@ -70,7 +70,7 @@ class FolderContentsHistory
     backup = with_history.reduce({}) do |hash, item|
       hash.update(item.last.to_hash)
     end
-    File.write(where, JSON.pretty_generate(backup))
+    File.write(where, MultiJson.dump(backup, :pretty => true))
   end
 
   def to_hash(input_hash = @entries)
@@ -98,7 +98,7 @@ class FolderContentsHistory
   end
 
   def self.new_from_history(history_file)
-    entries = JSON.parse(File.read(history_file)).reduce({}) do |hash, item|
+    entries = MultiJson.load(File.read(history_file)).reduce({}) do |hash, item|
       hash.update(item.first => FileNameHistory.new_from_history(item.last))
     end
     FolderContentsHistory.new(entries)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: regren
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
+  prerelease: 
 platform: ruby
 authors:
 - Adam Ruzicka
@@ -11,37 +12,41 @@ cert_chain: []
 date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
 description: A simple gem for batch renaming files
@@ -52,32 +57,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/regren
-- lib/folder_contents_history.rb
 - lib/filename_history.rb
+- lib/folder_contents_history.rb
 - test/filename_history_test.rb
 - test/folder_contents_history_test.rb
 homepage: https://github.com/adamruzicka/regren
 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: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: regren
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: b37b7b976a4778f6d1bd4c6a4e400f596c7ddb0b
-  data.tar.gz: d3574cf7d20b64e468f0db47acf5033f228ec1cf
-SHA512:
-  metadata.gz: f6553b71b3311525b6699cc5b31f94cd231a43939346b386489962d6036fcc77f47deba2b4c118514f4cc76222454182af289b9186bfd8eadb566a0c7a18d82b
-  data.tar.gz: f723d1200a3be1e993aef3c7c8e75f8d0ade430352a987a1e72bd615d95c7d653221c905963abe9fc4abb275af9afbef86459b62decd1bf9967587612fbfecf4