Skip to content

Commit c5c6476

Browse files
author
huston
committed
fine tuning docs build process + updating styles
1 parent 0022106 commit c5c6476

21 files changed

Lines changed: 614 additions & 4145 deletions

Gruntfile.coffee

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ module.exports = (grunt) ->
99
require("load-grunt-tasks") grunt
1010
require("time-grunt") grunt
1111
pkg = grunt.file.readJSON('./package.json')
12-
s3Config = grunt.file.readYAML('./s3.yml')
13-
grunt.initConfig
14-
12+
13+
if grunt.file.isFile('./s3.yml')
14+
s3Config = grunt.file.readYAML('./s3.yml')
15+
key_id = s3Config.AWS_ACCESS_KEY_ID
16+
secret = s3Config.AWS_SECRET_ACCESS_KEY
17+
else
18+
key_id = ''
19+
secret = ''
20+
21+
grunt.initConfig
1522
# Project settings
1623
yeoman:
1724

@@ -23,8 +30,8 @@ module.exports = (grunt) ->
2330
s3:
2431
options:
2532
#Accesses environment variables
26-
key: s3Config.AWS_ACCESS_KEY_ID
27-
secret: s3Config.AWS_SECRET_ACCESS_KEY
33+
key: key_id
34+
secret: secret
2835
access: 'public-read'
2936
production:
3037
bucket: "cdn.graphalchemist.com"
@@ -51,13 +58,14 @@ module.exports = (grunt) ->
5158
file: 'package.json'
5259
bump: false
5360
commit: false
61+
npm: false
5462

5563
# shell tasks
5664
shell:
5765
commitBuild:
58-
command: "git commit -am 'commit dist files for #{pkg.version}'"
66+
command: "git add -A && git commit -am 'commit dist files for #{pkg.version}'"
5967
docs:
60-
command: 'grunt --gruntfile site/Gruntfile.js'
68+
command: 'grunt --gruntfile site/Gruntfile.coffee'
6169
loadEnvVariables:
6270
command: 'source s3.sh'
6371

@@ -131,7 +139,7 @@ module.exports = (grunt) ->
131139
jshintrc: ".jshintrc"
132140
reporter: require("jshint-stylish")
133141

134-
all: ["Gruntfile.js", "<%= yeoman.app %>/scripts/{,*/}*.js", "!<%= yeoman.app %>/scripts/vendor/*", "test/spec/{,*/}*.js"]
142+
all: ["Gruntfile.coffee", "<%= yeoman.app %>/scripts/{,*/}*.js", "!<%= yeoman.app %>/scripts/vendor/*", "test/spec/{,*/}*.js"]
135143

136144

137145
# Mocha testing framework configuration options
@@ -485,11 +493,9 @@ module.exports = (grunt) ->
485493

486494
grunt.registerTask "default",
487495
if releaseFlag
488-
["newer:jshint",
489-
"test",
496+
["test",
490497
"build",
491498
"string-replace", # apply version to alchemy.js
492-
"shell:docs", # publish docs
493499
"shell:commitBuild", # commit dist files
494500
"bumpBower", # bump bower version
495501
"release", # create tag and version
@@ -498,8 +504,8 @@ module.exports = (grunt) ->
498504
"concat:s3Version", # apply version numbers for cdn
499505
"shell:loadEnvVariables", # load aws keys for deployment
500506
"s3:production" # publish files to s3 for cdn
507+
"shell:docs", # publish docs
501508
]
502509
else
503-
["newer:jshint",
504-
"test",
510+
["test",
505511
"build"]

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "alchemyjs",
3-
"version": "0.1.2",
3+
"version": "0.2.0",
44
"main": [
55
"dist/alchemy.min.css",
66
"dist/alchemy.min.js"

0 commit comments

Comments
 (0)