effuse 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af763c78ab8f6214154acfccb9ac9ae84597af4
-  data.tar.gz: a1688e2e82a8cccad953594be015bf5717a3097e
+  metadata.gz: 1d68dcfbe45037643f26e40c799f57b68aa930d1
+  data.tar.gz: 6867ba6d3a880dbf9a2a92068a0e7178c2b1e4fe
 SHA512:
-  metadata.gz: 0aa2d3fd247e8e99bfe7b878415936545bcf9ebeec5d03a457745ddc071f9ff197e818c5f4a0989933080547f7c493ce0570e0599c8e01d399aa2369d7b7fbe1
-  data.tar.gz: 224a780aac1d07a85f92a4171d7a58a93a1ce0bb58571eca22c5d165679a49e6389b196f38810858a7f6b7a8f259d0322702ca4e5dd8a0ec358de19d8b78e705
+  metadata.gz: 4c6f1c2f9f94c3c7c95ff82668d9ec50e8d8c01c3c3547535306ed870f31ff56f42a81038335b980fb5acae42951172397dd62e842e3d282f7ee16866f4aac95
+  data.tar.gz: 7cfc78918e423fa35938dd5136d4382c8d2bf162ab26e145c26e1ff7bae097b6f7b6026e50311861cf7af401e4587e9b9d95e7f47e66c4bc8d9f9fdc77030a69

data/ChangeLog.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.0.0 (May 13 2013)
+
+ * Replace existing files by default
+ * Added `--import` option to import existing files
+ * Changed `--noconfirm` to `--no-confirm`
+ * Backup files to `.file.effuse`
+ * Removed short forms of `--exclude` and `--include` options
+
 ## 1.1.1 (March 12 2013)
 
  * Dropped Ruby 1.8 compatibility

data/README.md

@@ -26,26 +26,30 @@ symlinks to all your configurations in your home directory!
 Your configurations don't go in your home directory? No problem! Just run
 `effuse /path/` and the symlinks will be created wherever your heart desires.
 
+Would you rather import a dotfile from your system into your repository
+than replace it? No problem, just use `effuse --import`.
+
 Symlinks aren't working out for you? Effuse has got you covered. Just run
 `effuse --clean` in your dotfiles repository and it will remove all those nasty
 symlinks it created before.
 
