lock_block 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+Ha ha, this is crap
+
 # Specify your gem's dependencies in lock_block.gemspec
 gemspec

data/README.md

@@ -28,6 +28,10 @@ If a file is not specified, the program will read from STDIN.
     <td>--resolve, -r</td>
     <td>Update tags in annotation to mark blocks as up to date.</td>
   </tr>
+  <tr>
+    <td>--guard, -g path-to-repo</td>
+    <td>Installs pre-commit hook to repo to prevent committing broken locks.</td>
+  </tr>
 </tbody>
 </table>
 

data/bin/lock_block

@@ -6,9 +6,11 @@ opts = Trollop::options do
   opt :lock,    "Annotate input with lock hash", default: true
   opt :check,   "Check input for broken locks"
   opt :resolve, "Update all lock tags in input"
+  opt :guard,   "Path to repo which will be guarded with pre-commit hook", type: :string
 end
 
-input = ARGF.read
+input = ARGF.read if !opts[:guard]
+
 if opts[:check]
   errs = LockBlock.broken_locks input
   if errs.any?
@@ -19,6 +21,17 @@ if opts[:check]
   end
 elsif opts[:resolve]
   puts LockBlock.resolve input
+elsif opts[:guard]
+  repo       = opts[:guard]
+  repo_hooks = File.absolute_path File.join(repo, '.git', 'hooks')
+  unless File.exists? repo_hooks
+    puts "Guard error: '#{repo}' is not the path of a git repo."
+    exit 1
+  end
+  here        = File.dirname File.expand_path(__FILE__)
+  hook_source = File.absolute_path File.join(here, '..', 'lib', 'git', 'pre-commit')
+  File.symlink hook_source, File.join(repo_hooks, 'pre-commit')
+  puts "Added pre-commit hook to #{repo}"
 else
   puts LockBlock.lock input
 end

data/lib/git/pre-commit

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Checks for out-of-date/broken locks
+
+index_files=("`git diff --cached --name-only`")
+
+for file in $index_files; do
+  bad_lock="`git show :$file | lock_block -c | cut -d: -f3`"
+  if [[ -n $bad_lock ]]; then
+    bad_exit=true
+    # lock_block operates on staged content; we want line numbers for physical files
+    line="`grep -n \"lock do $bad_lock\" $file | cut -d: -f1`"
+    locks=("${locks[@]} $file:$line:$bad_lock")
+  fi
+done
+
+if [[ -n $bad_exit ]]; then
+  echo -e "The following locks are broken:\n"
+  for lock in $locks; do
+    echo "  $lock"
+  done
+  echo -e "\nPlease fix them before committing."
+  exit 1
+fi

data/lib/lock_block/version.rb

@@ -1,3 +1,3 @@
 module LockBlock
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lock_block.gemspec

@@ -6,7 +6,7 @@ require 'lock_block/version'
 Gem::Specification.new do |gem|
   gem.name                  = "lock_block"
   gem.version               = LockBlock::VERSION
-  gem.authors               = ["Joe Nelson"]
+  gem.authors               = ["Joe Nelson", "Ryland Herrick", "Chris Wilson"]
   gem.email                 = ["cred+github@begriffs.com"]
   gem.description           = %q{Mark code blocks important, monitor them}
   gem.summary               = %q{Provides command-line tool to annotate and check blocks of code}

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lock_block
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
 - Joe Nelson
+- Ryland Herrick
+- Chris Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -42,6 +44,7 @@ files:
 - README.md
 - Rakefile
 - bin/lock_block
+- lib/git/pre-commit
 - lib/lock_block.rb
 - lib/lock_block/version.rb
 - lock_block.gemspec