Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
* devel:
  fix travis naming gosh...
  Add semantic-release
  Current 3.1.0-pre.1 uses phonegap-plugin-push v. 1.8.2 updated to 1.8.4.
  Add note about progress tracking
  bump 3.1.0-pre.1
  Update node-gcm, phonegap-plugin-push, cordova-plugin-device. Didn't update node apn package as the latest one seemed to require further code changes, and the current one seems fine.
  Fix typo : "Bellow" -> "Below"
  • Loading branch information
Morten Henriksen committed Nov 22, 2017
2 parents 5bb3157 + 1fa030a commit 3708623
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 6 deletions.
29 changes: 29 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
language: node_js

cache:
directories:
- ~/.npm
- ~/.meteor
- "node_modules"

node_js:
- '8'

install:
- npm install
- if [[ ! -e "$HOME/.meteor" ]]; then curl https://install.meteor.com/ | sh; fi
- export PATH=$HOME/.meteor:$PATH
- npx meteor-ci login ${METEOR_TOKEN} --key ${METEOR_KEY}
- meteor whoami

stages:
- test
- release

script:
- npm test
- npm run semantic-release

branches:
except:
- /^v\d+\.\d+\.\d+$/
2 changes: 1 addition & 1 deletion .versions
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ordered-dict@1.0.8
promise@0.7.3
raix:eventemitter@0.1.3
raix:eventstate@0.0.2
raix:push@3.0.3-rc.7
raix:push@3.1.0-pre.1
random@1.0.10
reactive-var@1.0.10
retry@1.0.8
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ Version 3 uses the cordova npm plugin [phonegap-plugin-push](https://github.com/

Note:
Some of the documentation is outdated, please file an issue or create a pull request - same if you find a bug or want to add tests
## Development

Watch the project [progress](https://github.com/raix/push/projects/1) for status or join development

## Config

Expand Down
12 changes: 12 additions & 0 deletions bin/updateversion.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env node

/**
* This file updates version in package.js from package.json (provided by semantic-release)
*/

const fs = require('fs');
const path = require('path');
const packageJSON = require(path.join(process.cwd(), './package.json'));
const packageJSPath = path.join(process.cwd(), 'package.js');
const packageJS = fs.readFileSync(packageJSPath, 'utf-8');
fs.writeFileSync(packageJSPath, packageJS.replace('0.0.0-semantic-release', packageJSON.version), 'utf-8');
2 changes: 1 addition & 1 deletion docs/IOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This is described bellow:
6. Test the `*.pem` files making sure they work
7. Add the `*.pem` files to your `/private` folder in the Meteor app

If you need to learn more about creating certificates you should read the whole [Great writeup by Ali](http://www.raywenderlich.com/32960/apple-push-notification-services-in-ios-6-tutorial-part-1) - Bellow is a short snippet from the blog:
If you need to learn more about creating certificates you should read the whole [Great writeup by Ali](http://www.raywenderlich.com/32960/apple-push-notification-services-in-ios-6-tutorial-part-1) - Below is a short snippet from the blog:

###Making a PEM File
So now you have three files:
Expand Down
8 changes: 4 additions & 4 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Package.describe({
name: 'raix:push',
version: '3.0.3-rc.7',
version: '0.0.0-semantic-release',
summary: 'Isomorphic Push notifications for APN and GCM',
git: 'https://github.com/raix/push.git'
});

// Server-side push deps
Npm.depends({
'apn' : '1.6.2', // '1.7.4', // working: 1.6.2
'node-gcm' : '0.9.6', // '0.12.0' // working: 0.9.6
'node-gcm' : '0.14.4', // previously: 0.9.6
});

Cordova.depends({
'phonegap-plugin-push': '1.6.4', // 1.3.0
'cordova-plugin-device': '1.1.1',
'phonegap-plugin-push': '1.8.4', // previously 1.6.4
'cordova-plugin-device': '1.1.3', // previously 1.1.1
});

Package.registerBuildPlugin({
Expand Down
25 changes: 25 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "push",
"version": "0.0.0-semantic-release",
"description": "Isomorphic Push notifications for APN and GCM",
"main": "index.js",
"scripts": {
"test": "echo \"Tests not implemented\" && exit 0",
"semantic-release": "semantic-release pre && ./bin/updateversion.js && meteor publish && semantic-release post"
},
"release": {
"getLastRelease": "meteor-ci/src/get-last-release-cb.js"
},
"repository": "https://github.com/raix/push.git",
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/raix/push/issues"
},
"homepage": "https://github.com/raix/push#readme",
"devDependencies": {
"meteor-ci": "0.3.0",
"semantic-release": "^8.2.0",
"semver": "^5.4.1"
}
}

0 comments on commit 3708623

Please sign in to comment.