Merge tag 'v2.7.0-beta.6'

CHANGELOG.md

@@ -1,5 +1,26 @@
 # ember-cli Changelog
 
+### 2.7.0-beta.6
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v2.7.0-beta.5...v2.7.0-beta.6)
+  + Upgrade your project's ember-cli version - [docs](http://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v2.7.0-beta.5...v2.7.0-beta.6)
+  + No changes required
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#6057](https://github.com/ember-cli/ember-cli/pull/6057) Ember & Ember Data beta version bumps. [@nathanhammond](https://github.com/nathanhammond)
+
+Thank you to all who took the time to contribute!
+
+
 ### 2.7.0-beta.5
 
 The following changes are required if you are upgrading from the previous

RELEASE.md

@@ -161,7 +161,10 @@ ember serve
 
 ### Update Artifacts
 
-[Update ember-new-output and ember-addon-output.](https://gist.github.com/nathanhammond/e0a55b4d0328b45b8ef5) Make sure to include the tag links in CHANGELOG.md.
+* if normal release
+  * run `./dev/add-to-output-repos.sh`
+* if beta release
+  * run `./dev/add-to-output-repos.sh beta`
 
 ### Publish
 

blueprints/app/files/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "<%= name %>",
   "dependencies": {
-    "ember": "~2.7.0-beta.3",
+    "ember": "~2.7.0-beta.4",
     "ember-cli-shims": "0.1.1",
     "ember-qunit-notifications": "0.1.0"
   }

blueprints/app/files/package.json

@@ -34,7 +34,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.7.0-beta.1",
+    "ember-data": "^2.7.0-beta.3",
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",

dev/add-to-output-repos.sh

@@ -0,0 +1,40 @@
+# so you can run this script from any folder and it will find the tmp dir
+cd "`git rev-parse --show-toplevel`"
+
+mkdir -p tmp
+cd tmp
+
+branch=stable
+if [ "$1" = "beta" ]; then
+  branch=master
+fi
+
+EMBERVERSION=`ember version | grep "ember-cli:" | cut -d' ' -f2`
+
+commands=(new addon)
+
+for i in ${commands[@]}; do
+  command=$i
+  repo_folder=ember-$command-output
+
+  local_folder=my-$command
+  if [ $command = new ]; then
+    local_folder=my-app
+  fi
+
+  git clone https://github.com/ember-cli/$repo_folder.git --branch $branch
+  pushd $repo_folder
+  git rm -rf .
+  ember new $local_folder -sb -sn -sg
+  cp -r $local_folder/ .
+  rm -r $local_folder
+
+  git add --all
+  git commit -m $EMBERVERSION
+  git tag "v"$EMBERVERSION
+  git push
+  git push --tags
+
+  popd
+  rm -rf $repo_folder
+done

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "2.7.0-beta.5",
+  "version": "2.7.0-beta.6",
   "main": "lib/cli/index.js",
   "description": "Command line tool for developing ambitious ember.js apps",
   "homepage": "http://ember-cli.com/",