Skip to content

Commit

Permalink
fine tuning docs build process + updating styles
Browse files Browse the repository at this point in the history
  • Loading branch information
huston committed Aug 18, 2014
1 parent 0022106 commit c5c6476
Show file tree
Hide file tree
Showing 21 changed files with 614 additions and 4,145 deletions.
32 changes: 19 additions & 13 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ module.exports = (grunt) ->
require("load-grunt-tasks") grunt
require("time-grunt") grunt
pkg = grunt.file.readJSON('./package.json')
s3Config = grunt.file.readYAML('./s3.yml')
grunt.initConfig


if grunt.file.isFile('./s3.yml')
s3Config = grunt.file.readYAML('./s3.yml')
key_id = s3Config.AWS_ACCESS_KEY_ID
secret = s3Config.AWS_SECRET_ACCESS_KEY
else
key_id = ''
secret = ''

grunt.initConfig
# Project settings
yeoman:

Expand All @@ -23,8 +30,8 @@ module.exports = (grunt) ->
s3:
options:
#Accesses environment variables
key: s3Config.AWS_ACCESS_KEY_ID
secret: s3Config.AWS_SECRET_ACCESS_KEY
key: key_id
secret: secret
access: 'public-read'
production:
bucket: "cdn.graphalchemist.com"
Expand All @@ -51,13 +58,14 @@ module.exports = (grunt) ->
file: 'package.json'
bump: false
commit: false
npm: false

# shell tasks
shell:
commitBuild:
command: "git commit -am 'commit dist files for #{pkg.version}'"
command: "git add -A && git commit -am 'commit dist files for #{pkg.version}'"
docs:
command: 'grunt --gruntfile site/Gruntfile.js'
command: 'grunt --gruntfile site/Gruntfile.coffee'
loadEnvVariables:
command: 'source s3.sh'

Expand Down Expand Up @@ -131,7 +139,7 @@ module.exports = (grunt) ->
jshintrc: ".jshintrc"
reporter: require("jshint-stylish")

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


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

grunt.registerTask "default",
if releaseFlag
["newer:jshint",
"test",
["test",
"build",
"string-replace", # apply version to alchemy.js
"shell:docs", # publish docs
"shell:commitBuild", # commit dist files
"bumpBower", # bump bower version
"release", # create tag and version
Expand All @@ -498,8 +504,8 @@ module.exports = (grunt) ->
"concat:s3Version", # apply version numbers for cdn
"shell:loadEnvVariables", # load aws keys for deployment
"s3:production" # publish files to s3 for cdn
"shell:docs", # publish docs
]
else
["newer:jshint",
"test",
["test",
"build"]
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alchemyjs",
"version": "0.1.2",
"version": "0.2.0",
"main": [
"dist/alchemy.min.css",
"dist/alchemy.min.js"
Expand Down
Loading

0 comments on commit c5c6476

Please sign in to comment.