Merge pull request #15 from sir-dunxalot/v1

V1

.editorconfig

@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 

.npmignore

@@ -0,0 +1,13 @@
+bower_components/
+tests/
+tmp/
+
+.bowerrc
+.editorconfig
+.ember-cli
+.travis.yml
+.npmignore
+**/.gitkeep
+bower.json
+Brocfile.js
+testem.json

.travis.yml

@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 

Brocfile.js

@@ -2,28 +2,29 @@
 /* global require, module */
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+var environment = process.env.EMBER_ENV;
 
-var app = new EmberAddon({
+var options = {
   storeConfigInMeta: false,
   fingerprint: {
-    enabled: true,
+    enabled: false,
   },
   emberCliConcat: {
     /* Test custom options here */
   }
-});
+};
 
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
+if (environment === 'production') {
+  options.emberCliConcat = {
+    css: {
+      concat: true
+    },
+    js: {
+      concat: true
+    }
+  }
+}
+
+var app = new EmberAddon(options);
 
 module.exports = app.toTree();

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014
+Copyright (c) 2015
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,52 +1,32 @@
-Ember-cli-concat [![Build Status](https://travis-ci.org/sir-dunxalot/ember-cli-concat.svg?branch=develop)](https://travis-ci.org/sir-dunxalot/ember-cli-concat) [![Ember Addon](https://s3.amazonaws.com/images.jebbit.com/ember/badge.svg)](//emberaddons.com)
+Ember-cli-concat [![Build Status](https://travis-ci.org/sir-dunxalot/ember-cli-concat.svg?branch=develop)](https://travis-ci.org/sir-dunxalot/ember-cli-concat)
 ======
 
-Ember CLI Concat is an Ember addon that concatinates Ember CLI's app and vendor files into a single JS file and a single CSS file in production environments. In other words, less HTTP requests and a faster page load speed!
-
-By default:
-- In production environments:
-  - `vendor.css` and `app-name.css` will become `app.css`
-  - `vendor.js` and `app-name.js` will become `app.js`
-- In all environments:
-  - Only the relevant `<script>` and `<link rel="stylesheet">` will be added to your index.html file so you don't have to worry about requesting assets that don't exist
-  - Source maps will be produced
-
-**By default, concatenation only takes place in production builds**
+Ember CLI Concat is an Ember addon that can concatinate Ember CLI's app and vendor files into a single JS file and a single CSS file in a specified environment. In other words, less HTTP requests and a faster page load speed!
 
 
 ## Contents
 
 - [Installation](#installation)
 - [Documentation](#documentation)
-- [Features in the Works](#features-in-the-works)
 - [Issues](#issues)
 - [Development](#development)
 - [Inspirational quotation](#inspirational-quotation)
 
-
 ## Installation
 
 ```
-npm install --save-dev ember-cli-concat
+ember install ember-cli-concat
 ```
 
-Once you have installed the NPM module you must follow the [setup instructions]() to make sure your `index.html` files are not requesting resources you don't need.
-
+Once you have installed the NPM module you must follow the [setup instructions](https://github.com/sir-dunxalot/ember-cli-concat/wiki/Installation) to make sure your `index.html` files are not requesting resources you don't need for each environment.
 
 ## Documentation
 
 Documentation including installation, usage, and customizable options is available [in the wiki](https://github.com/sir-dunxalot/ember-cli-concat/wiki).
 
-
-## Features in the Works
-
-- Better test suite
-
-
 ## Issues
 
-If you have any issues or feature requests/ideas, please [open an issue](https://github.com/sir-dunxalot/ember-flash-messages/issues/new) or submit a PR.
-
+If you have an issues or feature requests, please [open an issue](https://github.com/sir-dunxalot/ember-flash-messages/issues/new) or submit a PR.
 
 ## Development
 
@@ -62,18 +42,6 @@ The test suite can be ran as follows:
 ember test
 ```
 
-### Working on wiki documentation:
-
-Clone the repo as above. Then run:
-
-```shell
-cd docs
-git submodule update --init --recursive # Updates submodule
-```
-
-You can open a PR to the documentation, as usual. Please note it is technically a seperate git repo.
-
-
 ## Inspirational Quotation
 
 "Drink beer and party" - Steve Jobs

bower.json

@@ -1,17 +1,16 @@
 {
   "name": "ember-cli-concat",
   "dependencies": {
-    "handlebars": "~1.3.0",
+    "ember": "1.11.1",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.1",
+    "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
     "jquery": "^1.11.1",
-    "ember": "1.8.1",
-    "ember-data": "1.0.0-beta.12",
-    "ember-resolver": "~0.1.11",
-    "loader.js": "stefanpenner/loader.js#1.0.1",
-    "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
-    "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.1.8",
-    "ember-qunit-notifications": "0.0.4",
-    "qunit": "~1.15.0"
+    "loader.js": "ember-cli/loader.js#3.2.0",
+    "qunit": "~1.17.1"
   }
 }