dit 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c6480d2fc0399121019b398353cea7868f8005
-  data.tar.gz: f541e05d5e8c8f49d94e41a672579eb2c7ce4764
+  metadata.gz: 40c3229cc364f6d858c3ff061c564eb1009fa661
+  data.tar.gz: d60799dfbfe44a94c0d478b8e58b09d7e653df00
 SHA512:
-  metadata.gz: 389cada647157c1d25eb241c29c24c5bdb4192ad44a50cb7046402fc7420d884413652e1afb5916d781b05b05b85b4493dbc894089fceccf1f5443f8e5b16744
-  data.tar.gz: 78329737e0e2933c4af3e2f9675e540c9bd17075d320458fa1842dd291702d016b10e194ddc7ae534e4834cd726e9e2ff634f602c65b1713e7eb1502fee675fd
+  metadata.gz: 755aae9e97a7139012a64e04f5efe9a44922af945f4ef322a56a94b0da3a21c39864a97333f315e221f72b515489e82f3b70b888cccd0aa87077df0ba913f65f
+  data.tar.gz: b0bc69bde3916ff81847a53830a8e340c722c67cd8cf7c5c78250c4001419552587a46989a0816c9bfceb49006e5ec228007019e0c94bc08ed5ba160c270dd1f

data/lib/dit.rb

@@ -6,59 +6,53 @@ require 'fileutils'
 
 class Dit
   def self.init
-    if(Dir.exist?(".dit"))
-      puts "This is already a dit repo, so all we have to do is symlink to home."
-      symlink_all
-      hook
+    if OS.windows?
+      puts "This is a windows system, and dit does not support windows."
+      puts "See vulpino/dit issue #1 if you have a potential solution."
       return
-    elsif(Dir.exist?(".git"))
-      repo = Git.open(Dir.getwd)
-    else
-      repo = Git.init(Dir.getwd)
-      puts "Initialized empty Git repository in #{File.join(Dir.getwd, ".git")}"
     end
 
-    # Make a .dit dir and a settings hash to be exported to a file in dit dir
-    Dir.mkdir(".dit")
-    settings = {}
-    
-    # create a .gitignore to ignore the os_dotfiles dir
-    File.open(".gitignore", "a") do |f|
-      f.write ".dit/os_dotfiles/"
-      f.write "\n"
-      f.write ".dit/local_settings.json"
-    end
-
-    # Write our changes to a JSON file in the dit dir
-    File.open(File.join(".dit", "settings.json"), "a") do |f|
-      f.write settings.to_json if settings
+    if Dir.exist?(".git")
+      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."
+      return unless gets.chomp! === 'y'
+      symlink_all
+    else
+      Git.init(Dir.getwd)
+      puts "Initialized empty Git repository in #{File.join(Dir.getwd, ".git")}"
     end
-
-    repo.add(".dit/settings.json")
-    repo.add(".gitignore")
-    repo.commit("Dit inital commit")
-
-    clone_os_dotfiles
     hook
-
-    puts "Initialized empty Dit repository in #{File.join(Dir.getwd, ".dit")})"
+    puts "Dit was successfully hooked into .git/hooks."
   end
 
   def self.hook
-    return unless Dir.exist?(".dit")
     Dir.chdir(File.join(".git", "hooks")) do
-      p Dir.getwd
-      FileUtils.rm_rf Dir.glob("*")
-      File.open(("post-commit"), "a") do |f|
-        f.write "#!/usr/bin/env ./.git/hooks/force-ruby\n"
-        f.write "require 'dit'\n"
-        f.write "Dit.symlink_unlinked\n"
+      # The following check for the existence of post-commit or post-merge hooks
+      # and will not interfere with them if they exist and do not use bash.
+      append_to_post_commit, append_to_post_merge, cannot_post_commit, 
+        cannot_post_merge = detect_existing_hooks
+
+      unless cannot_post_commit
+        File.open("post-commit", "a") do |f|
+          f.write "#!/usr/bin/env bash\n" unless append_to_post_commit
+          f.write "( exec ./.git/hooks/dit )\n"
+        end
       end
-      File.open(("post-merge"), "a") do |f|
+
+      unless cannot_post_merge
+        File.open("post-merge", "a") do |f|
+          f.write "#!/usr/bin/env bash\n" unless append_to_post_merge
+          f.write "( exec ./.git/hooks/dit )\n"
+        end
+      end
+
+      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"
       end
+        
       # The following lines are because git hooks do this weird thing
       # where they prepend /usr/bin to the path and a bunch of other stuff
       # meaning git hooks will use /usr/bin/ruby instead of any ruby
@@ -67,11 +61,11 @@ class Dit
       ruby_path = `which ruby`
       if(ruby_path != "/usr/bin/ruby")
         ruby_folder = File.dirname(ruby_path)
-        File.open(("force-ruby"), "a") do |f|
+        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
+            # 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"
@@ -80,89 +74,83 @@ class Dit
           end
           f.write "exec ruby \"$@\"\n"
         end
