dit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb1874c62ec31afe27cb0af065d6a80e0353128
-  data.tar.gz: 920fcc3e92fe1a3bae5f2f10657df2f7d524fe07
+  metadata.gz: 06fd6b92b3c391f88bca25aa648a6878f687f628
+  data.tar.gz: f673fc052775a29a66c83e5901bb60b3861c5995
 SHA512:
-  metadata.gz: 7036f768b02c42805287c8813b0a55809ae20dbcc81216de386babd72b80b2cb2c4b6f89bbf0dc71cb33505fdb48bb7e033f5156d4b9367e8cdd1420948461d4
-  data.tar.gz: 709f19cc118efcd93357bacbf7bca2b6908092f2b749924d14a53e78df89a9467714fa84499853d16752f47c2d17d955daa5bebf5d7e6ded755d8d742e73b9a5
+  metadata.gz: 30c40ac1342985a2008b4e0f573b43f82226160142188036482d79fab5abc77bdddae06c57dd57f16c4376b621a0b0d4f98c2d16ac9d38ca0bdb9b1498c47b14
+  data.tar.gz: d159ee212b017368be94f3dd84b14ad907f6ffda3b0c24f8142e4d8c4a3a1165da4fa405c53cc0cb0f873caf90eb7924c43d4b4597f934f1bd8298d4d241c97a

data/lib/dit.rb

@@ -5,82 +5,43 @@ require 'json'
 require 'fileutils'
 
 class Dit
+  # 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
+  # calls its methods directly.
   def self.init
     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."
+      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
     end
 
-    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."
+    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.'
       response = STDIN.gets.chomp.upcase
-      return unless (response === 'Y')
+      return unless (response == 'Y')
       symlink_all
     else
       Git.init(Dir.getwd)
-      puts "Initialized empty Git repository in #{File.join(Dir.getwd, ".git")}"
+      puts "Initialized empty Git repository in #{File.join(Dir.getwd, '.git')}"
     end
     hook
-    puts "Dit was successfully hooked into .git/hooks."
+    puts 'Dit was successfully hooked into .git/hooks.'
   end
 
   def self.hook
-    Dir.chdir(File.join(".git", "hooks")) do
+    Dir.chdir(File.join('.git', 'hooks')) do
       # 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
+      append_to_post_commit, cannot_post_commit = hook 'post-commit'
+      append_to_post_merge, cannot_post_merge = hook 'post-merge'
 
-      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
+      add_hook('post-commit', append_to_post_commit) unless cannot_post_commit
+      add_hook('post-merge', append_to_post_merge) unless cannot_post_merge
 
-      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
-      # from rbenv or rvm or chruby, so we make a script forcing the hook
-      # to use our ruby
-      ruby_path = `which ruby`
-      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"
-        end
-      else
-        File.open("force-ruby", "a") do |f|
-          f.write "#!/usr/bin/env bash\n"
-          f.write "exec ruby \"$@\"\n"
-        end
-      end
+      make_dit
+      make_ruby_enforcer
 
       # Make sure they're executable
       FileUtils.chmod '+x', %w(post-commit post-merge dit force-ruby)
@@ -105,70 +66,92 @@ class Dit
     symlink_list `git ls-tree -r #{current_branch} --name-only`.split("\n")
   end
 
-  private
-
   def self.repo
     Git.open(Dir.getwd)
   end
 
   def self.symlink(a, b)
-    begin
-      File.symlink(a, b)
-    rescue
-      puts "Failed to symlink #{a} to #{b}"
-    end
+    File.symlink(a, b)
+  rescue
+    puts "Failed to symlink #{a} to #{b}"
   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
-      elsif `cat post-commit`.include?("./.git/hooks/dit")
-        puts "Dit hook already installed."
-        cannot_post_commit = true
+  def self.detect_existing_hook(hook)
+    hook_exists = File.exist?(hook)
+
+    cannot_hook, append_to_hook = false
+
+    if hook_exists
+      if `cat #{hook}`.include?('./.git/hooks/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 " +
+          'append ourselves to the file.'
+        append_to_hook = true
       else
-        puts "You have post-commit 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_post_commit = true
+        cannot_hook = true
       end
     end
 
-    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
-      elsif `cat post-commit`.include?("./.git/hooks/dit")
-        puts "Dit hook already installed."
-        cannot_post_commit = 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
+    [append_to_hook, cannot_hook]
+  end
+
+  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"
     end
+  end
 
-    [append_to_post_commit, append_to_post_merge,
-     cannot_post_commit, cannot_post_merge]
+  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"
+    end
   end
 
+  def self.make_ruby_enforcer
+    # 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
+    # from rbenv or rvm or chruby, so we make a script forcing the hook
+    # to use our ruby
+    ruby_path = `which ruby`
+    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"
+      end
+    else
+      File.open('force-ruby', 'a') do |f|
+        f.write "#!/usr/bin/env bash\n"
+        f.write "exec ruby \"$@\"\n"
+      end
+    end
+  end
 end
 
 class DitCMD < Thor
-  desc "init", "Initialize the current directory as a dit directory."
+  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."
+  desc 'rehash', "Manually symlink everything in case a git hook didn't run."
   def rehash
     Dit.symlink_all
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kyle Fahringer
@@ -93,4 +93,3 @@ signing_key:
 specification_version: 4
 summary: Dit is a dotfiles manager that thinks it's git.
 test_files: []
-has_rdoc: