regren 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a26b9baec5b659d3278b45d2acc2caecbc8bda43
-  data.tar.gz: 64cd2f64e3de3f2713af1e5775353611a9ce2ecf
+  metadata.gz: b37b7b976a4778f6d1bd4c6a4e400f596c7ddb0b
+  data.tar.gz: d3574cf7d20b64e468f0db47acf5033f228ec1cf
 SHA512:
-  metadata.gz: 18639dd14b1249adaa9cdb54c584f18e2afd1f2f722092211016626c9cf5e3b062cfc86f51d7e5c93467d43423c4c86eb6194fb4d239d2eb7fcf85d597bfee0d
-  data.tar.gz: 11be53f33fd9e4d99af1a2df2f9b036787a1c0a3a319466232718f02866d52dd683364901368a29c28766ae4b78655eede050faa7378cce8949abba60a4f39e2
+  metadata.gz: f6553b71b3311525b6699cc5b31f94cd231a43939346b386489962d6036fcc77f47deba2b4c118514f4cc76222454182af289b9186bfd8eadb566a0c7a18d82b
+  data.tar.gz: f723d1200a3be1e993aef3c7c8e75f8d0ade430352a987a1e72bd615d95c7d653221c905963abe9fc4abb275af9afbef86459b62decd1bf9967587612fbfecf4

data/bin/regren

