git-catch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acfe4df3b3c7627d8693978e4504b1127ffeb8bf
-  data.tar.gz: 8d2cab43d97f941b44071fe3dd8bdf013321832b
+  metadata.gz: b09222b9f58a5dc0c78e9acc48b498a176f1944d
+  data.tar.gz: 840f13b5ff3c45a1db4d4b63812a589320528c30
 SHA512:
-  metadata.gz: 8f6732cf83f70c5d929e77de6061c5a93e1be6f3a2ff5892b7db3cd6d86ab1d9a4ef9c56b4f0b5f0bf524144c347bea9f181df9ab138025c7e2eeb31026f21c4
-  data.tar.gz: 4865fba333a36ce0bf48791387a15d36d822c664f5861841c32ce4b3fa02a214f7823871a684b1d8372fc269106d14b1dda31a1a663922bbcb1e728c17df0b00
+  metadata.gz: 8e44c2651e935ef444a1b097264a14a3667ea4dee4361843bd8fa9e8dbd979d6f31e276558f55c46b5ab1fb102da32b2594700d0151d19866be4c9ea0c504e33
+  data.tar.gz: 6590c2eedbe4a97fa9f4a131b548b9c2b07d38ab278f6e2504ad7bc0110edefed71766b1b7771783709e5ab16aa6a511c1f52b04ee1068a1fedfb7dfd1869511

data/.git-catch.yaml

@@ -1,4 +1,7 @@
 ---
-pre-commit:
-  - test/pre-commit-1
-  - test/pre-commit-2
+dir: utils/git/hooks
+
+hooks:
+  pre-commit:
+    - test/pre-commit-1
+    - test/pre-commit-2

data/bin/git-catch

@@ -8,10 +8,27 @@ module Git
   module Catch
     class Cli < Thor
 
+      def initialize(args = [], local_options = {}, config = {})
+        super(args)
+        @runner = Runner.new
+      end
+
       desc "init", "Hooks up the git hooks"
       def init
-        puts "==> Init"
-        Runner.new.init()
+        puts "==> Initializing git hooks"
+        @runner.init()
+      end
+
+      desc "ls", "Lists all git hooks"
+      def ls
+        puts "==> Listing all git hooks"
+        @runner.list().each do |hook, files|
+          puts "#{hook}:"
+          files.each do |f|
+            puts "- #{f}"
+          end
+          puts
+        end
       end
 
     end

data/lib/git/catch.rb

@@ -1,15 +1,19 @@
 require "yaml"
+require "logger"
 require "fileutils"
 
-require "git/catch/version"
-
-
 module Git
   module Catch
     class Runner
 
-      def init
-        hooks = [
+      def initialize
+        @logger = Logger.new(STDOUT)
+        @logger.formatter = proc do |type, time, name, message|
+          "[#{time}]  #{type.ljust(5)}  #{message}\n"
+        end
+        @config = YAML.load_file("./.git-catch.yaml")
+        @dir    = @config.fetch("dir", nil)
+        @hooks  = [
           "applypatch-msg",
           "commit-msg",
           "post-update",
@@ -20,22 +24,44 @@ module Git
           "prepare-commit-msg",
           "update",
         ]
-        config = YAML.load_file("./.git-catch.yaml")
-        config.each do |name, files|
-          if !hooks.include? name
-            puts "==> Hook #{name} is not known"
+      end
+
+      def init
+        @config.fetch("hooks", {}).each do |name, _|
+          if !@hooks.include? name
+            @logger.error "Hook #{name} is not known."
             next
           end
-          build name, files
+          build name, files(name)
         end
       end
 
+      def list
+        data = {}
+        @config.fetch("hooks", {}).each do |name, _|
+          if !@hooks.include? name
+            @logger.error "Hook #{name} is not known."
+            next
+          end
+
+          data[name] = files(name)
+        end
+
+        data
+      end
+
       private
+      def files(name)
+        files = @config.fetch("hooks", {}).fetch(name, [])
+        files = (files + dir_files(@dir, name)).uniq if @dir
+        files
+      end
+
       def build(name, files)
         file = ".git/hooks/#{name}"
         content = <<~EOS
           #!/usr/bin/env bash
-          set -eu
+          set -e
 
         EOS
         files.each do |file|
@@ -43,7 +69,19 @@ module Git
         end
         File.write file, content
         FileUtils.chmod "+x", file
-        puts "==> File #{file} written"
+        @logger.info "File #{file} written"
+      end
+
+      def dir_files(dir, hook)
+        files = []
+        Dir["#{dir}/#{hook}/**/*"].each do |f|
+          if not File.executable? f
+            @logger.warn "File #{f} is not executable"
+            next
+          end
+          files << f
+        end
+        files
       end
 
     end

data/lib/git/catch/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Catch
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/utils/git/hooks/pre-commit/hello

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+
+echo "==> HELLO!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-catch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pedro Barbosa
@@ -71,6 +71,7 @@ files:
 - git-catch.gemspec
 - lib/git/catch.rb
 - lib/git/catch/version.rb
+- utils/git/hooks/pre-commit/hello
 homepage: https://github.com/jpedro/git-catch
 licenses:
 - MIT