effuse 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.3.0 (23 January 2012)
+
+ * Added `--noconfirm` option
+
+ * Fix: Ruby 1.8 compatibility
+
 ## 0.2.0 (22 January 2012)
 
  * Added `--include` option

data/README.md

@@ -40,6 +40,8 @@ Usage: effuse [OPTION...] [DEST]
     -e, --exclude GLOB               Exclude GLOB from symlinking
     -i, --include GLOB               Include GLOB in symlinking
 
+    -y, --noconfirm CHOICE           Assume CHOICE on file conflicts
+
     -v, --verbose                    Show verbose output
     -h, --help                       Show this message
 ```

data/bin/effuse

@@ -4,7 +4,7 @@ require 'optparse'
 require 'ostruct'
 require 'fileutils'
 
-options = OpenStruct.new(:verbose => false, :exclude => ['.git', '.gitignore', '.gitmodules', '*~', '.*.swp'], :clean => false)
+options = OpenStruct.new(:verbose => false, :exclude => ['.git', '.gitignore', '.gitmodules', '*~', '.*.swp'], :clean => false, :noconfirm => nil)
 
 OptionParser.new do |o|
   o.banner = 'Usage: effuse [OPTION...] [DEST]'
@@ -25,6 +25,12 @@ OptionParser.new do |o|
 
   o.separator ''
 
+  o.on('-y', '--noconfirm CHOICE', 'Assume CHOICE on file conflicts') do |choice|
+    options.noconfirm = choice.downcase[0].chr # Shakes fist at Ruby 1.8 (.chr)
+  end
+
+  o.separator ''
+
   o.on('-v', '--verbose', 'Show verbose output') do
     options.verbose = true
   end
@@ -80,30 +86,35 @@ else
         puts "already symlinked #{dest}" if options.verbose
         next
       else
-        puts "File already exists: #{dest}"
-        puts "  [R] Backup and replace"
-        puts "  [i] Import original file and symlink"
-        puts "  [k] Keep original file"
-
-        skip = false
-        loop do
-          case gets.chomp.downcase[0] || 'r'
-          when 'r'
-            puts "renaming #{dest} -> #{dest + '~'}" if options.verbose
-            File.rename(dest, dest + '~')
-            break
-          when 'i'
-            puts "renaming #{src} -> #{src + '~'}" if options.verbose
-            File.rename(src, src + '~')
-            puts "renaming #{dest} -> #{src}" if options.verbose
-            File.rename(dest, src)
-            break
-          when 'k'
-            skip = true
-            break
+        if options.noconfirm
+          input = options.noconfirm
+          puts "assuming '#{input}' for #{dest}" if options.verbose
+        else
+          puts "File already exists: #{dest}"
+          puts " [R] Backup and replace"
+          puts " [i] Import original file and symlink"
+          puts " [k] Keep original file"
+
+          loop do
+            input = gets.chomp.downcase[0].chr || 'r' # Shakes fist at Ruby 1.8 (.chr)
+            break if 'rik'.include?(input)
+            puts "Error: '#{input}' is not an option"
           end
         end
-        next if skip
+
+        case input
+        when 'r'
+          puts "renaming #{dest} -> #{dest + '~'}" if options.verbose
+          File.rename(dest, dest + '~')
+        when 'i'
+          puts "renaming #{src} -> #{src + '~'}" if options.verbose
+          File.rename(src, src + '~')
+          puts "renaming #{dest} -> #{src}" if options.verbose
+          File.rename(dest, src)
+        when 'k'
+          puts "skipping #{dest}" if options.verbose
+          next
+        end
       end
     end
 

data/effuse.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'effuse'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.authors = ['Curtis McEnroe']
   s.email = ['programble@gmail.com']
   s.homepage = 'https://github.com/programble/effuse'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effuse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A tool for managing symlinks
 email: