dit 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842ec58e97f7f0b07c8d2d246fccf573f4414675
-  data.tar.gz: 9d8810fca2dee2624ba6f0c30c245cb199a7a32b
+  metadata.gz: 0edc19b873a4cf7c2ae46ab6e96eb0dbc8c08a24
+  data.tar.gz: 9520d2931559df0dc4b1455a7ea5cdedbfab2b02
 SHA512:
-  metadata.gz: 5aba260ee163c1120040d36fe400994645eaa2decca5e399f4b9d6f085175257bb99a0203314ff2ed2897dd8aa9b76550b097de438e7098ee9462e752ce1700d
-  data.tar.gz: 939a7a10e38c2fae3e510be92ab8c9ee07862fd000a926c760368c67f45f55d8b3792f543dc396534a9b0968d4cf30776269e0087f2964271802c08214317c32
+  metadata.gz: 6c5638af480f07cf7218ae2d76f040d43eaa7e4f04dfa64e5026093987cd44421d26c440f5e6892e5a680898b6d091e5e125e374ada3af3617d42e2a33543464
+  data.tar.gz: b30b5f71ceaa05926160959ab829cfd1ac9086829fd7031d01e260cda6253195a82e672242bebb1c9d8e9aa4ea2194de1b668161d21f7b7ffd0e7c2cd8fc1de2

data/bin/dit

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'dit/cmd'
+require 'dit'
 DitCMD.start(ARGV)

data/lib/dit.rb

@@ -34,7 +34,7 @@ class Dit
   end
 
   def self.prompt_for_symlink_all
-    puts 'Dit has detected an existing git repo, and will initialize it to ' +
+    puts 'Dit has detected an existing git repo, and will initialize it to ' \
       'populate your ~ directory with symlinks.'
     puts 'Please confirm this by typing y, or anything else to cancel.'
     response = STDIN.gets.chomp.upcase
@@ -60,19 +60,25 @@ class Dit
   end
 
   def self.symlink_list(list)
+    list = get_roots list
+    list.each do |f|
+      wd_f = File.expand_path f
+      home_f = File.expand_path(f).gsub(Dir.getwd, Dir.home)
+      symlink wd_f, home_f
+    end
+  end
+
+  def self.get_roots(list)
     root_list = Set[]
     list.each do |f|
       f.strip!
       root = f.split('/')[0]
       root ||= f
-      root_list = root_list | Set[root]
+      root_list |= Set[root]
     end
     root_list.delete?('')
-    root_list.each do |f|
-      wd_f = File.absolute_path f
-      home_f = File.absolute_path(f).gsub(Dir.getwd, Dir.home)
-      symlink wd_f, home_f
-    end
+    %w(.gitignore README.md README).each { |i| root_list.delete(i) }
+    root_list 
   end
 
   def self.symlink_unlinked
@@ -86,16 +92,34 @@ class Dit
 
   def self.symlink(a, b)
     if File.exist?(b)
-      return if (File.symlink?(b) && File.readlink(b).include(Dir.getwd))
-      puts "#{b} conflicts with #{a}. Remove #{b}? [yN]"
-      response = STDIN.gets.upcase
-      return unless response == 'Y'
+      return if File.symlink?(b) && File.readlink(b).include?(Dir.getwd)
+      return unless prompt_for_overwrite a, b
     end
     File.symlink(a, b)
   rescue
     puts "Failed to symlink #{a} to #{b}"
   end
 
+  def self.prompt_for_overwrite(a, b)
+    return false if @never
+    (FileUtils.rm(b); return true) if @always # just this once;
+    puts "#{b} conflicts with #{a}. Remove #{b}? [y/n/a/s]"
+    puts "To always overwrite, type \"A\". To never overwrite, type \"S\""
+    response = STDIN.gets.upcase
+    case response
+    when 'Y'
+      FileUtils.rm(b)
+      return true
+    when 'A'
+      @always = true
+      FileUtils.rm(b)
+      return true
+    when 'S'
+      @never = true
+    end
+    false
+  end
+
   def self.detect_hook(hook)
     return [false, false] unless File.exist?(hook)
 
