Skip to content

Commit

Permalink
Upgrading to Ember-Cli-2.14.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Sep 20, 2017
1 parent fbfb528 commit 19ad3e0
Show file tree
Hide file tree
Showing 30 changed files with 15,032 additions and 197 deletions.
14 changes: 0 additions & 14 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
12 changes: 12 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {}
};
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -13,9 +13,11 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
yarn-error.log
testem.log

# IDE

.idea
# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
---
language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"

sudo: false

cache:
directories:
- node_modules
- $HOME/.npm

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-1.13
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
Expand All @@ -23,14 +28,15 @@ matrix:

before_install:
- npm config set spin false
- npm install -g bower
- npm install phantomjs-prebuilt
- npm install -g npm@4
- npm --version
- npm install -g phantomjs-prebuilt
- phantomjs --version

install:
- npm install
- bower install

script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- ember try $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
98 changes: 74 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# ember-cli-bootstrap3-tooltip [![GitHub version](https://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip.svg)](https://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip)
# ember-cli-bootstrap3-tooltip [![GitHub version](http://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip.svg)](http://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip) ![](http://embadge.io/v1/badge.svg?start=1.13.0)

[![npm version](https://badge.fury.io/js/ember-cli-bootstrap3-tooltip.svg)](https://badge.fury.io/js/ember-cli-bootstrap3-tooltip) [![CircleCI](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip.svg?style=shield)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip) [![Code Climate](https://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-tooltip/badges/gpa.svg)](https://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-tooltip) ![Dependencies](https://david-dm.org/cybertoothca/ember-cli-bootstrap3-tooltip.svg) [![ember-observer-badge](http://emberobserver.com/badges/ember-cli-bootstrap3-tooltip.svg)](http://emberobserver.com/addons/ember-cli-bootstrap3-tooltip) [![License](https://img.shields.io/npm/l/ember-cli-bootstrap3-tooltip.svg)](LICENSE.md)
[![npm version](http://badge.fury.io/js/ember-cli-bootstrap3-tooltip.svg)](http://badge.fury.io/js/ember-cli-bootstrap3-tooltip) ![downloads](https://img.shields.io/npm/dy/ember-cli-bootstrap3-tooltip.svg) [![CircleCI](http://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip.svg?style=shield)](http://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip) [![Code Climate](http://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-tooltip/badges/gpa.svg)](http://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-tooltip) ![Dependencies](http://david-dm.org/cybertoothca/ember-cli-bootstrap3-tooltip.svg) [![ember observer](http://emberobserver.com/badges/ember-cli-bootstrap3-tooltip.svg)](http://emberobserver.com/addons/ember-cli-bootstrap3-tooltip) [![License](http://img.shields.io/npm/l/ember-cli-bootstrap3-tooltip.svg)](LICENSE.md)

This addon provides several components that will generate [Bootstrap
Tooltips](http://getbootstrap.com/javascript/#tooltips) from the
given element's title attribute. Also provided is a mixin that
can be used to enable the Bootstrap Tooltip in your new or existing
components.
This addon allows you to quickly and conveniently create a [Bootstrap3 Tooltip](https://getbootstrap.com/docs/3.3/javascript/#tooltips).

__You must have Bootstrap 3.x installed in your Ember application.__
Feel free to use the
[ember-cli-bootstrap3-sass](https://emberobserver.com/addons/ember-cli-bootstrap3-sass)
addon to setup Bootstrap if you haven't already done so.
## Tested Against

[![ember-lts-2.4](https://img.shields.io/badge/ember--try-ember--lts--2.4-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)
[![ember-lts-2.8](https://img.shields.io/badge/ember--try-ember--lts--2.8-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)
[![ember-lts-2.12](https://img.shields.io/badge/ember--try-ember--lts--2.12-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)

[![ember-release](https://img.shields.io/badge/ember--try-ember--release-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)
[![ember-beta](https://img.shields.io/badge/ember--try-ember--beta-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)
[![ember-canary](https://img.shields.io/badge/ember--try-ember--canary-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-tooltip)

## Demo

The demonstration web application can be found here:
[http://ember-cli-bootstrap3-tooltip.cybertooth.io/](http://ember-cli-bootstrap3-tooltip.cybertooth.io/).

## What Does This Addon Do?

Expand All @@ -38,20 +44,25 @@ section below._

* Ember >= 1.13.0
* Ember CLI
* You must have Bootstrap 3.x installed in your Ember application. Feel free to use the
[ember-cli-bootstrap3-sass](http://emberobserver.com/addons/ember-cli-bootstrap3-sass)
addon to setup Bootstrap if you haven't already done so.
* Tooltips require the _tooltip_ plugin to be included in your version of Bootstrap.

## Installation

The following will install this addon:

$ ember install ember-cli-bootstrap3-tooltip
```
ember install ember-cli-bootstrap3-tooltip
```

__As mentioned you must install some version of Bootstrap3 in your
Ember application should you want this to work.__
__As mentioned, you must install Bootstrap3 along with the tooltip plugin. See the requirements section above.__

### Upgrading

When working through the Ember upgrade process, I recommend
invoking the `ember install ember-cli-bootstrap3-tooltip` command once
invoking the `ember install ember-cli-bootstrap3-tooltip` command once
you are done to get the latest version of the addon.

## Usage
Expand Down Expand Up @@ -154,16 +165,31 @@ Ember.
time, you will want to bind a function to
the mixin's `defaultTitle` property and __NOT__ specify a `title`
argument.
1. Bootstrap3 CSS and the tooltip Javascript plugin must be installed.

---

# Ember Addon Building And Testing

## Setup

* `git clone [email protected]:cybertoothca/ember-cli-bootstrap3-tooltip.git`
* `npm install`
* `bower install`
### Checkout

```
$ git clone [email protected]:cybertoothca/ember-cli-bootstrap3-tooltip.git
```

### With NPM

```
npm install
```

### With Yarn

```
yarn
```

## Running The Dummy Application

Expand All @@ -186,16 +212,16 @@ For more information on using ember-cli, visit [http://ember-cli.com/](http://em

## Linking

1. From the command line at the root of __this__ project run the
`npm link` command to _link_ this addon within your local
1. From the command line at the root of __this__ project run the
`npm link` command to _link_ this addon within your local
node repository.
1. From the _other_ Ember project that you wish to test this addon
1. From the _other_ Ember project that you wish to test this addon
in, execute the following command:
`npm link ember-cli-bootstrap3-tooltip`.
1. Now in that same _other_ Ember project, you should go into the
`package.json` and add the ember addon with the version _*_. It will
look something like this: `"ember-cli-bootstrap3-tooltip": "*"`. Now
when/if you execute `npm install` on this _other_ project it
when/if you execute `npm install` on this _other_ project it
will know to look for the linked addon rather than fetch it from
the central repository.

Expand All @@ -204,6 +230,30 @@ the central repository.
1. Remove the addon from your local node repository with the following
command (that can be run anywhere):
`npm uninstall -g ember-cli-bootstrap3-tooltip`
1. Remove the reference to the `ember-cli-bootstrap3-tooltip`
1. Remove the reference to the `ember-cli-bootstrap3-tooltip`
in your _other_ project's `package.json`.
1. Run an `npm prune` from the root of your _other_ project's command line.
1. Run an `npm prune` and `bower prune` from the root of your _other_ project's command line.

# Deploying The Dummy Application

Make sure your `~/.aws/credentials` file has a profile named _cybertooth_
with a valid key and secret,

```
[cybertooth]
aws_access_key_id = <KEY>
aws_secret_access_key = <SECRET>
```

Deploy by invoking the following command: `ember deploy production`

Confirm your changes are showing up in our S3 container: http://ember-cli-bootstrap3-tooltip.cybertooth.io/

# Releasing & Publishing To NPM

```
npm version x.y.z-sub.#
git push
git push --tags
npm publish
```
7 changes: 2 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"name": "ember-cli-bootstrap3-tooltip",
"dependencies": {
"ember": "~2.6.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0",
"bootstrap-sass": "^3.3.7"
"bootstrap-sass": "^3.3.7",
"font-awesome": "^4.7.0"
}
}
21 changes: 18 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
machine:
node:
version: 4
version: 6

dependencies:
cache_directories:
- '~/.npm'
- '~/.cache' # includes bower & yarn
pre:
# Turn off npm spinner & feedback
- npm config set spin false
post:
- npm install -g bower
- npm install phantomjs-prebuilt
# This makes sure Chrome is always up to date in your test suite
# On average this adds about 10 seconds to your build suite
# Be sure to use Ubuntu 14.04 (Trusty) in the CircleCI's OS setting (Settings > Build Environment)
# @see https://gist.github.com/Arjeno/8564d9643f16d072a85b9c9b5a9f7de0
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome.deb
- sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
- rm google-chrome.deb
post:
- bower install
test:
override:
- case $CIRCLE_NODE_INDEX in 0) node_modules/.bin/ember try:one ember-lts-2.4 --skip-cleanup && node_modules/.bin/ember try:one ember-lts-2.8 --skip-cleanup; ;; 1) node_modules/.bin/ember try:one ember-lts-2.12 --skip-cleanup && node_modules/.bin/ember try:one ember-default --skip-cleanup ;; 2) node_modules/.bin/ember try:one ember-release --skip-cleanup && node_modules/.bin/ember try:one ember-beta --skip-cleanup ;; 3) node_modules/.bin/ember try:one ember-canary --skip-cleanup ;; esac:
parallel: true
26 changes: 26 additions & 0 deletions config/deploy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* eslint-env node */

module.exports = function (/*deployTarget*/) {
let ENV = {
build: {
environment: 'production'
},
// include other plugin configuration that applies to all deploy targets here
s3: {
bucket: 'ember-cli-bootstrap3-tooltip.cybertooth.io',
filePattern: '**/*.{js,css,png,gif,ico,jpg,map,xml,txt,svg,swf,eot,ttf,woff,woff2,otf,html}',
profile: 'cybertooth',
region: 'us-west-2'
}
};

// if (deployTarget === 'production') {
// ENV.build.environment = 'production';
// configure other plugins for production deploy target here
// }

// Note: if you need to build some configuration asynchronously, you can return
// a promise that resolves with the ENV object instead of returning the
// ENV object synchronously.
return ENV;
};
Loading

0 comments on commit 19ad3e0

Please sign in to comment.