Announce Steve's Factory Manager

fixes #294

.gitignore

@@ -1,9 +1,12 @@
 *.log
+*.swp
 .DS_Store
+.env
 .sass-cache
+.tm_properties
 aws.config
 build
 deploy
 dist
 node_modules
-src/coffee/views.js
+templates.js

.ruby-version

@@ -0,0 +1 @@
+2.2.0

Gruntfile.coffee

@@ -1,62 +1,73 @@
-###
+#
 # Crafting Guide - Gruntfile.coffee
 #
-# Copyright (c) 2014 by Redwood Labs
+# Copyright © 2014-2017 by Redwood Labs
 # All rights reserved.
-###
+#
 
 fs = require 'fs'
-util = require 'util'
 
-########################################################################################################################
+EXTERNAL_LIBS = [
-
+    'backbone'
-LIBRARY_ALIAS_MAPPING = [
+    'jquery'
-    './node_modules/backbone/backbone.js:backbone'
+    'marked'
-    './node_modules/jade/runtime.js:jade'
+    'underscore'
-    './node_modules/jquery/dist/jquery.js:jquery'
+    'underscore.inflections'
-    './node_modules/underscore/underscore.js:underscore'
+    'when'
-    './node_modules/when/when.js:when'
+    './vendor/email.js:emailjs'
 ]
 
-LIBRARIES = (s.substring(0, s.indexOf(':')) for s in LIBRARY_ALIAS_MAPPING)
+########################################################################################################################
-ALIASES = (s.substring(s.indexOf(':') + 1) for s in LIBRARY_ALIAS_MAPPING)
 
 module.exports = (grunt)->
 
     grunt.loadTasks tasks for tasks in grunt.file.expand './node_modules/grunt-*/tasks'
 
     grunt.config.init
-        browserify:
-            dev:
-                options:
-                    browserifyOptions:
-                        debug: true
-                        extensions: ['.coffee']
-                    transform: ['coffeeify']
-                files: './dist/js/main.js': ['./src/coffee/main.coffee']
-            prod:
-                options:
-                    browserifyOptions:
-                        extensions: ['.coffee']
-                    transform: ['coffeeify']
-                files: './dist/js/main.js': ['./src/coffee/main.coffee']
 
-        coffee:
+        compress:
-            dev:
+            static:
                 options:
-                    sourceMap: true
+                    mode: 'gzip'
-                files: [expand:true, cwd:'./src/coffee', src:'**/*.coffee', dest:'./dist', ext:'.js']
+                files: [
-
+                    {expand: true, cwd:'./build/static', src:'**/*.css',     dest:'./dist/'}
-        clean:
+                    {expand: true, cwd:'./build/static', src:['**/*.html', '!**/index.html'], dest:'./dist/'}
-            dist: ['./dist']
+                    {expand: true, cwd:'./build/static', src:'**/*.ugly.js', dest:'./dist/', ext: '.js'}
+                    {expand: true, cwd:'./build/static', src:'**/*.json',    dest:'./dist/'}
+                    {expand: true, cwd:'./build/static', src:'**/*.ttf',     dest:'./dist/'}
+                    {expand: true, cwd:'./build/static', src:'**/*.txt',     dest:'./dist/'}
+                ]
 
         copy:
-            styles:
+            assets_build:
-                files: [expand:true, cwd:'./src/css', src:'**/*.scss', dest:'./dist/src/css']
+                files: [
+                    {expand:true, cwd:'./assets/', src:'**/*', dest:'./build/static'}
+                ]
+            env_build:
+                files: [
+                    {expand:true, cwd:'.', src:'.env', dest:'./build'}
+                ]
+            build_to_dist:
+                files: [
+                    expand: true
+                    cwd: './build/static/'
+                    src: ['**/*', '!**/*.map', '!**/*.js', '!index.html']
+                    dest: './dist'
+                ]
+            common_source:
+                files: [
+                    {expand:true, cwd:'./src/common', src:'**/*.coffee', dest:'./build', ext:'.coffee'}
+                ]
+            server_source:
+                files: [
+                    {expand:true, cwd:'./src/server', src:'**/*.coffee', dest:'./build', ext:'.coffee'}
+                ]
 
-        exorcise:
+        clean:
-            dev:
+            assets:    ['./build/static/data', './build/static/images']
-                files: './dist/js/main.js.map': ['./dist/js/main.js']
+            build:     ['./build']
+            dist:      ['./dist']
+            templates: ['./src/client/site/templates.js']
 
         jade:
             pages:
@@ -64,53 +75,53 @@ module.exports = (grunt)->
                     pretty: true
                 files: [
                     expand: true
-                    cwd: './src/jade'
+                    cwd:  './src/client/site'
-                    src: '*.jade'
+                    src:  '**/index.jade'
-                    dest: './dist'
+                    dest: './build/static'
                     ext:  '.html'
                 ]
-
             templates:
                 options:
                     client: true
                     node: true
-                    processName: (f)->
+                    processName: (path)->
-                        f = f.replace './src/jade/templates/', ''
+                        pathElements = path.split '\/'
-                        f = f.replace '.jade', ''
+                        while true
-                        f = f.replace /\//g, '_'
+                            element = pathElements.shift()
-                        return f
+                            break if element is 'site'
+                        pathElements.pop()
+                        name = pathElements.join '/'
+                        name = name.replace '.jade', ''
+                        return name
                 files:
-                    './src/coffee/views.js': ['./src/jade/templates/**/*.jade']
+                    './src/client/site/templates.js': ['./src/client/site/**/!(index)*.jade']
 
         mochaTest:
             options:
-                bail:     true
+                bail:     false
                 color:    true
-                reporter: 'dot'
+                reporter: 'list'
                 require: [
                     'coffee-script/register'
-                    './test/test_helper.coffee'
+                    './src/test_helper.coffee'
                 ]
                 verbose: true
-            src: ['./test/**/*.test.coffee']
+            src: ['./src/**/*.test.coffee']
-
-        rsync:
-            static:
-                options:
-                    src: './static/'
-                    dest: './dist/'
-                    recursive: true
 
         sass:
-            build:
+            all:
-                files:
-                    './dist/css/main.css': ['./src/scss/main.scss']
-            dist:
                 options:
                     sourcemap: 'none'
-                    style: 'compressed'
                 files:
-                    './dist/css/main.css': ['./src/scss/main.scss']
+                    './build/static/main.css': [ './build/imports.scss' ]
+
+        sass_globbing:
+            all:
+                files:
+                    './build/imports.scss': [
+                        './src/client/styles/main.scss'
+                        './src/client/site/**/*.scss'
+                    ]
 
         uglify:
             scripts:
@@ -118,46 +129,150 @@ module.exports = (grunt)->
                     maxLineLen: 20
                 files: [
                     expand: true
-                    cwd: './dist/js'
+                    cwd:  './build/static'
                     src:  '**/*.js'
-                    dest: './dist/js'
+                    dest: './build/static'
+                    ext:  '.ugly.js'
                 ]
 
         watch:
-            static:
+            assets:
-                files: ['./static/**/*']
+                files: ['./assets/**/*']
-                tasks: ['rsync:static']
+                tasks: ['copy:assets_build']
-            coffee:
+            client_source:
-                files: ['./src/**/*.coffee', './src/**/*.js']
+                files: ['./src/{client,common}/**/*.coffee']
-                tasks: ['browserify:dev', 'exorcise']
+                tasks: ['browserify:internal']
-            jade:
+            server_source:
-                files: ['./src/**/*.jade']
+                files: ['./src/{common,server}/**/*.coffee']
-                tasks: ['jade:pages', 'jade:templates']
+                tasks: ['copy:server_source']
+            jade_pages:
+                files: ['./src/**/index.jade']
+                tasks: ['jade:pages']
+            jade_templates:
+                files: ['./src/**/!(index).jade']
+                tasks: ['jade:templates', 'browserify:internal']
             sass:
                 files: ['./src/**/*.scss']
-                tasks: ['sass', 'copy:styles']
+                tasks: ['sass']
             test:
                 files: ['./src/**/*.coffee', './src/**/*.js', './test/**/*.coffee']
-                tasks: ['test']
+                tasks: ['script:clear', 'test']
 
-    grunt.registerTask 'default', 'build'
+    # Compound Tasks ###################################################################################################
 
-    grunt.registerTask 'build', ['rsync', 'sass:build', 'jade', 'copy', 'browserify:dev', 'exorcise']
+    grunt.registerTask 'build', 'build the project to be run from a local server',
+        ['jade', 'build:copy', 'build:css', 'browserify:external', 'browserify:internal']
 
-    grunt.registerTask 'dist', ['rsync', 'sass:dist', 'jade', 'copy', 'browserify:prod', 'uglify']
+    grunt.registerTask 'build:copy', 'helper task for build',
+        ['copy:assets_build', 'copy:env_build', 'copy:common_source', 'copy:server_source']
 
-    grunt.registerTask 'prepublish', ['clean', 'coffee']
+    grunt.registerTask 'build:css', 'helper task for build',
+        ['sass_globbing', 'sass']
 
-    grunt.registerTask 'use-local-deps', ->
+    grunt.registerTask 'default', 'rebuild the project from scratch and start a local HTTP server',
-        grunt.file.mkdir './node_modules'
+        ['clean', 'start']
-        grunt.file.delete './node_modules/crafting-guide-common', force:true
-        fs.symlinkSync '../../crafting-guide-common/', './node_modules/crafting-guide-common'
 
-    grunt.registerTask 'test', ['mochaTest']
+    grunt.registerTask 'deploy', 'deploy to both staging and production via CircleCI',
+        ['deploy:staging', 'deploy:prod']
 
-    grunt.registerTask 'watch-dev', ['clean', 'build', 'watch']
+    grunt.registerTask 'deploy:prod', 'deploy the project to production via CircleCI',
+        ['script:deploy:prod']
 
-    grunt.registerTask 'watch-test', ['clean', 'build', 'watch:test']
+    grunt.registerTask 'deploy:staging', 'deploy the project to staging via CircleCI',
+        ['script:deploy:staging']
+
+    grunt.registerTask 'dist', 'build the project to be run from Amazon S3',
+        ['build', 'copy:build_to_dist', 'uglify', 'compress']
+
+    grunt.registerTask 'publish', 'publish the project to NPM',
+        ['prepublish', 'script:publish', 'clean', 'build']
+
+    grunt.registerTask 'start', 'build the project and start a local HTTP server',
+        ['script:start']
+
+    grunt.registerTask 'test', 'run unit tests',
+        ['mochaTest']
+
+    grunt.registerTask 'upload:prod', 'upload the project to the production Amazon S3 environment',
+        ['dist', 'script:s3_upload:prod']
+
+    grunt.registerTask 'upload:staging', 'upload the project the staging Amazon S3 environment',
+        ['dist', 'script:s3_upload:staging']
+
+    grunt.registerTask 'use-local-deps', 'use local dependencies instead of NPM dependencies',
+        ['script:use_local_deps']
+
+    # Code Tasks #######################################################################################################
+
+    grunt.registerTask 'browserify:external', "Bundle 3rd-party libraries used in the app", ->
+        grunt.file.mkdir './build/static'
+        done = this.async()
+
+        args = [].concat ("--require=#{lib}" for lib in EXTERNAL_LIBS), [
+            '--outfile=./build/static/external.js'
+        ]
+
+        options = cmd:'browserify', args:args
+        grunt.util.spawn options, (error)->
+            console.log error if error?
+            done()
+
+    grunt.registerTask 'browserify:internal', "Bundle source files needed in the browser", ->
+        grunt.file.mkdir './build/static'
+        done = this.async()
+
+        libs = []
+        for lib in EXTERNAL_LIBS
+            parts = lib.split ':'
+            libs.push parts[parts.length-1]
+
+        args = [].concat ("--external=#{lib}" for lib in libs), [
+            '--extension=.coffee'
+            '--outfile=./build/static/internal.js'
+            '--transform=coffeeify'
+            './src/client/client.coffee'
+        ]
+
+        options = cmd:'browserify', args:args
+        grunt.util.spawn options, (error)->
+            console.log error if error?
+            done()
+
+    # Script Tasks #####################################################################################################
+
+    grunt.registerTask 'script:clear', "clear the current terminal buffer", ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/clear_buffer', opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:deploy:prod', "deploy code by copying to the production branch", ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/deploy', args:['--prod'], opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:deploy:staging', "deploy code by copying to the staging branch", ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/deploy', args:['--staging'], opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:publish', 'publishes this package to NPM', ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/publish', opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:s3_upload:prod', 'uploads all static content to S3', ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--prod'], opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:s3_upload:staging', 'uploads all static content to S3', ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--staging'], opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:start', "start a local HTTP server on port 8080", ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/start', opts:{stdio:'inherit'}, (error)-> done(error)
+
+    grunt.registerTask 'script:use_local_deps', "use local dependencies instead of NPM dependencies", ->
+      done = this.async()
+      grunt.util.spawn cmd:'./scripts/use_local_deps', opts:{stdio:'inherit'}, (error)-> done(error)
+
+    # Command-Line Argument Processing #################################################################################
 
     args = process.argv[..]
     while args.length > 0

README.md

@@ -2,8 +2,6 @@
 
 Crafting Guide is the ultimate step-by-step guide for making anything in Minecraft. From the your first [crafting table](http://crafting-guide.com/item/crafting_table) all the way up to your IndustrialCraft2 [QuantumSuit Bodyarmor](http://crafting-guide.com/item/quantumsuit_bodyarmor), Crafting Guide breaks down the recipes to raw ingredients and displays step-by-step instructions for what to craft, how much to craft, and in what order.  It also supports crafting multiple items at once, and can even include crafting the necessary tools in the step-by-step instructions.
 
-**Check out the [Trello Board](https://trello.com/b/s9N0aTYd/crafting-guide) to see what's coming up!**
-
 ## Adding new features
 
 If there's something you'd like to see Crafting Guide do, feel free to open an issue against this project. Be sure to describe exactly what you have in mind, and explain why you think it would benefit everyone who uses Crafting Guide.  If you like, you can even clone the repository and get started on implementing it yourself!

assets/google077275160ac09f2f.html

@@ -0,0 +1 @@
+google-site-verification: google077275160ac09f2f.html

circle.yml

@@ -1,12 +1,15 @@
 dependencies:
     pre:
-        - gem install sass --version ">= 3.4"
+        - gem install sass --version "= 3.4"
+        - sudo -H pip install s3cmd
+        - npm install -g browserify
+        - npm install -g grunt-cli
 deployment:
     staging:
-        branch: master
+        branch: staging
         commands:
-            - ./scripts/deploy --staging
+            - grunt upload:staging
     production:
         branch: production
         commands:
-            - ./scripts/deploy --production
+            - grunt upload:prod