@@ -1,94 +1,99 @@
-#!/bin/env ruby
-
-$:.unshift(File.expand_path('../../lib', __FILE__))
-
-require 'optparse'
-require 'folder_contents_history'
-require 'filename_history'
-
-def string_prompt(prompt = '>')
-  begin
-  print("#{prompt} ")
-  gets.chomp
-rescue Interrupt
-  exit 130
-end
-end
-
-def prompt?(text, options = {})
-  begin
-    default = options[:yes]
-    return default if options[:quiet]
-    opts = default ? "[Y/n]" : "[y/N]"
-    while true
-      print "#{text} #{opts} "
-      c = STDIN.gets.chomp!
-      if c.downcase == 'y' or (default and c =='')
-        return true
-      elsif c.downcase == 'n' or (not default and c =='')
-        return false
-      end
-    end
-  rescue Interrupt
-    exit 130
-  end
-end
-
-options = { mode: :rename }
-optparse = OptionParser.new do |opts|
-  opts.on('-b','--backup','Make backup') { options[:backup] = true }
-  opts.on('-B','--new-backup','Start backups anew, implies --backup') do
-    options[:new_backup] = true
-    options[:backup] = true
-  end
-  opts.on('-n','--dry-run','Simulate') { options[:dry_run] = true }
-  opts.on('-y','--yes','Assume yes as default') { options[:yes] = true }
-  opts.on('-q','--quiet','Do not print anything') { options[:quiet] = true }
-  opts.on('-r','--restore','Restore backup') { options[:mode] = :restore }
-  opts.on('-R','--reapply','Reapply history') { options[:mode] = :reapply }
-  opts.on('-f','--file FILE', "File for backup/restore") { |file| options[:history_file] = file }
-  opts.on('-H','--history', "Show history for file") { options[:mode] = :history }
-  opts.on('-h','--help', "Print help") do
-    puts opts
-    exit
-  end
-end
-optparse.parse!
-options[:history_file] ||= '.backup'
-
-if options[:mode] == :rename
-  if ARGV.length != 2
-    options[:regexp] = Regexp.compile(string_prompt)
-    options[:replacement] = string_prompt
-  else
-    options[:regexp] = Regexp.compile(ARGV[0])
-    options[:replacement] = ARGV[1]
-  end
-end
-
-if File.exists?(options[:history_file]) && !options[:new_backup]
-  history = FolderContentsHistory.new_from_history(options[:history_file])
-else
-  history = FolderContentsHistory.new
-end
-  
-history.load_entries
-
-case options[:mode]
-when :history
-  history.show_history(ARGV.empty? ? Dir["*"] : ARGV)
-when :restore
-  history.plan_rollbacks
-when :rename
-  history.plan_renames(options[:regexp], options[:replacement])
-  require 'pry'; binding.pry
-when :reapply
-  history.plan_reapplication('.')
-end
-history.log 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]
-    history.execute
-  end
-end
+#!/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+
+require 'optparse'
+require 'folder_contents_history'
+require 'filename_history'
+
+def string_prompt(prompt = '>')
+  begin
+    print("#{prompt} ")
+    gets.chomp
+  rescue Interrupt
+    exit 130
+  end
+end
+
+def prompt?(text, options = {})
+  begin
+    default = options[:yes]
+    return default if options[:quiet]
+    opts = default ? '[Y/n]' : '[y/N]'
+    loop do
+      print "#{text} #{opts} "
+      c = STDIN.gets.chomp!
+      if c.downcase == 'y' || (default && c == '')
+        return true
+      elsif c.downcase == 'n' || (!default && c == '')
+        return false
+      end
+    end
+  rescue Interrupt
+    exit 130
+  end
+end
+
+options = { mode: :rename }
+optparse = OptionParser.new do |opts|
+  opts.on('-b', '--backup', 'Make backup') { options[:backup] = true }
+  opts.on('-B', '--new-backup', 'Start backups anew, implies --backup') do
+    options[:new_backup] = true
+    options[:backup] = true
+  end
+  opts.on('-n', '--dry-run', 'Simulate') { options[:dry_run] = true }
+  opts.on('-y', '--yes', 'Assume yes as default') { options[:yes] = true }
+  opts.on('-q', '--quiet', 'Do not print anything') { options[:quiet] = true }
+  opts.on('-r', '--restore', 'Restore backup') { options[:mode] = :restore }
+  opts.on('-R', '--reapply', 'Reapply history') do
+    options[:mode] = :reapply
+  end
+  opts.on('-f', '--file FILE', 'File for backup/restore') do |file|
+    options[:history_file] = file
+  end
+  opts.on('-H', '--history', 'Show history for file') do
+    options[:mode] = :history
+  end
+  opts.on('-h', '--help', 'Print help') do
+    puts opts
+    exit
+  end
+end
+optparse.parse!
+options[:history_file] ||= '.backup'
+
+if options[:mode] == :rename
+  if ARGV.length != 2
+    options[:regexp] = Regexp.compile(string_prompt)
+    options[:replacement] = string_prompt
+  else
+    options[:regexp] = Regexp.compile(ARGV[0])
+    options[:replacement] = ARGV[1]
+  end
+end
+
+if File.exist?(options[:history_file]) && !options[:new_backup]
+  history = FolderContentsHistory.new_from_history(options[:history_file])
+else
+  history = FolderContentsHistory.new
+end
+
+history.load_entries
+
+case options[:mode]
+when :history
+  history.show_history(ARGV.empty? ? Dir['*'] : ARGV)
+when :restore
+  history.plan_rollbacks
+when :rename
+  history.plan_renames(options[:regexp], options[:replacement])
+when :reapply
+  history.plan_reapplication('.')
+end
+history.log 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]
+    history.execute
+  end
+end

data/lib/filename_history.rb

