Skip to content

Commit 59d66a1

Browse files
authored
Merge pull request #22 from Sweetchuck/change-vendor
Change vendor
2 parents 2b24a8a + 80655b6 commit 59d66a1

32 files changed

+1157
-1019
lines changed

.git-hooks

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
#!/usr/bin/env bash
22

3-
hook=$(basename "${0}")
4-
53
# @todo Better detection for executables: php, composer.phar and robo.
64
robo="$(composer config 'bin-dir')/robo"
75

86
# Exit without error if "robo" doesn't exists or it has no corresponding task.
97
test -x "$robo" || exit 0
10-
"$robo" help "githook:$hook" 1> /dev/null 2>&1 || exit 0
8+
"$robo" help "githook:$sghHookName" 1> /dev/null 2>&1 || exit 0
119

12-
if [ "$hasInput" = 'true' ]; then
13-
"$robo" "githook:$hook" $@ <<< $(</dev/stdin) || exit $?
10+
if [ "$sghHasInput" = 'true' ]; then
11+
"$robo" "githook:$sghHookName" $@ <<< $(</dev/stdin) || exit $?
1412
else
15-
"$robo" "githook:$hook" $@ || exit $?
13+
"$robo" "githook:$sghHookName" $@ || exit $?
1614
fi
1715

1816
exit 0

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
/fixtures/project-template/*/vendor/
55
/vendor/
66

7-
/cheppers-git-hooks-*.tar
8-
/cheppers-git-hooks-*.zip
7+
/sweetchuck-git-hooks-*.tar
8+
/sweetchuck-git-hooks-*.zip

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ matrix:
88
fast_finish: true
99
include:
1010
-
11-
sudo: required
11+
sudo: 'required'
1212
os: 'linux'
13-
dist: trusty
13+
dist: 'trusty'
1414
language: 'php'
15-
php: '7.0'
16-
env:
17-
- 'COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1'
18-
-
19-
os: 'osx'
20-
language: 'generic'
21-
env:
22-
- '_PHP=php70 COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1'
15+
php: '7.1'
16+
# -
17+
# os: 'osx'
18+
# language: 'generic'
19+
# env:
20+
# - 'BREW_PHP=php71'
2321

2422
before_install:
23+
- 'export COMPOSER_NO_INTERACTION=1'
24+
- 'export COMPOSER_DISABLE_XDEBUG_WARN=1'
2525
- 'src-dev/scripts/travis/before_install.sh'
2626

2727
install:

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
This package provides a bridge between the un-versioned `.git/hooks/*` scripts
55
and scripts in your Git repository.
66

7-
[![Build Status](https://travis-ci.org/Cheppers/git-hooks.svg?branch=master)](https://travis-ci.org/Cheppers/git-hooks)
8-
[![Total Downloads](https://poser.pugx.org/cheppers/git-hooks/downloads.png)](https://packagist.org/packages/cheppers/git-hooks)
7+
[![Build Status](https://travis-ci.org/Sweetchuck/git-hooks.svg?branch=master)](https://travis-ci.org/Sweetchuck/git-hooks)
98

109

1110
## When to use
@@ -17,7 +16,7 @@ teammates then this is the tool you are looking for.
1716
## How to use
1817

1918
1. Step into you existing package's directory (or create a new one with `git init && composer init`)
20-
1. Run <pre><code>composer require 'cheppers/git-hooks'</code></pre>
19+
1. Run <pre><code>composer require 'sweetchuck/git-hooks'</code></pre>
2120
1. Then you have two option
2221
1. Relay on the git hooks scripts which are shipped with this package
2322
and implement the logic in your `.git-hooks` file.
@@ -36,16 +35,16 @@ teammates then this is the tool you are looking for.
3635
"minimum-stability": "dev",
3736
"prefer-stable": true,
3837
"require": {
39-
"cheppers/git-hooks": "dev-master"
38+
"sweetchuck/git-hooks": "dev-master"
4039
},
4140
"scripts": {
4241
"post-install-cmd": [
4342
"@deploy-git-hooks"
4443
],
45-
"deploy-git-hooks": "\\Cheppers\\GitHooks\\Main::deploy"
44+
"deploy-git-hooks": "\\Sweetchuck\\GitHooks\\Main::deploy"
4645
},
4746
"extra": {
48-
"cheppers/git-hooks": {
47+
"sweetchuck/git-hooks": {
4948
"core.hooksPath": "git-hooks",
5049
"symlink": false
5150
}
@@ -57,7 +56,7 @@ teammates then this is the tool you are looking for.
5756
# Configuration
5857

5958
In the example `composer.json` above you can see two configurable option
60-
under the `"extra": {"cheppers/git-hooks": {}}`.
59+
under the `"extra": {"sweetchuck/git-hooks": {}}`.
6160

6261

6362
## Configuration symlink

RoboFile.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
<?php
2-
/**
3-
* @file
4-
* Robo task definitions for cheppers/git-hooks.
5-
*/
62

73
use Robo\Tasks;
84
use Symfony\Component\Process\Process;
95

10-
/**
11-
* Class RoboFile.
12-
*/
136
// @codingStandardsIgnoreStart
147
class RoboFile extends Tasks
158
// @codingStandardsIgnoreEnd

composer.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "cheppers/git-hooks",
2+
"name": "sweetchuck/git-hooks",
33
"description": "Provide a bridge between Git hooks and scripts under VCS.",
44
"license": "GPL-2.0",
55
"config": {
@@ -10,27 +10,24 @@
1010
"prefer-stable": true,
1111
"require": {},
1212
"require-dev": {
13+
"php": ">=7.1",
1314
"behat/behat": "~3.1",
1415
"consolidation/robo": "~1.0",
15-
"pear/archive_tar": "~1.4",
16-
"phpunit/phpunit": "~4.5",
16+
"phpunit/phpunit": "^6.2",
1717
"squizlabs/php_codesniffer": "~2.6",
1818
"symfony/filesystem": "~3.1",
1919
"symfony/process": "~3.1"
2020
},
2121
"autoload": {
2222
"psr-4": {
23-
"Cheppers\\GitHooks\\": "src/"
23+
"Sweetchuck\\GitHooks\\": "src/"
2424
}
2525
},
2626
"scripts": {
27-
"post-install-cmd": [
28-
"@deploy-git-hooks"
29-
],
30-
"deploy-git-hooks": "\\Cheppers\\GitHooks\\Main::deploy"
27+
"post-install-cmd": "\\Sweetchuck\\GitHooks\\Composer\\Scripts::postInstallCmd"
3128
},
3229
"extra": {
33-
"cheppers/git-hooks": {
30+
"sweetchuck/git-hooks": {
3431
"symlink": true
3532
}
3633
}

0 commit comments

Comments
 (0)