dit 0.2.3 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c4c89fb99119f2cfd0a0d85295b43d502f3221
-  data.tar.gz: 129081c7feed5a0c291afd6c3a1c2b61343441fe
+  metadata.gz: 842ec58e97f7f0b07c8d2d246fccf573f4414675
+  data.tar.gz: 9d8810fca2dee2624ba6f0c30c245cb199a7a32b
 SHA512:
-  metadata.gz: d1cd1d7ee772cf636c6e90f1e69f1f6e4d304f4f0ba8f96ba8ed345a5570bd7960e6abb8ce91008e8c9fc83634fc04fb1782d85b3221d0e167d51889a727b5db
-  data.tar.gz: 334f0e4709b9e9a97f43932d6d1d3259311d125e2e59be1750da8cd3fff53faaf96cc1d85bbcf90f2aaef1a5aee2c9ba16229abd09a08b20dde6ba77a034b9d8
+  metadata.gz: 5aba260ee163c1120040d36fe400994645eaa2decca5e399f4b9d6f085175257bb99a0203314ff2ed2897dd8aa9b76550b097de438e7098ee9462e752ce1700d
+  data.tar.gz: 939a7a10e38c2fae3e510be92ab8c9ee07862fd000a926c760368c67f45f55d8b3792f543dc396534a9b0968d4cf30776269e0087f2964271802c08214317c32

data/bin/dit

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

data/lib/dit/cmd.rb

@@ -0,0 +1,23 @@
+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

data/lib/dit.rb

@@ -1,8 +1,8 @@
 require 'thor'
 require 'git'
 require 'os'
-require 'json'
 require 'fileutils'
+require 'set'
 
 # This is the class where all the dit work is done.
 # The thor class is basically a very thin layer on top of this that just
@@ -60,8 +60,15 @@ class Dit
   end
 
   def self.symlink_list(list)
+    root_list = Set[]
     list.each do |f|
       f.strip!
+      root = f.split('/')[0]
+      root ||= f
+      root_list = 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
@@ -77,11 +84,13 @@ class Dit
     symlink_list `git ls-tree -r #{current_branch} --name-only`.split("\n")
   end
 
-  def self.repo
-    Git.open(Dir.getwd)
-  end
-
   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'
+    end
     File.symlink(a, b)
   rescue
     puts "Failed to symlink #{a} to #{b}"
@@ -153,8 +162,21 @@ class Dit
     end
   end
 
+  def self.clean_home
+    Dir.chdir(Dir.home) do
+      existing_dotfiles = Dir.glob('.*')
+      existing_dotfiles.each do |f|
+        next if f == '.' || f == '..'
+        if File.symlink?(f)
+          f_abs = File.readlink(f)
+          File.delete(f) unless File.exist?(f_abs)
+        end
+      end
+    end
+  end
+
   def self.version
-    '0.2.3'
+    '0.3'
   end
 end
 
@@ -173,4 +195,9 @@ class DitCMD < Thor
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: '0.3'
 platform: ruby
 authors:
 - Kyle Fahringer
@@ -68,6 +68,7 @@ extra_rdoc_files: []
 files:
 - bin/dit
 - lib/dit.rb
+- lib/dit/cmd.rb
 homepage: http://github.com/vulpino/dit
 licenses:
 - MIT
@@ -93,3 +94,4 @@ signing_key:
 specification_version: 4
 summary: Dit is a dotfiles manager that thinks it's git.
 test_files: []
+has_rdoc: