overcommit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f41c5306262e275c34566f2d7973a7993c3ef5
-  data.tar.gz: d89300cc765a7e790c94241265dcaecb6a8f2882
+  metadata.gz: e133359ae61ef154b91a8194178ee5a89af7c5da
+  data.tar.gz: 6c9f6191fea07ac695999e4ea0a7ff48b1858010
 SHA512:
-  metadata.gz: b51462c1ea6bac7cde51b99e91d6b67cd77e521cb9d78dfd909b5d743ab6d1aa7582e6c393c8bc1f148d869017c1b9041057bbcac3343833c8fd81635c03a238
-  data.tar.gz: abee8bd8ee6e00ad8d06bccad9c3d0a3d0d2a5b616decd98c63dd501cf141305e6a62cb8f88199b6640057368ee169f4062a482d4e08e3ad506de215ba61585a
+  metadata.gz: 426352f6c848e421e356761aff3d729c264f1dea63b6e411061eaed03f698eae30cad5fc9716765386dd32324c756ecf9d460cfa3030ad110d217e566f98ab4d
+  data.tar.gz: 099133f6f3f22074fea07a299ba94e73bef8e5a8cf2052656b10df81833d22f770282bc2e9931bb02ad5b92725348f3cd38fbfee711fc1e3e7143b41c105f94f

data/config/templates.yml

@@ -1,12 +1,12 @@
 ---
 default:
   excludes:
-    pre_commit:
-      - causes_email
-      - test_history
-      - restricted_paths
     commit_msg:
       - change_id
       - release_note
+    pre_commit:
+      - causes_email
+      - restricted_paths
+      - test_history
 all:
   excludes:

data/lib/overcommit/cli.rb

@@ -40,6 +40,10 @@ module Overcommit
           @options[:template] = template
         end
 
+        opts.on('--uninstall', 'Remove overcommit from target') do
+          @options[:uninstall] = true
+        end
+
         opts.on('-e', '--exclude hook_name,...', Array,
                 'Exclude hooks from installation') do |excludes|
           # Transform from:
@@ -76,22 +80,20 @@ module Overcommit
 
     def run
       if @options[:targets].nil? || @options[:targets].empty?
-        warning 'You must supply at least one directory to install into'
+        warning 'You must supply at least one directory'
         puts @parser.help
         exit 2
       end
 
-      installer = Installer.new(@options)
-
       @options[:targets].each do |target|
         begin
-          installer.install(target)
+          Installer.new(@options, target).run
         rescue NotAGitRepoError => e
           warning "Skipping #{target}: #{e}"
         end
       end
 
-      success 'Installation complete'
+      success "#{@options[:uninstall] ? 'Removal' : 'Installation'} complete"
 
     rescue ArgumentError => ex
       error "Installation failed: #{ex}"
@@ -101,7 +103,7 @@ module Overcommit
   private
 
     def print_help(message, ex = nil)
-      error ex, '' if ex
+      error ex.to_s + "\n" if ex
       puts message
       exit 0
     end

data/lib/overcommit/installer.rb

@@ -3,44 +3,79 @@ require 'yaml'
 
 module Overcommit
   class Installer
-    def initialize(options = {})
+    def initialize(options, target)
       @options = options
+      @target  = target
     end
 
-    def install(target)
-      absolute_target = File.expand_path(target)
+    def run
+      validate_target
+      @options[:uninstall] ? uninstall : install
+    end
+
+    def install
+      puts "Installing hooks into #{@target}"
+
+      install_scripts
+      install_hooks
+      write_configuration
+    end
+
+    def uninstall
+      puts "Removing hooks from #{@target}"
+
+      uninstall_scripts
+      uninstall_hooks
+      rm_configuration
+    end
+
+  private
+
+    def hook_path
+      absolute_target = File.expand_path @target
+      File.join(absolute_target, '.git/hooks')
+    end
+
+    def validate_target
+      absolute_target = File.expand_path @target
       unless File.directory? absolute_target
-        raise NotAGitRepoError, 'is a directory'
+        raise NotAGitRepoError, 'is not a directory'
       end
 
       unless File.directory?(File.join(absolute_target, '.git'))
         raise NotAGitRepoError, 'does not appear to be a git repository'
       end
-
-      puts "Installing hooks into #{target}"
-      hook_path = File.join(absolute_target, '.git/hooks')
-
-      install_scripts(hook_path)
-      install_hooks(hook_path)
-      write_configuration(hook_path)
     end
 
-  private
-
     # Make helper scripts available locally inside the repo
-    def install_scripts(target)
-      FileUtils.cp_r Utils.absolute_path('bin/scripts'), target
+    def install_scripts
+      FileUtils.cp_r Utils.absolute_path('bin/scripts'), hook_path
     end
 
     # Install all available git hooks into the repo
-    def install_hooks(target)
-      Dir[Utils.absolute_path('bin/hooks/*')].each do |hook|
-        FileUtils.cp hook, File.join(target, File.basename(hook))
+    def install_hooks
+      hooks.each do |hook|
+        FileUtils.cp hook, File.join(hook_path, File.basename(hook))
+      end
+    end
+
+    def uninstall_hooks
+      hooks.each do |hook|
+        delete File.join(hook_path, File.basename(hook))
       end
     end
 
+    def uninstall_scripts
+      scripts = File.join(hook_path, 'scripts')
+      FileUtils.rm_r scripts rescue false
+    end
+
+    def hooks
+      Dir[Utils.absolute_path('bin/hooks/*')]
+    end
+
     # Dump a YAML document containing requested configuration
-    def write_configuration(target)
+    def write_configuration
       template = @options.fetch(:template, 'default')
       base_config = Overcommit.config.templates[template]
       if base_config.nil?
@@ -54,9 +89,21 @@ module Overcommit
         a + b
       end
 
-      File.open(File.join(target, 'overcommit.yml'), 'w') do |config|
+      File.open(configuration_location, 'w') do |config|
         YAML.dump(base_config, config)
       end
     end
+
+    def rm_configuration
+      delete configuration_location
+    end
+
+    def configuration_location
+      File.join(hook_path, 'overcommit.yml')
+    end
+
+    def delete(file)
+      File.delete file rescue false
+    end
   end
 end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec