dit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06fd6b92b3c391f88bca25aa648a6878f687f628
-  data.tar.gz: f673fc052775a29a66c83e5901bb60b3861c5995
+  metadata.gz: b3c4c89fb99119f2cfd0a0d85295b43d502f3221
+  data.tar.gz: 129081c7feed5a0c291afd6c3a1c2b61343441fe
 SHA512:
-  metadata.gz: 30c40ac1342985a2008b4e0f573b43f82226160142188036482d79fab5abc77bdddae06c57dd57f16c4376b621a0b0d4f98c2d16ac9d38ca0bdb9b1498c47b14
-  data.tar.gz: d159ee212b017368be94f3dd84b14ad907f6ffda3b0c24f8142e4d8c4a3a1165da4fa405c53cc0cb0f873caf90eb7924c43d4b4597f934f1bd8298d4d241c97a
+  metadata.gz: d1cd1d7ee772cf636c6e90f1e69f1f6e4d304f4f0ba8f96ba8ed345a5570bd7960e6abb8ce91008e8c9fc83634fc04fb1782d85b3221d0e167d51889a727b5db
+  data.tar.gz: 334f0e4709b9e9a97f43932d6d1d3259311d125e2e59be1750da8cd3fff53faaf96cc1d85bbcf90f2aaef1a5aee2c9ba16229abd09a08b20dde6ba77a034b9d8

data/lib/dit.rb

@@ -4,41 +4,52 @@ require 'os'
 require 'json'
 require 'fileutils'
 
+# 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.
+# This is because the hooks are not running through the Thor object, but also
+# referencing these methods.
 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.'
-      return
-    end
+    exit_if_windows
 
     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')
-      symlink_all
+      symlink_all if prompt_for_symlink_all
     else
       Git.init(Dir.getwd)
       puts "Initialized empty Git repository in #{File.join(Dir.getwd, '.git')}"
     end
+
     hook
+
     puts 'Dit was successfully hooked into .git/hooks.'
   end
 
+  def self.exit_if_windows
+    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.'
+      exit 1
+    end
+  end
+
+  def self.prompt_for_symlink_all
+    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
+    response == 'Y'
+  end
+
   def self.hook
     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, cannot_post_commit = hook 'post-commit'
-      append_to_post_merge, cannot_post_merge = hook 'post-merge'
+      append_to_post_commit, cannot_post_commit = detect_hook 'post-commit'
+      append_to_post_merge, cannot_post_merge = detect_hook 'post-merge'
 
-      add_hook('post-commit', append_to_post_commit) unless cannot_post_commit
-      add_hook('post-merge', append_to_post_merge) unless cannot_post_merge
+      write_hook('post-commit', append_to_post_commit) unless cannot_post_commit
+      write_hook('post-merge', append_to_post_merge) unless cannot_post_merge
 
       make_dit
       make_ruby_enforcer
@@ -76,24 +87,22 @@ class Dit
     puts "Failed to symlink #{a} to #{b}"
   end
 
-  def self.detect_existing_hook(hook)
-    hook_exists = File.exist?(hook)
+  def self.detect_hook(hook)
+    return [false, false] unless 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 #{hook} hooks that use some foreign language, " +
-          "so we won't interfere, but we can't hook in there."
-        cannot_hook = true
-      end
+    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 #{hook} hooks that use some foreign language, " +
+        "so we won't interfere, but we can't hook in there."
+      cannot_hook = true
     end
 
     [append_to_hook, cannot_hook]
@@ -143,6 +152,10 @@ class Dit
       end
     end
   end
+
+  def self.version
+    '0.2.3'
+  end
 end
 
 class DitCMD < Thor
@@ -155,4 +168,9 @@ class DitCMD < Thor
   def rehash
     Dit.symlink_all
   end
+
+  desc 'version', 'Print the dit version.'
+  def version
+    puts "Dit #{Dit.version} on ruby #{RUBY_VERSION}"
+  end
 end

metadata

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