-Don't want to symlink a certain bothersome file? Why not tell Effuse your
-opinion on the matter using `effuse -e file`? Or why not give it a stern
-talking to using a `.effuseignore` file? Just put one file glob to exclude per
-line in there and never worry again.
+Don't want to symlink a certain bothersome file? Why not tell Effuse
+your opinion on the matter using `effuse --exclude file`? Or why not
+give it a stern talking to using a `.effuseignore` file? Just put one
+file glob to exclude per line in there and never worry again.
 
 ```
-Usage: effuse [OPTION...] [DEST]
+Usage: effuse [OPTIONS] [DEST]
+    -i, --import                     Import existing files
     -c, --clean                      Remove symlinks
 
-    -e, --exclude GLOB               Exclude GLOB from symlinking
-    -i, --include GLOB               Include GLOB in symlinking
+        --exclude GLOB               Exclude GLOB from symlinking
+        --include GLOB               Include GLOB in symlinking
 
-    -y, --noconfirm CHOICE           Assume CHOICE on file conflicts
+    -y, --no-confirm                 Do not ask before replacing files
     -n, --no-backup                  Do not create backup files
 
-    -p --prefix PREFIX               Prefix relative paths with PREFIX
+    -p, --prefix PREFIX              Prefix symlinked paths with PREFIX
 
     -v, --verbose                    Show verbose output
     -h, --help                       Show this message
@@ -53,7 +57,7 @@ Usage: effuse [OPTION...] [DEST]
 
 ## License
 
-Copyright (c) 2011, Curtis McEnroe <programble@gmail.com>
+Copyright (c) 2012-2013, Curtis McEnroe <programble@gmail.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/bin/effuse

@@ -1,155 +1,160 @@
 #!/usr/bin/env ruby
 
+require 'fileutils'
 require 'optparse'
 require 'ostruct'
-require 'fileutils'
-
-options = OpenStruct.new(:verbose   => false,
-                         :clean     => false,
-                         :noconfirm => nil,
-                         :backup    => true,
-                         :prefix    => '',
-                         :exclude   => %w[.effuseignore .git .gitignore .gitmodules *~ .*~ .*.swp])
 
-if File.exist?('.effuseignore')
-  File.open('.effuseignore').each_line do |line|
-    options.exclude << line.chomp
+opts = OpenStruct.new(dest_dir: Dir.home,
+                      import:   false,
+                      clean:    false,
+                      confirm:  true,
+                      backup:   true,
+                      prefix:   '',
+                      verbose:  false,
+                      exclude:  %w[.effuseignore .git .gitignore .gitmodules
+                                   *~ .*~ .*.swp])
+
+if File.file?('.effuseignore')
+  File.open('.effuseignore').each_line do |glob|
+    opts.exclude << glob.chomp
   end
 end
 
 OptionParser.new do |o|
-  o.banner = 'Usage: effuse [OPTION...] [DEST]'
+  o.banner = 'Usage: effuse [OPTIONS] [DEST]'
 
-  o.on('-c', '--clean', 'Remove symlinks') do
-    options.clean = true
-  end
+  o.on('-i', '--import', 'Import existing files') { opts.import = true }
+  o.on('-c', '--clean', 'Remove symlinks') { opts.clean = true }
 
   o.separator ''
 
-  o.on('-e', '--exclude GLOB', 'Exclude GLOB from symlinking') do |glob|
-    options.exclude << glob
+  o.on('--exclude GLOB', 'Exclude GLOB from symlinking') do |glob|
+    opts.exclude << glob
   end
-
-  o.on('-i', '--include GLOB', 'Include GLOB in symlinking') do |glob|
-    options.exclude.delete(glob)
+  o.on('--include GLOB', 'Include GLOB in symlinking') do |glob|
+    opts.exclude.delete(glob)
   end
 
   o.separator ''
 
-  o.on('-y', '--noconfirm CHOICE', 'Assume CHOICE on file conflicts') do |choice|
-    options.noconfirm = choice.downcase[0]
+  o.on('-y', '--no-confirm', 'Do not ask before replacing files') do
+    opts.confirm = false
   end
-
   o.on('-n', '--no-backup', 'Do not create backup files') do
-    options.backup = false
+    opts.backup = false
   end
 
   o.separator ''
 
-  o.on('-p', '--prefix PREFIX', 'Prefix relative paths with PREFIX') do |prefix|
-    options.prefix = prefix
+  o.on('-p', '--prefix PREFIX', 'Prefix symlinked paths with PREFIX') do |prefix|
+    opts.prefix = prefix
   end
 
   o.separator ''
 
-  o.on('-v', '--verbose', 'Show verbose output') do
-    options.verbose = true
-  end
-
-  o.on_tail("-h", "--help", "Show this message") do
+  o.on('-v', '--verbose', 'Show verbose output') { opts.verbose = true }
+  o.on_tail('-h', '--help', 'Show this message') do
     puts o
     exit
   end
 end.parse!
 
-dest_dir = ARGV[0] || Dir.home
+opts.dest_dir = ARGV[0] if ARGV[0]
 
-if File.identical?(dest_dir, '.')
+if File.identical?(opts.dest_dir, '.')
   puts 'error: destination directory is current directory'
   exit 1
 end
 
-files = {}
+$opts = opts # Don't hate me
+
+def vputs(s)
+  puts s if $opts.verbose
+end
+
+def confirm?(s)
+  return true unless $opts.confirm
+  loop do
+    print "#{s} [Y/n] "
+    input = $stdin.gets.chomp
+    return true if input.empty? || input[0].downcase == ?y
+    return false if input[0].downcase == ?n
+  end
+end
+
+def backup(src)
+  if $opts.backup
+    dest = File.join(File.dirname(src), ".#{File.basename(src)}.effuse")
+    vputs "renaming '#{src}' -> '#{dest}'"
+    File.rename(src, dest)
+  else
+    vputs "deleting '#{src}'"
+    File.delete(src)
+  end
+end
+
 dirs = ['.']
+files = {}
 
 dirs.each do |dir|
-  puts "scanning #{dir}" if options.verbose
+  vputs "scanning '#{dir}'"
   Dir.foreach(dir) do |file|
     next if ['.', '..'].include?(file)
 
-    if options.exclude.any? {|e| File.fnmatch(e, file)}
-      puts "excluding #{File.join(dir, file)}" if options.verbose
+    if opts.exclude.any? {|glob| File.fnmatch(glob, file) }
+      vputs "excluding '#{File.join(dir, file)}'"
       next
     end
 
     file = File.join(dir, file)
 
     if File.directory?(file)
+      vputs "adding '#{file}'"
       dirs << file
-      puts "adding #{file}" if options.verbose
       next
     end
 
-    puts "found #{file}" if options.verbose
-    relpath = file.split('/')[1..-1]
-    dest = File.join([dest_dir, options.prefix + relpath[0]] + relpath[1..-1])
-    files[File.absolute_path(file)] = dest
+    vputs "found '#{file}'"
+    relpath = opts.prefix + File.join(file.split('/').drop(1))
+    files[File.absolute_path(file)] = File.join(opts.dest_dir, relpath)
   end
 end
 
-if options.clean
+if opts.clean
   files.each_pair do |src, dest|
     if File.exist?(dest) && File.identical?(src, dest)
       puts dest
       File.delete(dest)
     else
-      puts "not symlinked #{dest}" if options.verbose
+      vputs "not symlinked '#{dest}'"
     end
   end
 else
   files.each_pair do |src, dest|
     if File.exist?(dest)
       if File.identical?(src, dest)
-        puts "already symlinked #{dest}" if options.verbose
+        vputs "already symlinked '#{dest}'"
         next
-      else
-        if options.noconfirm
-          input = options.noconfirm
-          puts "assuming '#{input}' for #{dest}" if options.verbose
+      elsif opts.import
+        if confirm?("'#{dest}' already exists. Import it?")
+          backup(src)
+          vputs "renaming '#{dest}' -> '#{src}'"
+          File.rename(dest, src)
         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] || 'r'
-            break if 'rik'.include?(input)
-            puts "Error: '#{input}' is not an option"
-          end
+          vputs "skipping '#{dest}'"
+          next
         end
-
-        case input
-        when 'r'
-          if options.backup
-            puts "renaming #{dest} -> #{dest + '~'}" if options.verbose
-            File.rename(dest, dest + '~')
-          end
-        when 'i'
-          if options.backup
-            puts "renaming #{src} -> #{src + '~'}" if options.verbose
-            File.rename(src, src + '~')
-          end
-          puts "renaming #{dest} -> #{src}" if options.verbose
-          File.rename(dest, src)
-        when 'k'
-          puts "skipping #{dest}" if options.verbose
+      else # Replace destination file
+        if confirm?("'#{dest}' already exists. Replace it?")
+          backup(dest)
+        else
+          vputs "skipping '#{dest}'"
           next
         end
       end
     end
 
-    puts "#{dest} -> #{src}"
+    puts "'#{dest}' -> '#{src}'"
     FileUtils.mkdir_p(File.dirname(dest))
     File.symlink(src, dest)
   end

data/effuse.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effuse
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Curtis McEnroe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A tool for managing symlinks
 email: