dit 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c3229cc364f6d858c3ff061c564eb1009fa661
-  data.tar.gz: d60799dfbfe44a94c0d478b8e58b09d7e653df00
+  metadata.gz: 9eb1874c62ec31afe27cb0af065d6a80e0353128
+  data.tar.gz: 920fcc3e92fe1a3bae5f2f10657df2f7d524fe07
 SHA512:
-  metadata.gz: 755aae9e97a7139012a64e04f5efe9a44922af945f4ef322a56a94b0da3a21c39864a97333f315e221f72b515489e82f3b70b888cccd0aa87077df0ba913f65f
-  data.tar.gz: b0bc69bde3916ff81847a53830a8e340c722c67cd8cf7c5c78250c4001419552587a46989a0816c9bfceb49006e5ec228007019e0c94bc08ed5ba160c270dd1f
+  metadata.gz: 7036f768b02c42805287c8813b0a55809ae20dbcc81216de386babd72b80b2cb2c4b6f89bbf0dc71cb33505fdb48bb7e033f5156d4b9367e8cdd1420948461d4
+  data.tar.gz: 709f19cc118efcd93357bacbf7bca2b6908092f2b749924d14a53e78df89a9467714fa84499853d16752f47c2d17d955daa5bebf5d7e6ded755d8d742e73b9a5

data/lib/dit.rb

@@ -16,7 +16,8 @@ class Dit
       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'
+      response = STDIN.gets.chomp.upcase
+      return unless (response === 'Y')
       symlink_all
     else
       Git.init(Dir.getwd)
@@ -80,6 +81,7 @@ class Dit
           f.write "exec ruby \"$@\"\n"
         end
       end
+
       # Make sure they're executable
       FileUtils.chmod '+x', %w(post-commit post-merge dit force-ruby)
     end
@@ -87,6 +89,7 @@ class Dit
 
   def self.symlink_list(list)
     list.each do |f|
+      f.strip!
       wd_f = File.absolute_path f
       home_f = File.absolute_path(f).gsub(Dir.getwd, Dir.home)
       symlink wd_f, home_f
@@ -98,7 +101,7 @@ class Dit
   end
 
   def self.symlink_all
-    current_branch = `git rev-parse --abbrev-ref HEAD`
+    current_branch = `git rev-parse --abbrev-ref HEAD`.chomp
     symlink_list `git ls-tree -r #{current_branch} --name-only`.split("\n")
   end
 
@@ -128,6 +131,9 @@ class Dit
         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
       else
         puts "You have post-commit hooks that use some foreign language, " +
           "so we won't interfere, but we can't hook in there."
@@ -140,6 +146,9 @@ class Dit
         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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dit
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Kyle Fahringer