Merge pull request #4 from gdotdesign/env

Support for different environments.
gdotdesign · Jan 19, 2016 · 59f99dc · 59f99dc
2 parents 294f342 + c6cedb2
commit 59f99dc
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 13 deletions.
diff --git a/bin/assets/scaffold/config/development.json b/bin/assets/scaffold/config/development.json
@@ -0,0 +1,3 @@
+{
+  "key": "value"
+}
diff --git a/bin/elm-ui.js b/bin/elm-ui.js
@@ -169,11 +169,28 @@ renderElm = function(file) {
   }
 }
 
-renderHtml = function() {
+readConfig = function(options){
+  var file = path.resolve(`config/${options.env}.json`)
+  var data;
+
+  try {
+    data = JSON.parse(fs.readFileSync(file, 'utf-8'))
+  } catch (e) {
+    console.log("Error reading environment configuration:\n  > " + e)
+    data = {}
+  }
+
+  return data;
+}
+
+renderHtml = function(config) {
   return `<html>
     <head>
     </head>
     <body style="overflow: hidden;margin:0;">
+      <script>
+        window.ENV = ${JSON.stringify(config)}
+      </script>
       <script src='main.js' type='application/javascript'>
       </script>
       <script>Elm.fullscreen(Elm.Main);</script>
@@ -205,13 +222,13 @@ buildElm = function() {
   }
 }
 
-buildHtml = function() {
+buildHtml = function(config) {
   var destination = path.resolve('dist/index.html')
 
   return function(callback) {
     console.log('Building HTML...')
 
-    fs.writeFileSync(destination, renderHtml())
+    fs.writeFileSync(destination, renderHtml(config))
 
     callback(null, null);
   }
@@ -263,16 +280,18 @@ exports.scaffold = function(directory) {
   if (fs.existsSync(elmUiConfig)) {
     return;
   }
+
   fs.writeFileSync(elmUiConfig, JSON.stringify(defaultEmlPackage(), null, "  "))
 }
 
-exports.serve = function() {
+exports.serve = function(options) {
   var router = require('koa-router')();
   var serve = require('koa-static');
   var app = require('koa')();
+  var config = readConfig(options);
 
   router.get('/', function*(next) {
-    this.body = renderHtml()
+    this.body = renderHtml(config)
   })
 
   router.get('/main.js', function*(next) {
@@ -325,8 +344,9 @@ exports.install = function() {
     })
 }
 
-exports.build = function() {
+exports.build = function(options) {
   var destination = path.resolve('dist')
+  var config = readConfig(options);
 
   // Ensure destination
   if (!fs.existsSync(destination)) {
@@ -336,9 +356,9 @@ exports.build = function() {
   // Build things with async
   async.series([
     copyPublic(),
-    buildHtml(path.join(destination, 'index.html')),
-    buildElm(path.join(destination, 'main.js')),
-    buildCSS(path.join(destination, 'main.css'))
+    buildHtml(config),
+    buildElm(),
+    buildCSS()
   ], function(err, results) {
     if (err) {
       console.error(err)

diff --git a/bin/index.js b/bin/index.js
@@ -6,8 +6,13 @@ var elmUi = require('./elm-ui')
 var path = require('path')
 var fs = require('fs')
 
+var options = function(){
+  return { env: program.env }
+}
+
 program
   .version('0.0.1')
+  .option('-e, --env [env]', 'Environment', 'development')
 
 program
   .command('install')
@@ -27,14 +32,14 @@ program
   .command('server')
   .description('Starts development server')
   .action(function(env, opts){
-    elmUi.serve()
+    elmUi.serve(options())
   })
 
 program
   .command('build')
   .description('Builds final files')
   .action(function(env, opts){
-    elmUi.build()
+    elmUi.build(options())
   })
 
-program.parse(process.argv);
+program.parse(process.argv)
diff --git a/elm-package.json b/elm-package.json
@@ -42,7 +42,8 @@
     "Ui.Helpers.Drag",
     "Ui.Helpers.Animation",
     "Ui.Helpers.Dropdown",
-    "Ui.Helpers.Intendable"
+    "Ui.Helpers.Intendable",
+    "Ui.Utils.Env"
   ],
   "dependencies": {
     "circuithub/elm-number-format": "1.0.2 <= v < 2.0.0",

diff --git a/source/Native/Env.js b/source/Native/Env.js
@@ -0,0 +1,16 @@
+Elm.Native.Env = {};
+Elm.Native.Env.make = function(elm) {
+  elm.Native = elm.Native || {};
+  elm.Native.Env = elm.Native.Env || {};
+  if (elm.Native.Env.values) {return elm.Native.Env.values; }
+
+  /* Gets a value from the ENV. */
+  function get(key){
+    return window.ENV && window.ENV[key]
+  }
+
+  /* Interface. */
+  return elm.Native.Env.values = {
+    get: get
+  };
+};
diff --git a/source/Ui/Utils/Env.elm b/source/Ui/Utils/Env.elm
@@ -0,0 +1,27 @@
+module Ui.Utils.Env where
+
+{-| Module for interacting with the environment variables.
+
+@docs get
+-}
+import Json.Decode as Json
+import Native.Env
+import Debug
+
+{-| Gets the value of the given environment variable with a decoder and a
+default value. -}
+get : String -> a -> Json.Decoder a -> a
+get key default decoder =
+  let
+    value = Native.Env.get key
+  in
+    case Json.decodeValue decoder value of
+      Ok data -> data
+      Err msg ->
+        let
+          log =
+            Debug.log
+              ("Error getting ENV value '" ++ key ++ "'")
+              msg
+        in
+          default