Skip to content

Commit

Permalink
Merge pull request emberjs#2137 from machty/handlebars-source
Browse files Browse the repository at this point in the history
Split out handlebars from ember-template-compiler; now we use handlebars...
  • Loading branch information
ebryn committed Feb 26, 2013
2 parents 4c606ac + d4e6a5c commit b26f1f0
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 30,436 deletions.
6 changes: 3 additions & 3 deletions Assetfile
@@ -1,9 +1,9 @@
distros = {
"runtime" => %w(ember-metal rsvp container ember-runtime),
"template-compiler" => %w(handlebars ember-handlebars-compiler),
"template-compiler" => %w(ember-handlebars-compiler),
"data-deps" => %w(ember-metal rsvp container ember-runtime ember-states),
"full" => %w(ember-metal rsvp container ember-runtime ember-views metamorph ember-handlebars-compiler ember-handlebars ember-routing ember-application ember-states),
"old-router" => %w(ember-metal rsvp container ember-runtime ember-views ember-states ember-viewstates metamorph ember-handlebars-compiler ember-handlebars ember-old-router )
"full" => %w(ember-metal rsvp container ember-runtime ember-views metamorph handlebars ember-handlebars-compiler ember-handlebars ember-routing ember-application ember-states),
"old-router" => %w(ember-metal rsvp container ember-runtime ember-views ember-states ember-viewstates metamorph handlebars ember-handlebars-compiler ember-handlebars ember-old-router )
}

class AddMicroLoader < Rake::Pipeline::Filter
Expand Down
5 changes: 5 additions & 0 deletions Gemfile
Expand Up @@ -2,3 +2,8 @@ source "https://rubygems.org"

gem "rake-pipeline", :git => "https://github.com/livingsocial/rake-pipeline.git"
gem "ember-dev", :git => "https://github.com/emberjs/ember-dev.git", :branch => "master"

# Require the specific version of handlebars-source that
# we'll be precompiling and performing tests with.
gem "handlebars-source", "1.0.0.rc3"

5 changes: 4 additions & 1 deletion Gemfile.lock
@@ -1,12 +1,13 @@
GIT
remote: https://github.com/emberjs/ember-dev.git
revision: 659bf4c415f87151f407106aab923a4a36fac4b4
revision: 9e2b101001e417cf762ebccb13413515d2788705
branch: master
specs:
ember-dev (0.1)
colored
execjs
grit
handlebars-source
kicker
rack
rake-pipeline (~> 0.8.0)
Expand All @@ -33,6 +34,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
handlebars-source (1.0.0.rc.3)
json (1.7.7)
kicker (2.6.1)
listen
Expand All @@ -55,4 +57,5 @@ PLATFORMS

DEPENDENCIES
ember-dev!
handlebars-source (= 1.0.0.rc3)
rake-pipeline!
20 changes: 20 additions & 0 deletions ember-source.gemspec
@@ -0,0 +1,20 @@
# -*- encoding: utf-8 -*-
require 'json'

Gem::Specification.new do |gem|
gem.name = "ember-source"
gem.authors = ["Yehuda Katz"]
gem.email = ["wycats@gmail.com"]
gem.date = Time.now.strftime("%Y-%m-%d")
gem.summary = %q{Ember.js source code wrapper.}
gem.description = %q{Ember.js source code wrapper for use with Ruby libs.}
gem.homepage = "https://github.com/emberjs/ember.js"
gem.version = "1.0.0.rc1.2"

# Note: can't use the squiggly ~> operator the way we'd expect
# so long as we're referencing pre-release versions.
gem.add_dependency "handlebars-source", [">= 1.0.0.rc3", "< 1.0.0.rc4"]

gem.files = Dir['dist/*.js']
gem.files << 'lib/ember/source.rb'
end

0 comments on commit b26f1f0

Please sign in to comment.