Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies to support node > 7 and windows 10 #69

Merged
merged 1 commit into from
Mar 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/run.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ init = (args) ->

clone = (args) ->
{org, repo, templates} = args
organization = args._[1] || org
organization = args._[1] || org || args.organization
repo = args._[2] || repo
if !organization
console.error 'Please specify an organization when using the clone command.'
Expand Down
2 changes: 1 addition & 1 deletion lib/clone.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fetchGitHubRepo = require("fetch-github-repo")
fetchGitHubRepo = require("rally-fetch-github-repo")
_ = require('lodash')
fs = require 'fs'
path = require 'path'
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Kyle Morse <[email protected]>",
"name": "rally-app-builder",
"description": "A node module that assists in the building of Rally Apps",
"version": "1.4.1",
"version": "1.5.1",
"homepage": "https://github.com/rallyapps/rally-app-builder",
"repository": {
"type": "git",
Expand All @@ -19,13 +19,12 @@
"coffee-script": "1.4.x",
"commander": "0.6.x",
"express": "4.2.x",
"fetch-github-repo": "0.1.2",
"grunt": "~0.4.5",
"grunt-cli": "~0.1.9",
"grunt-contrib-clean": "0.4.x",
"grunt-contrib-concat": "0.3.x",
"grunt-contrib-jasmine": "0.4.x",
"grunt-contrib-watch": "~0.4.4",
"grunt": "1.0.1",
"grunt-cli": "1.2.0",
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-concat": "1.0.1",
"grunt-contrib-jasmine": "1.1.0",
"grunt-contrib-watch": "1.0.0",
"handlebars": "~1.0.11",
"jshint": "~2.9.2",
"less": "~1.7.0",
Expand All @@ -34,14 +33,15 @@
"node-watch": "~0.3.4",
"open": "~0.0.5",
"promise-to-validate": "~0.3.0",
"rally-fetch-github-repo": "0.2.2",
"request": "~2.11.4",
"shelljs": "^0.3.0",
"uglify-js": "2.7.3",
"yargs": "4.3.1"
},
"devDependencies": {
"mocha": "1.6.x",
"wrench": "1.3.x",
"fs-extra": "2.0.0",
"mocha": "3.2.x",
"sinon": "^1.10.2"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "0.1.1",
"private": true,
"devDependencies": {
"grunt": "~0.4.5",
"grunt-cli": "~0.1.9",
"grunt": "1.0.1",
"grunt-cli": "1.2.0",
"grunt-contrib-jasmine": "1.0.3",
"grunt-contrib-jshint": "~0.7.2",
"grunt-contrib-connect": "0.11.2",
"grunt-contrib-jshint": "1.1.0",
"grunt-contrib-connect": "1.0.2",
"rally-sdk2-test-utils": "0.1.2"
},
"scripts": {
Expand Down
13 changes: 6 additions & 7 deletions test/build.test.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
assert = require 'assert'
rallyAppBuilder = require '../index'
fs = require 'fs'
wrench = require 'wrench'
fsextra = require 'fs-extra'
path = require 'path'
sinon = require 'sinon'
shell = require 'shelljs'
Expand All @@ -18,7 +18,7 @@ sdk2WithExternalStylesDirectory = path.join(tempTestDirectory, 'sdk2WithExternal
describe 'Build an App', ()->
before (done)->
try
copy = ()-> wrench.copyDirRecursive(fixturesDirectory, tempTestDirectory, done)
copy = ()-> fsextra.copy(fixturesDirectory, tempTestDirectory, done)
fs.mkdir(tempTestDirectory, copy)
catch e
after (done)->
Expand Down Expand Up @@ -205,7 +205,7 @@ describe 'Build an App', ()->
assert(appDebugFileContents.indexOf("http://www.regular.com/stuff.css") >= 0)

describe 'with build scripts', ->

beforeEach ->
@config = require('../lib/config')

Expand Down Expand Up @@ -246,18 +246,18 @@ describe 'Build an App', ()->

afterEach ->
@sandbox.restore()

it 'should push and pop the app path directory', (done)->
rallyAppBuilder.build.runScript {scripts: {prebuild: 'cmd'}}, 'appPath', 'prebuild', (err)->
assert(shell.pushd.calledWith('appPath'))
assert(shell.pushd.calledBefore(shell.exec))
assert(shell.popd.called)
assert(shell.exec.calledBefore(shell.popd))
done()

it 'should exec the script step', (done)->
rallyAppBuilder.build.runScript {scripts: {prebuild: 'cmd'}}, 'appPath', 'prebuild', (err)->
assert(shell.exec.calledWith('cmd'))
assert(shell.exec.calledWith('cmd'))
done()

it 'should error if attempting and undefined step', (done)->
Expand All @@ -270,4 +270,3 @@ describe 'Build an App', ()->
assert(not err?)
assert(not shell.exec.called)
done()

4 changes: 2 additions & 2 deletions test/clone.test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ assert = require 'assert'
rallyAppBuilder = require '../index'
fs = require 'fs'
path = require 'path'
wrench = require 'wrench'
fsextra = require 'fs-extra'
if process.env.TRAVIS
console.log "Clone tests not ran during Travis build process due to timeouts."
return
Expand All @@ -24,7 +24,7 @@ describe('Clone existing App', ()->
done(e)
after ()->
try
wrench.rmdirSyncRecursive(baseDir)
fsextra.removeSync(baseDir)
catch e

it('should delete the RakeFile', ()->
Expand Down
5 changes: 2 additions & 3 deletions test/css.test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ describe 'CSS', ->
describe '#compileInPlace', ->
fs = require 'fs'
path = require 'path'
wrench = require 'wrench'
fsextra = require 'fs-extra'
tempTestDirectory = 'test/buildTemp'
beforeEach ->
wrench.rmdirSyncRecursive tempTestDirectory
fsextra.removeSync tempTestDirectory
fs.mkdirSync tempTestDirectory

it 'should leave a css file alone', (done) ->
Expand All @@ -70,4 +70,3 @@ describe 'CSS', ->
assert content == writtenFile
assert fs.existsSync writtenFile
done()

4 changes: 2 additions & 2 deletions test/init.test.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
assert = require 'assert'
rallyAppBuilder = require '../index'
fs = require 'fs'
wrench = require 'wrench'
fsextra = require 'fs-extra'
describe('Init new App', ()->
baseDir = 'test/initTemp'

Expand All @@ -11,7 +11,7 @@ describe('Init new App', ()->
catch e
after ()->
try
wrench.rmdirSyncRecursive(baseDir)
fsextra.removeSync(baseDir)
catch e

it('tests files created', (done)->
Expand Down