From 388f59e7a73f985ec19f2ccc3c887ddbc5912c13 Mon Sep 17 00:00:00 2001 From: Zach Zibrat Date: Tue, 5 Jul 2016 18:20:18 -0700 Subject: [PATCH] sets up demo site (#17) closes #2 --- .gitignore | 3 +-- CHANGELOG.md | 1 + README.md | 32 +++++++++++++++---------------- config/ember-try.js | 11 ----------- config/release.js | 12 ++++++++++++ package.json | 10 +++++++--- tests/dummy/app/index.html | 2 +- tests/dummy/config/environment.js | 3 ++- tests/index.html | 2 +- 9 files changed, 40 insertions(+), 36 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.gitignore b/.gitignore index 36fdc5e..31fa636 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,5 @@ npm-debug.log testem.log /.vscode -.vscodeignore +.vscodeignore jsconfig.json -/typings diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..825c32f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ +# Changelog diff --git a/README.md b/README.md index e5441e4..384a828 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,26 @@ +# ember-sparkles + [![Build Status](https://travis-ci.org/LocusEnergy/ember-sparkles.svg?branch=master)](https://travis-ci.org/LocusEnergy/ember-sparkles) +[![npm version](https://badge.fury.io/js/ember-sparkles.svg)](http://badge.fury.io/js/ember-sparkles) +[![Dependency Status](https://david-dm.org/locusenergy/ember-sparkles.svg)](https://david-dm.org/locusenergy/ember-sparkles) +[![Ember Observer Score](http://emberobserver.com/badges/ember-sparkles.svg)](http://emberobserver.com/addons/ember-sparkles) -# Ember-sparkles +## Features -This README outlines the details of collaborating on this Ember addon. ## Installation -* `git clone` this repository -* `npm install` -* `bower install` - -## Running - -* `ember server` -* Visit your app at http://localhost:4200. +``` +ember install ember-sparkles +``` -## Running Tests +## Helpful Links -* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions) -* `ember test` -* `ember test --server` +- ### [Live Demo](http://locusenergy.github.io/ember-sparkles/) -## Building +- ### [Changelog](CHANGELOG.md) -* `ember build` +## Looking for help? +If it is a bug [please open an issue on GitHub](http://github.com/LocusEnergy/ember-sparkles/issues). -For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/). +## Usage diff --git a/config/ember-try.js b/config/ember-try.js index 014f603..be846e1 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,17 +7,6 @@ module.exports = { dependencies: { } } }, - { - name: 'ember-1.13', - bower: { - dependencies: { - 'ember': '~1.13.0' - }, - resolutions: { - 'ember': '~1.13.0' - } - } - }, { name: 'ember-release', bower: { diff --git a/config/release.js b/config/release.js index bc2288c..6b7f5a3 100644 --- a/config/release.js +++ b/config/release.js @@ -3,6 +3,18 @@ // For details on each option run `ember help release` module.exports = { + init: function() { + this._previousVersion = require('../package.json').version; + }, + + afterPush: function(project, tags) { + runCommand('ember genie:changelog --write=true --version=' + this._previousVersion + ' --new-version=' + tags.next, true); + }, + + afterPublish: function(project, versions) { + runCommand('ember github-pages:commit --message "Released ' + versions.next + '"', true); + runCommand('git push origin gh-pages:gh-pages', true); + }, // local: true, // remote: 'some_remote', // annotation: "Release %@", diff --git a/package.json b/package.json index 75da3d4..2df870c 100644 --- a/package.json +++ b/package.json @@ -9,13 +9,14 @@ "scripts": { "build": "ember build", "start": "ember server", - "test": "ember try:each" + "test": "ember try:each", + "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -" }, "repository": "https://github.com/LocusEnergy/ember-sparkles", "engines": { "node": ">= 0.10.0" }, - "author": "Zachary Zibrat, Taras Mankovski, Locus Energy", + "author": "zigahertz , embersherpa ", "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.4.2", @@ -24,6 +25,7 @@ "ember-cli-app-version": "^1.0.0", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-eslint": "1.6.0", + "ember-cli-github-pages": "0.1.0", "ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-qunit": "^2.0.0", @@ -39,6 +41,7 @@ "ember-interpolate-helper": "0.1.1", "ember-load-initializers": "^0.5.1", "ember-lodash": "0.0.7", + "ember-pagefront": "0.11.1", "ember-resolver": "^2.0.3", "loader.js": "^4.0.1" }, @@ -59,6 +62,7 @@ "ember-truth-helpers": "1.2.0" }, "ember-addon": { - "configPath": "tests/dummy/config" + "configPath": "tests/dummy/config", + "demoURL": "http://locusenergy.github.io/ember-sparkles/" } } diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 5120bd7..48ce246 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -3,7 +3,7 @@ - Dummy + Ember Sparkles diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 2529939..804460a 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -39,7 +39,8 @@ module.exports = function(environment) { } if (environment === 'production') { - + ENV.locationType = 'hash'; + ENV.rootURL = '/ember-sparkles/'; } return ENV; diff --git a/tests/index.html b/tests/index.html index b288dcd..b89438b 100644 --- a/tests/index.html +++ b/tests/index.html @@ -3,7 +3,7 @@ - Dummy Tests + Ember Sparkles