@@ -105,11 +129,11 @@ class Dit
       puts 'Dit hook already installed.'
       cannot_hook = true
     elsif `cat #{hook}`.include?('#!/usr/bin/env bash')
-      puts "You have #{hook} hooks already that use bash, so we'll " +
+      puts "You have #{hook} hooks already that use bash, so we'll " \
         'append ourselves to the file.'
       append_to_hook = true
     else
-      puts "You have #{hook} hooks that use some foreign language, " +
+      puts "You have #{hook} hooks that use some foreign language, " \
         "so we won't interfere, but we can't hook in there."
       cannot_hook = true
     end
@@ -119,16 +143,16 @@ class Dit
 
   def self.write_hook(hook_file, do_append)
     File.open(hook_file, 'a') do |f|
-      f.write "#!/usr/bin/env bash\n" unless do_append
-      f.write "( exec ./.git/hooks/dit )\n"
+      f.puts '#!/usr/bin/env bash' unless do_append
+      f.puts '( exec ./.git/hooks/dit )'
     end
   end
 
   def self.make_dit
     File.open('dit', 'a') do |f|
-      f.write "#!/usr/bin/env ./.git/hooks/force-ruby\n"
-      f.write "require 'dit'\n"
-      f.write "Dit.symlink_unlinked\n"
+      f.puts '#!/usr/bin/env ./.git/hooks/force-ruby'
+      f.puts "require 'dit'"
+      f.puts 'Dit.symlink_unlinked'
     end
   end
 
@@ -142,22 +166,15 @@ class Dit
     if ruby_path != '/usr/bin/ruby'
       ruby_folder = File.dirname(ruby_path)
       File.open('force-ruby', 'a') do |f|
-        f.write "#!/usr/bin/env bash\n"
-        f.write "set -e\n"
-        if ENV['RBENV_ROOT']
-          # Use Rbenv's shims instead of directly going to ruby bin
-          # By the way, if anyone has particular PATHs I should use for
-          # RVM or chruby, please let me know!
-          f.write "PATH=#{File.join(ENV['RBENV_ROOT'], 'shims')}:$PATH\n"
-        else
-          f.write "PATH=#{ruby_folder}:$PATH\n"
-        end
-        f.write "exec ruby \"$@\"\n"
+        f.puts '#!/usr/bin/env bash'
+        f.puts 'set -e'
+        f.puts 'PATH=#{ruby_folder}:$PATH'
+        f.puts "exec ruby \"$@\""
       end
     else
       File.open('force-ruby', 'a') do |f|
-        f.write "#!/usr/bin/env bash\n"
-        f.write "exec ruby \"$@\"\n"
+        f.puts '#!/usr/bin/env bash'
+        f.puts "exec ruby \"$@\""
       end
     end
   end
@@ -176,10 +193,12 @@ class Dit
   end
 
   def self.version
-    '0.3'
+    '0.4'
   end
 end
 
+# This is the thor class the CLI calls.
+# It's a thin layer on top of the Dit class. See above.
 class DitCMD < Thor
   desc 'init', 'Initialize the current directory as a dit directory.'
   def init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dit
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Kyle Fahringer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,7 +68,6 @@ extra_rdoc_files: []
 files:
 - bin/dit
 - lib/dit.rb
-- lib/dit/cmd.rb
 homepage: http://github.com/vulpino/dit
 licenses:
 - MIT

data/lib/dit/cmd.rb

@@ -1,23 +0,0 @@
-require 'dit'
-
-class DitCMD < Thor
-  desc 'init', 'Initialize the current directory as a dit directory.'
-  def init
-    Dit.init
-  end
-
-  desc 'rehash', "Manually symlink everything in case a git hook didn't run."
-  def rehash
-    Dit.symlink_all
-  end
-
-  desc 'version', 'Print the dit version.'
-  def version
-    puts "Dit #{Dit.version} on ruby #{RUBY_VERSION}"
-  end
-
-  desc 'clean', 'Clean dead symlinks from your home dir.'
-  def clean
-    Dit.clean_home
-  end
-end