+      else
+        File.open("force-ruby", "a") do |f|
+          f.write "#!/usr/bin/env bash\n"
+          f.write "exec ruby \"$@\"\n"
+        end
       end
-        
-      FileUtils.chmod '+x', %w(post-commit post-merge force-ruby)
+      # Make sure they're executable
+      FileUtils.chmod '+x', %w(post-commit post-merge dit force-ruby)
     end
   end
 
-  def self.clone_os_dotfiles
-    # OS Specific Dotfiles Eventually TM
-    file_url = "file:///" + File.absolute_path(Dir.getwd)
-    Dir.chdir(".dit") do
-      os_dotfiles = Git.clone(file_url, "os_dotfiles")
-      os_dotfiles.branch("master").checkout
+  def self.symlink_list(list)
+    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
   end
 
+  def self.symlink_unlinked
+    symlink_list `git show --pretty="format:" --name-only HEAD`.split("\n")
+  end
+
   def self.symlink_all
-    Dir.chdir(File.join(repo_name, ".dit", "os_dotfiles")) do
-      Find.find('.') do |d|
-        if File.directory?(d)
-          Dir.mkdir(File.join(Dir.home, d.split['os_dotfiles'][1]))
-          Dir.entries(d).each do |f|
-            next if (f === '.' || f === '..')
-            abs_f = File.absolute_path(f)
-            rel_f = File.join(Dir.home, abs_f.split("os_dotfiles")[1])
-            File.symlink(abs_f, rel_f) unless File.exists?(rel_f)
-          end
-        end
-      end
-    end
+    current_branch = `git rev-parse --abbrev-ref HEAD`
+    symlink_list `git ls-tree -r #{current_branch} --name-only`.split("\n")
   end
 
-  def self.symlink_unlinked
-    settings = nil
+  private
+
+  def self.repo
+    Git.open(Dir.getwd)
+  end
+
+  def self.symlink(a, b)
     begin
-      settings = JSON.parse File.open(
-                  File.join(Dir.getwd, ".dit", "local_settings.json"), "r").read.close
+      File.symlink(a, b)
     rescue
-      settings = {
-        symlinked: []
-      }
+      puts "Failed to symlink #{a} to #{b}"
     end
+  end
 
-    Dir.chdir(".dit") do
-      Dir.chdir("os_dotfiles") do
-        Git.open(Dir.getwd).pull
-        os_changed_files = `git show --pretty="format:" --name-only HEAD`
-        os_changed_files.split('\n').each do |file|
-          file.strip! # strip newlines
-          next if os_list.include?(file.split('.').pop())
-          next if settings[:symlinked].include?(file) 
-          next if file.include?(".dit")
-          File.symlink(
-            File.absolute_path(file),
-            File.absolute_path(File.join(Dir.home, file)))
-          settings[:symlinked] << file
-        end
+  def self.detect_existing_hooks
+    post_commit_hook_exists = File.exist?("post-commit")
+    post_merge_hook_exists = File.exist?("post-merge")
+
+    cannot_post_commit, append_to_post_commit = false
+    cannot_post_merge, append_to_post_merge = false
+    
+    if post_commit_hook_exists
+      if `cat post-commit`.include?("#!/usr/bin/env bash")
+        puts "You have post-commit hooks already that use bash, so we'll " +
+          "append ourselves to the file."
+        append_to_post_commit = true
+      else
+        puts "You have post-commit hooks that use some foreign language, " +
+          "so we won't interfere, but we can't hook in there."
+        cannot_post_commit = true
       end
     end
 
-    File.open(File.join(Dir.getwd, ".dit", "local_settings.json"), "w+") do |f|
-      f.truncate 0
-      f.write settings.to_json
+    if post_merge_hook_exists
+      if `cat post-merge`.include?("#!/usr/bin/env bash")
+        puts "You have post-merge hooks already that use bash, so we'll " +
+          "append ourselve to the file."
+        append_to_post_merge = true
+      else
+        puts "You have post-merge hooks that use some not-bash language, " +
+          "so we won't interfere, but we can't hook in there."
+        cannot_post_merge = true
+      end
     end
-  end
 
-  private
-
-  def self.repo
-    Git.open(Dir.getwd)
+    [append_to_post_commit, append_to_post_merge,
+     cannot_post_commit, cannot_post_merge]
   end
 
-  def self.os_list
-    [
-      'windows',
-      'osx',
-      'arch',
-      'fedora',
-      'debian',
-      'ubuntu',
-      'slack',
-      'bsd'
-    ]
-  end
 end
 
 class DitCMD < Thor
@@ -170,4 +158,9 @@ class DitCMD < Thor
   def init
     Dit.init
   end
+
+  desc "rehash", "Manually symlink everything in case a git hook didn't run."
+  def rehash
+    Dit.symlink_all
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Kyle Fahringer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor