Skip to content

Commit

Permalink
Updated ember, ember data, handlebars and other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
minusfive committed Nov 28, 2014
1 parent 1569fcf commit 145c7dd
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 26 deletions.
22 changes: 14 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
# Emberman Changelog [![Gem Version](https://badge.fury.io/rb/emberman.svg)](http://badge.fury.io/rb/emberman)

### 0.1.2 (2014/11/28)
- Upgrade default Ember to [v1.9.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.9.0-beta.3/CHANGELOG.md)
- Upgrade default Ember Data to [v1.0.0.beta.12](https://github.com/emberjs/data/blob/v1.0.0-beta.12/CHANGELOG.md)
- Upgrade default Handlebars to [v2.0.0](https://github.com/wycats/handlebars.js/blob/v2.0.0/release-notes.md)
- Upgrade middleman-core, bundler and rake dependencies to latest versions

### 0.1.1 (2014/11/04)
- Upgrade default [Ember to v1.8.1 (stable)](https://github.com/emberjs/ember.js/blob/v1.8.1/CHANGELOG.md)
- Upgrade default Ember to [v1.8.1 (stable)](https://github.com/emberjs/ember.js/blob/v1.8.1/CHANGELOG.md)

### 0.1 (2014/11/03)
- Upgrade default [Ember to v1.8.0 (stable)](https://github.com/emberjs/ember.js/blob/v1.8.0/CHANGELOG.md)
- Upgrade default Ember to [v1.8.0 (stable)](https://github.com/emberjs/ember.js/blob/v1.8.0/CHANGELOG.md)

### 0.0.4 (2014/10/19)
- Upgrade default [Ember to v1.8.0.beta.5](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.5/CHANGELOG.md)
- Upgrade default [Ember Data to v1.0.0.beta.11](https://github.com/emberjs/data/blob/v1.0.0-beta.11/CHANGELOG.md)
- Upgrade default Ember to [v1.8.0.beta.5](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.5/CHANGELOG.md)
- Upgrade default Ember Data to [v1.0.0.beta.11](https://github.com/emberjs/data/blob/v1.0.0-beta.11/CHANGELOG.md)

### 0.0.3 (2014/09/29)
- Upgrade default [Ember to v1.8.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.3/CHANGELOG.md)
- Upgrade default Ember to [v1.8.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.3/CHANGELOG.md)

### 0.0.2 (2014/09/24)
- Minor cleanup

### 0.0.1 (2014/09/23)
- Auto-load:
+ [Ember 1.8.0.beta.2](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.2)
+ [Ember Data 1.0.0.beta.10](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.10)
+ [Handlebars 1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0)
+ Ember [1.8.0.beta.2](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.2)
+ Ember Data [1.0.0.beta.10](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.10)
+ Handlebars [1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0)
- `:app_dir` option allows you to set a custom Ember app directory (relative to Middleman's `:js_dir`)
- Pre-compile handlebars templates (from `templates` directory inside the Ember app directory (`:app_dir`))
- Use production versions of Ember + Ember Data on `build`
Expand Down
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Emberman is a simple [extension](http://middlemanapp.com/advanced/custom/) which
## Features

- Auto-loads into [Middleman's Asset Pipeline](http://middlemanapp.com/basics/asset-pipeline/):
+ [Ember 1.8.1](https://github.com/emberjs/ember.js/releases/tag/v1.8.1)
+ [Ember Data 1.0.0.beta.11](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.11)
+ [Handlebars 1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0)
+ [Ember v1.9.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.9.0-beta.3/CHANGELOG.md)
+ [Ember Data v1.0.0.beta.12](https://github.com/emberjs/data/blob/v1.0.0-beta.12/CHANGELOG.md)
+ [Handlebars v2.0.0](https://github.com/wycats/handlebars.js/blob/v2.0.0/release-notes.md)
- Pre-compiles handlebars templates
- Uses production versions of Ember + Ember Data on `build`
- Ignores ingredient files on `build`, compiles into a single JS file
Expand All @@ -23,7 +23,7 @@ Add this line to your Middleman application's `Gemfile`:
```ruby
# Gemfile

gem 'emberman', '~> 0.1.1'
gem 'emberman', '~> 0.1.2'
```

Then run:
Expand Down Expand Up @@ -162,10 +162,10 @@ If you'd prefer to use different versions of Ember, Ember Data or Handlebars, ad
```ruby
# Gemfile

gem 'ember-source', '1.7.0'
gem 'ember-source', '1.8.1'
gem 'ember-data-source', '0.14'
gem 'handlebars-source', '1.2.1'
gem 'emberman', '~> 0.1.1'
gem 'handlebars-source', '1.3.0'
gem 'emberman', '~> 0.1.2'
```

## Contributing
Expand All @@ -178,7 +178,4 @@ See [LICENSE](LICENSE.md).

## Thanks

- To [@mrship](https://github.com/mrship) for the [middleman-ember](https://github.com/mrship/middleman-ember) gem, used by Emberman
- To [@GutenYe](https://github.com/GutenYe) for the [sprockets-handlebars_template](https://github.com/GutenYe/sprockets-handlebars_template), also used by Emberman
- To [@tdreyno](https://github.com/tdreyno), [@bhollis](https://github.com/bhollis) and the [other contributors](https://github.com/middleman/middleman/graphs/contributors) of the excellent [Middleman](http://middlemanapp.com) static site generator
- And to [@wycats](https://github.com/wycats), [@tomdale](https://github.com/tomdale), [@wagenet](https://github.com/wagenet), [@stefanpenner](https://github.com/stefanpenner), [@rwjblue](https://github.com/rwjblue), [@ebryn](https://github.com/ebryn), [@machty](https://github.com/machty), [@trek](https://github.com/trek) and the [rest of contributors](https://github.com/emberjs/ember.js/graphs/contributors) to the incredible [Ember.js](http://emberjs.com/) framework, as well as Ember Data and [Handlebars](http://handlebarsjs.com/)
- Special thanks to [@mrship](https://github.com/mrship) for the [middleman-ember](https://github.com/mrship/middleman-ember) gem, [@GutenYe](https://github.com/GutenYe) for the [sprockets-handlebars_template](https://github.com/GutenYe/sprockets-handlebars_template) gem, [@tdreyno](https://github.com/tdreyno), [@bhollis](https://github.com/bhollis) and the [other Middleman contributors](https://github.com/middleman/middleman/graphs/contributors), and to the [Ember](https://github.com/emberjs/ember.js/graphs/contributors), [Ember Data](https://github.com/emberjs/data/graphs/contributors) and [Handlebars](https://github.com/wycats/handlebars.js/graphs/contributors) teams.
12 changes: 6 additions & 6 deletions emberman.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.add_runtime_dependency 'middleman-core', '~> 3.3.6'
spec.add_runtime_dependency 'middleman-core', '~> 3.3.7'
spec.add_runtime_dependency 'middleman-ember', '~> 0.2.3'
spec.add_runtime_dependency 'sprockets-handlebars_template', '~> 1.0.0'
spec.add_runtime_dependency 'handlebars-source', '1.3'
spec.add_runtime_dependency 'ember-source', '1.8.1'
spec.add_runtime_dependency 'ember-data-source', '1.0.0.beta.11'
spec.add_runtime_dependency 'handlebars-source', '2.0.0'
spec.add_runtime_dependency 'ember-source', '1.9.0.beta.3'
spec.add_runtime_dependency 'ember-data-source', '1.0.0.beta.12'

spec.add_development_dependency 'bundler', '~> 1.7.4'
spec.add_development_dependency 'rake', '~> 10.3.2'
spec.add_development_dependency 'bundler', '~> 1.7.7'
spec.add_development_dependency 'rake', '~> 10.4.0'
end
2 changes: 1 addition & 1 deletion lib/emberman/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Middleman
class Emberman
VERSION = "0.1.1"
VERSION = "0.1.2"
end
end

0 comments on commit 145c7dd

Please sign in to comment.