vagrant-ebcommon 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a85966114c79554c3b98a5eb1e06683d1532ee3
-  data.tar.gz: d4a1872890065308cf65607e2ccffb01ded1bc75
+  metadata.gz: 1bc5b754d67042d96898ef1f40e7ad07b0dbbd16
+  data.tar.gz: b22718188431c1a35287ac27212488f8cf455f79
 SHA512:
-  metadata.gz: 95fa38ffa061cd37301cb2d7c4232ec6897a6879bd7271c37fcd65c6845359052642bcc4ffef2fcb2df004a6d0b9eab71873fdf13a8ec97e0362b445893a2b98
-  data.tar.gz: 4c4cf51b1b63482a38278897ec93231b01551cc315a68357b3461c331dfbfc9b67ab643e71dac0820bc373d2cc22afd3bd4a4388f554754f0b31b32831bc59ac
+  metadata.gz: 046450f57fc434dc9a989f19f181264506efdc2d088dfa0fbb8931733de7f2d182dccabca5424f3663a4fd9df00d483223be788c2c2294bf250362f04b6c767f
+  data.tar.gz: e54c06a92d976a396d183ccb8193855fee1918dc55b468f0ea46ee6fb63f96562c520bdd84cef3cc6b123c7f4a08b149ad722b9494456ca52459fabc66fa4d46

data/Vagrantfile

@@ -7,8 +7,12 @@ Vagrant.configure('2') do |config|
   config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
 
   config.ebcommon.vpn_urls = [
-    "https://docs.evbhome.com",
-    "https://reviews.evbhome.com",
+    'https://docs.evbhome.com',
+    'https://reviews.evbhome.com',
+  ]
+  config.ebcommon.git_hook_root_dir = '/Volumes/eb_home/work'
+  config.ebcommon.git_hook_repos = [
+    'vagrant-ebcommon',
   ]
 
   config.vm.provision 'puppet' do |puppet|

data/lib/vagrant-ebcommon/actions/setup_provision.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'timeout'
 require 'socket'
 require_relative '../errors'
@@ -37,6 +38,25 @@ module VagrantPlugins
           end
         end
 
+        # Copy over our git commit hooks
+        def setup_git_hooks
+          plugin_hooks_dir = File.expand_path File.join(File.dirname(__FILE__), '..', 'files', 'git_hooks')
+          git_hooks = Dir.entries(plugin_hooks_dir).select {|f| !File.directory? f}
+          if @ebcommon.git_hook_repos
+            @env[:ui].info 'Copying over git commit hooks...'
+          end
+
+          @ebcommon.git_hook_repos.each do |repo_path|
+            target_directory = File.join @ebcommon.git_hook_root_dir, repo_path, '.git', 'hooks'
+            if File.directory? target_directory
+              git_hooks.each do |hook|
+                source = File.join plugin_hooks_dir, hook
+                FileUtils.cp source, target_directory
+              end
+            end
+          end
+        end
+
         # In order to provision vagrant, we require you to be in the office or
         # connected to VPN. There are several packages that are hosted
         # internally and everything will fail miserably if you're not on our
@@ -139,6 +159,7 @@ module VagrantPlugins
           if provision_enabled
             ensure_vpn()
             setup_ssh_keys()
+            setup_git_hooks()
             generate_git_commiter_facts()
           end
           @app.call(env)

data/lib/vagrant-ebcommon/config.rb

@@ -2,13 +2,19 @@ module VagrantPlugins
   module Ebcommon
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :vpn_urls
+      attr_accessor :git_hook_repos
+      attr_accessor :git_hook_root_dir
 
       def initialize
         @vpn_urls = UNSET_VALUE
+        @git_hook_repos = UNSET_VALUE
+        @git_hook_root_dir = UNSET_VALUE
       end
 
       def finalize!
         @vpn_urls = nil if @vpn_urls == UNSET_VALUE
+        @git_hook_repos = nil if @git_hook_repos == UNSET_VALUE
+        @git_hook_root_dir = nil if @git_hook_root_dir == UNSET_VALUE
       end
 
       def validate(machine)
@@ -25,6 +31,14 @@ module VagrantPlugins
             }
           end
         end
