sentia_git_hooks 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527233af4d756879927bbf07f705f8f08ded3738
-  data.tar.gz: 4947f3b755ae919842563024c05235ff1df40ce4
+  metadata.gz: a26779000878621cd43af13929782c7fa112872a
+  data.tar.gz: 8436acdf1e93346213ebabf55333e8f77103e7db
 SHA512:
-  metadata.gz: c35ee95f2e1e6d9acc2fb18a8309899f65b4938609b7d82382a21391903c5a863f4a84a6a6ee44cf71254088247d4d4d462956f96f7abb5257e8978479d5ae34
-  data.tar.gz: 614027894bc9ae9cc0c7ffb2dc0e32d24a7085276320d0f9d6939a9c958d34aec5ffa53777ebba8617d8b53d25f045a82ac3025e8df72675711074e29729bbe1
+  metadata.gz: 4e05c6f12fa9d021cead42a9c9e915e59f6f794ce606e7e817de0db5059e803e09bf11d4eb83be057ab29ea100d38dddd48f3608448b83bbdaf43977f3b88d36
+  data.tar.gz: b418798aecfdf7e2a9376181f3ef0c2377132f48de62d8b7001d66954bbb7e9371c5671a68647b61820327b7b7c564649c3187da637966c5926a9b262a2af16b

data/bin/sentia_git_hooks

@@ -1,28 +1,6 @@
 #!/usr/bin/env ruby
-scripts_dir =  File.expand_path "../../lib/scripts/", __FILE__
-hooks_dir = File.expand_path ".git/hooks", Dir.pwd
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-script_files = Dir.entries(scripts_dir)
-script_files.delete(".")
-script_files.delete("..")
+require 'sentia_git_hooks'
 
-
-script_files.each do |file|
-  path_to_script = File.expand_path file, scripts_dir
-  path_to_hook = File.expand_path file, hooks_dir
-  command = "ln -s '#{path_to_script}' '#{path_to_hook}'"
-
-  puts "Issuing command: #{command}"
-
-  `#{command}`
-  if $?.exitstatus != 0
-    puts "Failed
-    If a hook file already exists then we refuse to clobber it,
-    you'll have to delete it manually, or have it call the functionality
-    in our hook."
-    exit 1
-  end
-end
-
-puts "Success"
-exit 0
+SentiaGitHooks::Cli.start(ARGV)

data/lib/scripts/commit-msg

@@ -24,8 +24,8 @@ message = `cat #{commit_file}`
 #   Definitely something here
 #   More optional stuff"
 #
-message_filter = /\A(\d[\d ,]+) - ([^\n]+)\n(\n+(.+))?\z/m
-bump_filter = /\ABump version number to ([\d.]+)\n\z/
+message_filter = /\A(\d[\d ,]*) - ([^\n]+)\n(\n+(.+))?\z/m
+bump_filter = /\ABump version number to (\d\.\d\.\d[\d.]*)\n\z/
 merge_filter = /\AMerge \w* '(.*)' into (.*)\n\z/
 
 if message_filter.match message

data/lib/sentia_git_hooks/cli.rb

@@ -0,0 +1,72 @@
+require 'thor'
+require 'pathname'
+require 'fileutils'
+
+module SentiaGitHooks
+  class Cli < Thor
+
+    def initialize(*args)
+      super
+
+      @scripts_dir =  Pathname.new File.expand_path("../../scripts", __FILE__)
+      @sentia_dir = Pathname.new("~/.sentia/").expand_path
+      @sentia_hooks_dir = @sentia_dir + "git-hooks"
+      @new_hooks_dir = Pathname.new(Dir.pwd) + ".git/hooks"
+    end
+
+
+
+    desc "update", "Update the git hooks on your system"
+    def update
+      FileUtils.mkdir_p @sentia_dir
+      FileUtils.rm_f @sentia_hooks_dir
+      FileUtils.ln_s @scripts_dir, @sentia_hooks_dir, force: true
+    end
+
+
+
+    desc "install", "Install sentia git hooks into the current repository"
+    def install
+      script_files = Dir.entries @sentia_hooks_dir
+      script_files.delete(".")
+      script_files.delete("..")
+
+      script_files.each do |file|
+        existing_script = @sentia_hooks_dir + file
+        new_hook = File.expand_path file, @new_hooks_dir
+
+        begin
+          FileUtils.ln_s existing_script, new_hook
+          exit 0
+        rescue
+          puts "Failed
+          If a hook file already exists then we refuse to clobber it,
+          you'll have to delete it manually, or have it call the functionality
+          in our hook."
+          exit 1
+        end
+      end
+    end
+
+  end
+end
+
+
+
+
+# scripts_dir =  Pathname.new File.expand_path("../../lib/scripts", __FILE__)
+# sentia_dir = Pathname.new("~/.sentia/").expand_path
+# sentia_hooks_dir = sentia_dir + "git-hooks"
+# new_hooks_dir = Pathname.new(Dir.pwd) + ".git/hooks"
+
+# FileUitels.rm_f sentia_hooks_dir
+# FileUtils.ln_s scripts_dir, sentia_hooks_dir, force: true
+
+
+
+# puts script_files
+
+
+
+# puts "Success"
+# exit 0

data/lib/sentia_git_hooks/version.rb

@@ -1,3 +1,3 @@
 module SentiaGitHooks
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/sentia_git_hooks.rb

@@ -1,5 +1,6 @@
-require "sentia_git_hooks/version"
+require 'sentia_git_hooks/version'
+require 'sentia_git_hooks/cli'
 
 module SentiaGitHooks
-  # Your code goes here...
+
 end

data/sentia_git_hooks.gemspec

@@ -18,9 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = ["sentia_git_hooks"]
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "thor"
+
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "fakefs"
 
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sentia_git_hooks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sia. S.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - sia.s.saj@gmail.com
@@ -86,6 +114,7 @@ files:
 - bin/setup
 - lib/scripts/commit-msg
 - lib/sentia_git_hooks.rb
+- lib/sentia_git_hooks/cli.rb
 - lib/sentia_git_hooks/version.rb
 - sentia_git_hooks.gemspec
 homepage: http://github.com/Sentia/git-hooks