@@ -1,75 +1,68 @@
-class FileNameHistory
-  def initialize(name, history = [])
-    @history = history.empty? ? [name] : history
-    @current = name
-  end
-
-  def to_hash
-    {
-      @history.last => @history
-    }
-  end
-
-  def self.new_from_history(history)
-    return FileNameHistory.new(history.last,
-                               history)
-  end
-
-  def present?
-    File.exists?(@current)
-  end
-
-  def original
-    @history.first
-  end
-
-  def history
-    @history
-  end
-
-  def last_name
-    @history.last
-  end
-
-  def plan_rename(regexp, replacement)
-    new_name = @current.gsub(regexp, replacement)
-    @history << new_name if new_name != current
-  end
-
-  def plan_rollback
-    @history << original
-  end
-
-  def was_named?(name)
-    @history.include? name
-  end
-
-  def plan_reapplication(name)
-    @current = name
-  end
-
-  def changed?
-    @history.last != @current
-  end
-
-  def rename
-    File.rename("#{@current}", "#{@history.last}")
-    @current = @history.last
-  end
-
-  def print_history(where = $stdout)
-    where.puts(@current)
-    where.print "-> #{@history.join("\n-> ")}\n\n"
-  end
-
-  def log(where = $stdout)
-    return unless changed?
-    where.puts(@current)
-    where.puts("-> #{@history.last}")
-  end
-
-  def current
-    @current
-  end
-
-end
+class FileNameHistory
+  attr_reader :history, :current
+
+  def initialize(name, history = [])
+    @history = history.empty? ? [name] : history
+    @current = name
+  end
+
+  def to_hash
+    {
+      @history.last => @history
+    }
+  end
+
+  def self.new_from_history(history)
+    FileNameHistory.new(history.last,
+                        history)
+  end
+
+  def present?
+    File.exist?(@current)
+  end
+
+  def original
+    @history.first
+  end
+
+  def last_name
+    @history.last
+  end
+
+  def plan_rename(regexp, replacement)
+    new_name = @current.gsub(regexp, replacement)
+    @history << new_name if new_name != current
+  end
+
+  def plan_rollback
+    @history << original
+  end
+
+  def was_named?(name)
+    @history.include? name
+  end
+
+  def plan_reapplication(name)
+    @current = name
+  end
+
+  def changed?
+    @history.last != @current
+  end
+
+  def rename
+    File.rename("#{@current}", "#{@history.last}")
+    @current = @history.last
+  end
+
+  def print_history(where = $stdout)
+    where.puts(@current)
+    where.print "-> #{@history.join("\n-> ")}\n\n"
+  end
+
+  def log(where = $stdout)
+    return unless changed?
+    where.puts(@current)
+    where.puts("-> #{@history.last}")
+  end
+end

data/lib/folder_contents_history.rb