+        if @git_hook_repos
+          if not @git_hook_repos.kind_of?(Array)
+            errors << '`git_hook_repos` must be a list of paths to copy hooks to'
+          end
+        end
+        if @git_hook_repos and not @git_hook_root_dir
+          errors << '`git_hook_root_dir` must be set to the directory containing directories in `git_hook_repos`'
+        end
         return { 'ebcommon' => errors }
       end
 

data/lib/vagrant-ebcommon/files/git_hooks/pre-commit

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Our pre-commit hook for python repositories. This is distributed via our
+# vagrant plugin: https://github.com/eventbrite/vagrant-ebcommon.
+
+#
+# Opt out of git hook via:
+#  $ git config --global eventbrite.ignore-hook true
+#
+if [ "$(git config --get --bool 'eventbrite.ignore-hook')" = "true" ]
+then
+    exit 0
+fi
+
+# stashing in the middle of a merge or cherry-pick conflict removes the
+# reference to the fact that we're merging or cherry-picking. merges and
+# cherry-picks mean the commits have already been verified, so skip
+# verification here that can cause issues.
+if [ -f .git/MERGE_HEAD ]
+then
+    echo "merge detected, skipping pre_commit verification"
+    exit 0
+fi
+
+if [ -f .git/CHERRY_PICK_HEAD ]
+then
+    echo "cherry-pick detected, skipping pre_commit verification"
+    exit 0
+fi
+
+if [ -f .git/REVERT_HEAD ]
+then
+    echo "revert detected, skipping pre_commit verification"
+    exit 0
+fi
+
+GIT_STASH=`git stash --keep-index`
+NO_CHANGES="No local changes to save"
+
+PYTHON_PRE_COMMIT_HOOK=.git/hooks/pre_commit_hook.py
+FILES=`git diff --cached --name-only | xargs`
+python $PYTHON_PRE_COMMIT_HOOK $FILES
+exit_value=$?
+
+if [ "$GIT_STASH" != "$NO_CHANGES" ]
+then
+    git stash pop -q
+fi
+exit $exit_value

data/lib/vagrant-ebcommon/files/git_hooks/pre-push

@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Our pre-push hook for python repositories. This is distributed via our
+# vagrant plugin: https://github.com/eventbrite/vagrant-ebcommon.
+
+# Called by "git push" after it has checked the remote status,
+# but before anything has been pushed.
+#
+# If this script exits with a non-zero status nothing will be pushed.
+#
+# Steps to install, from the root directory of your repo...
+# 1. Copy the file into your repo at `.git/hooks/pre-push`
+# 2. Set executable permissions, run `chmod +x .git/hooks/pre-push`
+# 3. Or, use `rake hooks:pre_push` to install
+#
+# Try a force push to master, you should get a message `*** [Policy] never force push...`
+#
+# The commands below will not be allowed...
+# `git push --force origin master`
+# `git push --delete origin master`
+# `git push origin :master`
+#
+# Nor will a force push while on the master branch be allowed...
+# `git co master`
+# `git push --force origin`
+#
+# Requires git 1.8.2 or newer
+#
+# Git 1.8.2 release notes cover the new pre-push hook:
+# <https://github.com/git/git/blob/master/Documentation/RelNotes/1.8.2.txt>
+#
+# See Sample pre-push script:
+# <https://github.com/git/git/blob/87c86dd14abe8db7d00b0df5661ef8cf147a72a3/templates/hooks--pre-push.sample>
+#
+# Credit to: https://gist.github.com/pixelhandler/5718585
+
+protected_branch='master'
+
+policy='[Policy] Never force push or delete the '$protected_branch' branch! (Prevented with pre-push hook.)'
+
+current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
+
+push_command=$(ps -ocommand= -p $PPID)
+
+is_destructive='force|delete|\-f'
+
+will_remove_protected_branch=':'$protected_branch
+
+do_exit(){
+  echo $policy
+  exit 1
+}
+
+if [[ $push_command =~ $is_destructive ]] && [ $current_branch = $protected_branch ]; then
+  do_exit
+fi
+
+if [[ $push_command =~ $is_destructive ]] && [[ $push_command =~ $protected_branch ]]; then
+  do_exit
+fi
+
+if [[ $push_command =~ $will_remove_protected_branch ]]; then
+  do_exit
+fi
+
+unset do_exit
+
+exit 0

