Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-04-08 23:10:01 -07:00
commit 82cc98c844
3 changed files with 1748 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Gruntfile.coffee
View File

@ -203,43 +203,61 @@ module.exports = (grunt) ->
beta: beta:
command: """ command: """
git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
cd ..
cd "<%= pkg.meta.path %>.gh-pages"
git checkout gh-pages git checkout gh-pages
git pull git pull
git merge --no-commit -s ours beta git merge --no-commit -s ours beta
git checkout beta "builds/*<%= pkg.meta.suffix.beta %>.*" LICENSE CHANGELOG.md img .gitignore .gitattributes git checkout beta "builds/*<%= pkg.meta.suffix.beta %>.*" LICENSE CHANGELOG.md img .gitignore .gitattributes
git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to beta channel." git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to beta channel."
git checkout - cd ..
cd "<%= pkg.meta.path %>"
""".split('\n').join('&&') """.split('\n').join('&&')
stable: stable:
command: """ command: """
git push . HEAD:bstable git push . HEAD:bstable
git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
cd ..
cd "<%= pkg.meta.path %>.gh-pages"
git checkout gh-pages git checkout gh-pages
git pull git pull
git merge --no-commit -s ours stable git merge --no-commit -s ours stable
git checkout stable "builds/<%= pkg.name %>.*" builds/updates.xml git checkout stable "builds/<%= pkg.name %>.*" builds/updates.xml
git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to stable channel." git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to stable channel."
git checkout - cd ..
cd "<%= pkg.meta.path %>"
""".split('\n').join('&&') """.split('\n').join('&&')
'commit-web': 'commit-web':
command: 'git commit -am "Build web page."' command: 'git commit -am "Build web page."'
web: web:
command: """ command: """
cd ..
cd "<%= pkg.meta.path %>.gh-pages"
git checkout gh-pages git checkout gh-pages
git pull git pull
git merge --no-commit -s ours - git merge --no-commit -s ours -
git checkout - README.md index.html web.css img git checkout - README.md index.html web.css img
git commit -am "Update web page." git commit -am "Update web page."
git checkout - cd ..
cd "<%= pkg.meta.path %>"
""".split('\n').join('&&') """.split('\n').join('&&')
push: push:
command: 'git push origin --tags -f && git push origin --all' command: 'git push origin --tags -f && git push origin --all'
prestore: prestore:
command: 'git checkout stable' command: """
cd ..
cd "<%= pkg.meta.path %>.gh-pages"
git checkout gh-pages
"""
poststore: poststore:
command: 'git checkout -' command: """
cd ..
cd "<%= pkg.meta.path %>"
"""
aws: aws:
command: """ command: """
cd ..
cd "<%= pkg.meta.path %>.gh-pages"
git checkout gh-pages git checkout gh-pages
aws s3 cp builds/ s3://<%= pkg.meta.awsBucket %>/builds/ --recursive --exclude "*" --include "*.js" --cache-control "max-age=600" --content-type "application/javascript; charset=utf-8" aws s3 cp builds/ s3://<%= pkg.meta.awsBucket %>/builds/ --recursive --exclude "*" --include "*.js" --cache-control "max-age=600" --content-type "application/javascript; charset=utf-8"
aws s3 cp builds/ s3://<%= pkg.meta.awsBucket %>/builds/ --recursive --exclude "*" --include "*.crx" --cache-control "max-age=600" --content-type "application/x-chrome-extension" aws s3 cp builds/ s3://<%= pkg.meta.awsBucket %>/builds/ --recursive --exclude "*" --include "*.crx" --cache-control "max-age=600" --content-type "application/x-chrome-extension"
@ -248,7 +266,8 @@ module.exports = (grunt) ->
aws s3 cp img/ s3://<%= pkg.meta.awsBucket %>/img/ --recursive --cache-control "max-age=600" aws s3 cp img/ s3://<%= pkg.meta.awsBucket %>/img/ --recursive --cache-control "max-age=600"
aws s3 cp index.html s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=600" --content-type "text/html; charset=utf-8" aws s3 cp index.html s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=600" --content-type "text/html; charset=utf-8"
aws s3 cp web.css s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=600" --content-type "text/css; charset=utf-8" aws s3 cp web.css s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=600" --content-type "text/css; charset=utf-8"
git checkout - cd ..
cd "<%= pkg.meta.path %>"
""".split('\n').join('&&') """.split('\n').join('&&')
captchas: captchas:
command: 'aws s3 cp captchas.html s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=0" --content-type "text/html; charset=utf-8"' command: 'aws s3 cp captchas.html s3://<%= pkg.meta.awsBucket %> --cache-control "max-age=0" --content-type "text/html; charset=utf-8"'
@ -264,8 +283,8 @@ module.exports = (grunt) ->
accounts: accounts:
default: default:
publish: true publish: true
client_id: '<%= grunt.file.readJSON("../"+pkg.name+"-keys/chrome-store.json").installed.client_id %>' client_id: '<%= grunt.file.readJSON("../"+pkg.meta.path+".keys/chrome-store.json").installed.client_id %>'
client_secret: '<%= grunt.file.readJSON("../"+pkg.name+"-keys/chrome-store.json").installed.client_secret %>' client_secret: '<%= grunt.file.readJSON("../"+pkg.meta.path+".keys/chrome-store.json").installed.client_secret %>'
extensions: extensions:
extension: extension:
appID: '<%= pkg.meta.chromeStoreID %>' appID: '<%= pkg.meta.chromeStoreID %>'
@ -396,7 +415,7 @@ module.exports = (grunt) ->
grunt.registerTask 'sign-channel', 'Sign CRX package', (channel) -> grunt.registerTask 'sign-channel', 'Sign CRX package', (channel) ->
done = @async() done = @async()
pkg = grunt.config 'pkg' pkg = grunt.config 'pkg'
privateKey = grunt.file.read "../#{pkg.name}-keys/#{pkg.name}.pem" privateKey = grunt.file.read "../#{pkg.meta.path}.keys/#{pkg.name}.pem"
archive = grunt.file.read "testbuilds/#{pkg.name}#{pkg.meta.suffix[channel]}.crx.zip", {encoding: null} archive = grunt.file.read "testbuilds/#{pkg.name}#{pkg.meta.suffix[channel]}.crx.zip", {encoding: null}
extension = new crx {privateKey, loaded: true} extension = new crx {privateKey, loaded: true}
extension.pack(archive).then((data) -> extension.pack(archive).then((data) ->

2320
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

25
package.json
View File

@ -3,6 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",
"path": "4chan-x",
"fork": "ccd0", "fork": "ccd0",
"page": "https://www.4chan-x.net/", "page": "https://www.4chan-x.net/",
"downloads": "https://www.4chan-x.net/builds/", "downloads": "https://www.4chan-x.net/builds/",
@ -60,20 +61,20 @@
"devDependencies": { "devDependencies": {
"crx": "^3.0.3", "crx": "^3.0.3",
"font-awesome": "4.5.0", "font-awesome": "4.5.0",
"grunt": "^0.4.5", "grunt": "^1.0.1",
"grunt-concurrent": "^2.1.0", "grunt-concurrent": "^2.3.0",
"grunt-contrib-clean": "^0.7.0", "grunt-contrib-clean": "^1.0.0",
"grunt-contrib-coffee": "^0.13.0", "grunt-contrib-coffee": "^0.13.0",
"grunt-contrib-concat": "^0.5.1", "grunt-contrib-concat": "^1.0.0",
"grunt-contrib-copy": "^0.8.2", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-jshint": "^0.12.0", "grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^1.0.0",
"grunt-markdown": "^0.7.0", "grunt-markdown": "^0.7.0",
"grunt-shell": "^1.1.2", "grunt-shell": "^1.2.1",
"grunt-webstore-upload": "^0.8.9", "grunt-webstore-upload": "^0.8.10",
"jszip": "^2.5.0", "jszip": "^2.6.0",
"load-grunt-tasks": "^3.4.0", "load-grunt-tasks": "^3.5.0",
"npm-shrinkwrap": "^5.4.1" "npm-shrinkwrap": "^200.5.1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",