@@ -1,100 +1,106 @@
-class FolderContentsHistory
-
-  require 'json'
-
-  def initialize(entries = {})
-    @entries = entries
-  end
-
-  def load_entries(path = '.')
-    entries = Dir["#{path}/*"].inject({}) do |hash, item|
-      pathless = item.gsub(/#{path}\//,'')
-      hash.update(pathless => FileNameHistory.new(pathless))
-    end
-    @entries.merge!(entries) do |key, old_hash, new_hash|
-      old_hash.history.length > new_hash.history.length ? old_hash : new_hash
-    end
-  end
-
-  def plan_renames(regexp, replacement)
-    @entries.select { |key, value| key[regexp] }.each_pair do |key, value|
-      value.plan_rename(regexp, replacement)
-    end
-  end
-
-  def plan_rollbacks
-    @entries.each_value do |file_history|
-      file_history.plan_rollback
-    end
-  end
-
-  def plan_reapplication(path)
-    entries = Dir["#{path}/*"].map { |file| file.gsub(/#{path}\//,'') }
-    histories = @entries.values
-    @entries = entries.inject({}) do |hash, item|
-      hash.tap do |obj|
-        new_history = histories.select { |history| history.was_named? item }.first
-        obj.update(item => new_history.clone) unless new_history.nil?
-      end
-    end
-    @entries.select! { |name, history| history }
-    @entries.each { |name, history| history.plan_reapplication(name) }
-  end
-
-  def execute
-    changed.each_pair do |key, value|
-      value.rename
-      @entries[value.current] = @entries.delete(key)
-    end
-  end
-
-  def log
-    if conflicts?
-      puts <<-NOTE.gsub(/^.*\|/, '')
-      |==================================================
-      |!!! Some files would be lost by this operation !!!
-      |==================================================
-      NOTE
-    end
-    changed.each_value do |file_history|
-      file_history.log
-    end
-  end
-
-  def log_backup(where)
-    with_history = @entries.select { |name, history| history.history.length > 1 }
-    backup = with_history.inject({}) do |hash, item|
-      hash.update(item.last.to_hash)
-    end
-    File.write(where, JSON.pretty_generate(backup))
-  end
-
-  def to_hash(input_hash = @entries)
-    input_hash.inject({}) do |hash, entry|
-      hash.update(entry[0] => entry[1].to_hash)
-    end
-  end
-
-  def changed
-    @entries.select { |_key, value| value.changed? && value.present? }
-  end
-
-  def show_history(files)
-    files.each do |file|
-      @entries[file] = FileNameHistory.new(file) unless @entries[file]
-      @entries[file].print_history
-    end
-  end
-
-  def conflicts?
-    #changed.map { |entry| entry.last }.compact.uniq.length < changed.length
-    @entries.map { |entry| entry.last.last_name }.compact.uniq.length < @entries.length
-  end
-
-  def self.new_from_history(history_file)
-    entries = JSON.parse(File.read(history_file)).inject({}) do |hash, item|
-      hash.update(item.first => FileNameHistory.new_from_history(item.last))
-    end
-    FolderContentsHistory.new(entries)
-  end
-end
+class FolderContentsHistory
+  require 'json'
+
+  def initialize(entries = {})
+    @entries = entries
+  end
+
+  def load_entries(path = '.')
+    entries = Dir["#{path}/*"].reduce({}) do |hash, item|
+      pathless = item.gsub(/#{path}\//, '')
+      hash.update(pathless => FileNameHistory.new(pathless))
+    end
+    @entries.merge!(entries) do |_key, old_hash, new_hash|
+      old_hash.history.length > new_hash.history.length ? old_hash : new_hash
+    end
+  end
+
+  def plan_renames(regexp, replacement)
+    @entries.select { |key, _value| key[regexp] }.each_pair do |_key, value|
+      value.plan_rename(regexp, replacement)
+    end
+  end
+
+  def plan_rollbacks
+    @entries.each_value do |file_history|
+      file_history.plan_rollback
+    end
+  end
+
+  def plan_reapplication(path)
+    entries = Dir["#{path}/*"].map { |file| file.gsub(/#{path}\//, '') }
+    histories = @entries.values
+    @entries = merge_histories(histories, entries)
+    @entries.select! { |_name, history| history }
+    @entries.each { |name, history| history.plan_reapplication(name) }
+  end
+
+  def merge_histories(old, new)
+    new.reduce({}) do |hash, item|
+      hash.tap do |obj|
+        new_history = old.select { |history| history.was_named? item }.first
+        obj.update(item => new_history.clone) unless new_history.nil?
+      end
+    end
+  end
+
+  def execute
+    changed.each_pair do |key, value|
+      value.rename
+      @entries[value.current] = @entries.delete(key)
+    end
+  end
+
+  def log
+    if conflicts?
+      puts <<-NOTE.gsub(/^.*\|/, '')
+      |==================================================
+      |!!! Some files would be lost by this operation !!!
+      |==================================================
+      NOTE
+    end
+    changed.each_value do |file_history|
+      file_history.log
+    end
+  end
+
+  def log_backup(where)
+    with_history = @entries
+      .select { |_name, history| history.history.length > 1 }
+    backup = with_history.reduce({}) do |hash, item|
+      hash.update(item.last.to_hash)
+    end
+    File.write(where, JSON.pretty_generate(backup))
+  end
+
+  def to_hash(input_hash = @entries)
+    input_hash.reduce({}) do |hash, entry|
+      hash.update(entry[0] => entry[1].to_hash)
+    end
+  end
+
+  def changed
+    @entries.select { |_key, value| value.changed? && value.present? }
+  end
+
+  def show_history(files)
+    files.each do |file|
+      @entries[file] = FileNameHistory.new(file) unless @entries[file]
+      @entries[file].print_history
+    end
+  end
+
+  def conflicts?
+    # changed.map { |entry| entry.last }.compact.uniq.length < changed.length
+    @entries.map do |entry|
+      entry.last.last_name
+    end.compact.uniq.length < @entries.length
+  end
+
+  def self.new_from_history(history_file)
+    entries = JSON.parse(File.read(history_file)).reduce({}) do |hash, item|
+      hash.update(item.first => FileNameHistory.new_from_history(item.last))
+    end
+    FolderContentsHistory.new(entries)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regren
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Ruzicka
@@ -31,7 +31,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
   type: :development
@@ -41,7 +41,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
 description: A simple gem for batch renaming files
@@ -52,8 +52,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/regren
-- lib/filename_history.rb
 - lib/folder_contents_history.rb
+- lib/filename_history.rb
 - test/filename_history_test.rb
 - test/folder_contents_history_test.rb
 homepage: https://github.com/adamruzicka/regren
@@ -66,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: regren