data/lib/vagrant-ebcommon/files/git_hooks/pre_commit_hook.py

@@ -0,0 +1,118 @@
+import re
+import os
+import subprocess
+import sys
+
+FILE_TYPE_PYTHON = 'py'
+FILE_TYPE_JS = 'js'
+
+FORBIDDEN = {
+    FILE_TYPE_PYTHON: [
+        'import ipdb',
+        'import pdb',
+    ],
+    FILE_TYPE_JS: [
+        'console\.',
+        'debugger',
+    ],
+    'all': [
+    ],
+}
+
+# spaces in the flake8 strings are required to ensure we're only matching these
+# exact strings. for example, flake8 calls out "unable to detect undefined
+# names" when "from package import *" is used. without spaces around "undefined
+# name" we would match this.
+FLAKE8_WARNINGS = [
+    ' imported but unused',
+    ' assigned to but never used',
+]
+FLAKE8_ERRORS = [
+    ' undefined name ',
+    'SyntaxError',
+]
+
+REJECT_TEMPLATE = """
+%(filename)s:
+%(indx)s: %(line)s
+
+COMMIT REJECTED. Please correct the aforementioned mistake.
+"""
+
+
+def flake8_file(filename):
+    exit_code = 0
+
+    child = subprocess.Popen(['flake8', filename], stdout=subprocess.PIPE)
+    stdout, stderr = child.communicate()
+
+    # we only want to split out lines if you have a warning or error
+    lines = None
+    for warning in FLAKE8_WARNINGS:
+        if warning in stdout:
+            if lines is None:
+                lines = stdout.split('\n')
+            for line in lines:
+                if warning in line:
+                    print 'FLAKE8 WARNING:', line
+
+    for error in FLAKE8_ERRORS:
+        if error in stdout:
+            if lines is None:
+                lines = stdout.split('\n')
+            for line in lines:
+                if error in line:
+                    print 'COMMIT REJECTED. FLAKE8 ERROR:', line
+                    exit_code = 1
+    return exit_code
+
+
+def look_for_forbidden_items(filename):
+    exit_code = 0
+    regexes = FORBIDDEN['all']
+    file_type = None
+    if '.' in filename:
+        file_type = filename.rsplit('.', 1)[1]
+        regexes.extend(FORBIDDEN.get(file_type, []))
+    if regexes:
+        regex = '(' + '|'.join(regexes) + ')'
+
+        with open(filename) as filedata:
+            lines = filedata.readlines()
+            for indx, line in enumerate(lines):
+                line = line.strip()
+                if re.search(regex, line):
+                    print REJECT_TEMPLATE % {
+                        'filename': filename,
+                        'indx': indx + 1,
+                        'line': line,
+                    }
+                    exit_code = 1
+
+    if (
+        not os.environ.get('EB_PRE_COMMIT_NO_FLAKE8') and
+        file_type and
+        file_type == FILE_TYPE_PYTHON
+    ):
+        try:
+            flake_exit = flake8_file(filename)
+            # make sure we don't override the exit_code above if flake succeeds
+            if flake_exit > 0:
+                exit_code = flake_exit
+        except OSError:
+            try:
+                import flake8
+            except ImportError:
+                print 'Please install flake8 to continue: pip install flake8'
+                exit_code = 1
+    return exit_code
+
+
+if __name__ == '__main__':
+    files = sys.argv[1:]
+    for f in files:
+        # Ignore files that have been deleted.
+        if os.path.exists(os.path.abspath(f)):
+            exit_val = look_for_forbidden_items(f)
+            if exit_val:
+                sys.exit(exit_val)

data/lib/vagrant-ebcommon/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ebcommon
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ebcommon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,9 @@ files:
 - lib/vagrant-ebcommon/commands/stop-selenium.rb
 - lib/vagrant-ebcommon/config.rb
 - lib/vagrant-ebcommon/errors.rb
+- lib/vagrant-ebcommon/files/git_hooks/pre-commit
+- lib/vagrant-ebcommon/files/git_hooks/pre-push
+- lib/vagrant-ebcommon/files/git_hooks/pre_commit_hook.py
 - lib/vagrant-ebcommon/plugin.rb
 - lib/vagrant-ebcommon/version.rb
 - locales/en.yml