Skip to content
This repository has been archived by the owner on Jul 8, 2023. It is now read-only.

Commit

Permalink
Repository maintenance.
Browse files Browse the repository at this point in the history
  • Loading branch information
ezzatron committed Mar 4, 2013
1 parent a01e469 commit e7219bb
Show file tree
Hide file tree
Showing 17 changed files with 423 additions and 408 deletions.
7 changes: 4 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# archer start
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
phpunit.xml export-ignore
phpunit.reports.xml export-ignore
.travis.* export-ignore
.archer.* export-ignore
test export-ignore
# archer end
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
test/report
vendor
# archer start
/artifacts/
/vendor/
# archer end
1 change: 1 addition & 0 deletions .travis.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I8WZjDzleWyIoAKFVxk2i55l1y4TUymxAMepjObii2fGmHQcZk0pWUIiw2geLLO1CFBvFuF7+ONX1xq+rHTzU5fsoSxEsYvONsGAZniCawiTNOyZa6/Tf0hgOMGhhUlWTPpeWuuC54anxqjnTWmPUfkmbYEwPE7nR/RYpnSOV5o=
26 changes: 26 additions & 0 deletions .travis.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env php
<?php
/**
* This script is executed before composer dependencies are installed,
* and as such must be included in each project as part of the skeleton.
*/
if ($token = getenv('ARCHER_TOKEN')) {
$config = array(
'config' => array(
'github-oauth' => array('github.com' => $token)
)
);

$file = '~/.composer/config.json';
$dir = dirname($file);
if (!is_dir($dir)) {
mkdir($dir, 0755, true);
}
file_put_contents($file, json_encode($config));

$composerFlags = '--prefer-dist';
} else {
$composerFlags = '--prefer-source';
}

passthru('composer install --dev --no-progress --no-interaction --ansi ' . $composerFlags);
6 changes: 6 additions & 0 deletions .travis.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-----BEGIN RSA PUBLIC KEY-----
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBIvxwmXR/zSrE26i8tf17NOyc
v8NNavJ6dUtcbIv8EeZU5CAvntnmecklf6XbOs6PR6grEVqyNq82OWEeZvvqyc3q
dvZLXRZbq6xB0TmY0LpTMlZrIldKeOI3TyurioxS3ETmDUW3QoQlf2EnXKjL5i+V
50OIxOEciyxig3WhFwIDAQAB
-----END RSA PUBLIC KEY-----
33 changes: 27 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
#
# This is the default Travis CI configuration.
#
# It uses a GitHub OAuth token when fetching composer dependencies
# to avoid IP-based API throttling.
#
# It also allows publication of artifacts via an additional build.
#
language: php
before_script:
- composer install --dev
script: phpunit

php:
- 5.3.3
- 5.3
- 5.4
- 5.3
- 5.4
- 5.5

env:
global:
- ARCHER_PUBLISH_VERSION=5.4
- secure: "I8WZjDzleWyIoAKFVxk2i55l1y4TUymxAMepjObii2fGmHQcZk0pWUIiw2geLLO1CFBvFuF7+ONX1xq+rHTzU5fsoSxEsYvONsGAZniCawiTNOyZa6/Tf0hgOMGhhUlWTPpeWuuC54anxqjnTWmPUfkmbYEwPE7nR/RYpnSOV5o="

install:
- ./.travis.install
script:
- ./vendor/bin/archer travis:build

matrix:
# PHP 5.5 is still in alpha, so ignore build failures.
allow_failures:
- php: 5.5
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Composer NPM bridge changelog

### 1.0.1

* [Archer](https://github.com/IcecaveStudios/archer) integration
* Implemented changelog
29 changes: 29 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Contributing

**Composer NPM bridge** is open source software; contributions from the
community are encouraged. Please take a moment to read these guidelines before
submitting changes.

### Code style

All PHP code must adhere to the
[PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
standards.

### Branching and pull requests

As a guideline, please follow this process:

1. [Fork the repository](https://help.github.com/articles/fork-a-repo).
2. Create a topic branch for the change:
* New features should branch from **develop**.
* Bug fixes to existing versions should branch from **master**.
* Please ensure the branch is clearly labelled as a feature or fix.
3. Make the relevant changes.
4. [Squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
commits if necessary.
4. Submit a pull request to the **develop** branch.

Please note this is a general guideline only. For more information on the
branching structure please see the
[git-flow cheatsheet](http://danielkummer.github.com/git-flow-cheatsheet/).
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2012 Erin Millard
Copyright © 2013 Erin Millard

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 8 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

*NPM integration for Composer packages.*

[![Build Status]](http://travis-ci.org/eloquent/composer-npm-bridge)
[![Test Coverage]](http://eloquent-software.com/composer-npm-bridge/artifacts/tests/coverage/)

## Installation

* Add 'eloquent/composer-npm-bridge' to the project's `composer.json`
dependencies
* Run `composer install`
Available as [Composer](http://getcomposer.org/) package
[eloquent/composer-npm-bridge](https://packagist.org/packages/eloquent/composer-npm-bridge).

## What does the Composer NPM bridge do?

Expand Down Expand Up @@ -50,13 +52,6 @@ The install/update process will generate an `npm-shrinkwrap.json` file which
is similar in purpose to a Composer lock file. This file should be added to the
source code management repository (Git/Subversion/Mercurial etc.)

## Code quality

Composer NPM bridge strives to attain a high level of quality. A full test suite
is available, and code coverage is closely monitored.

### Latest revision test suite results
[![Build Status](https://secure.travis-ci.org/eloquent/composer-npm-bridge.png)](http://travis-ci.org/eloquent/composer-npm-bridge)

### Latest revision test suite coverage
<http://ci.ezzatron.com/report/composer-npm-bridge/coverage/>
<!-- references -->
[Build Status]: https://raw.github.com/eloquent/composer-npm-bridge/gh-pages/artifacts/images/icecave/regular/build-status.png
[Test Coverage]: https://raw.github.com/eloquent/composer-npm-bridge/gh-pages/artifacts/images/icecave/regular/coverage.png
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
],
"require": {
"php": ">=5.3.0",
"icecave/isolator": "2.*",
"symfony/process": "2.*"
"composer/composer": "dev-master",
"icecave/isolator": "~2",
"symfony/process": "~2"
},
"require-dev": {
"composer/composer": "dev-master@dev",
"eloquent/asplode": "1.*",
"eloquent/liberator": "1.*",
"phake/phake": "1.*"
"eloquent/liberator": "~1",
"icecave/archer": "~0.2"
},
"autoload": {
"psr-0": {
Expand Down
Loading

0 comments on commit e7219bb

Please sign in to comment.