From 4742be0ea5c923f246cf5ef4ae8658614aea9f51 Mon Sep 17 00:00:00 2001 From: jamal Date: Sat, 11 Oct 2014 17:50:58 -0400 Subject: [PATCH] Added ember to Gemfile --- Gemfile | 4 +++ Gemfile.lock | 91 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index fd44e33..12000c6 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,10 @@ gem 'neat', '~> 1.6.0' gem 'haml', '~> 4.0.5' gem 'rails_autolink', '~> 1.1.5' +gem 'ember-source', '~> 1.8.0.beta.4' +gem 'ember-data-source', '~> 1.0.0.beta.10' +gem 'ember-rails', '~> 0.15.0' + group :assets do gem 'uglifier', '~> 2.5.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 277b057..f1e92e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,8 @@ GEM sprockets (~> 2.2.1) active_link_to (1.0.2) actionpack + active_model_serializers (0.9.0) + activemodel (>= 3.2) activemodel (3.2.19) activesupport (= 3.2.19) builder (~> 3.0.0) @@ -38,10 +40,14 @@ GEM activesupport (3.2.19) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - annotate (2.6.3) + annotate (2.6.5) activerecord (>= 2.3.0) rake (>= 0.8.7) arel (3.0.3) + barber (0.4.2) + ember-source + execjs + handlebars-source bbcoder (1.0.1) better_errors (1.1.0) coderay (>= 1.0.0) @@ -60,10 +66,10 @@ GEM i18n rake (>= 10.0.0) sshkit (~> 1.3) - capistrano-bundler (1.1.2) - capistrano (~> 3.0) + capistrano-bundler (1.1.3) + capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.1) + capistrano-rails (1.1.2) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rbenv (2.0.2) @@ -80,7 +86,7 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - childprocess (0.5.3) + childprocess (0.5.5) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) codeclimate-test-reporter (0.3.0) @@ -89,14 +95,15 @@ GEM coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.8.0) + colorize (0.7.3) columnize (0.8.9) country_code_select (1.0.1) activesupport (>= 3.0) - dalli (2.7.1) + dalli (2.7.2) database_cleaner (1.2.0) debug_inspector (0.0.2) debugger-linecache (1.2.0) @@ -105,10 +112,23 @@ GEM dotenv-rails (0.10.0) dotenv (= 0.10.0) dynamic_form (1.1.4) + ember-data-source (1.0.0.beta.10) + ember-source + ember-rails (0.15.0) + active_model_serializers + barber (>= 0.4.1) + ember-data-source (>= 1.0.0.beta.5) + ember-source (>= 1.1.0) + execjs (>= 1.2) + handlebars-source (> 1.0.0) + jquery-rails (>= 1.0.17) + railties (>= 3.1) + ember-source (1.8.0.beta.4) + handlebars-source (~> 1.0) erubis (2.7.0) exceptional (2.0.33) rack - execjs (2.0.2) + execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -116,12 +136,13 @@ GEM railties (>= 3.0.0) faraday (0.9.0) multipart-post (>= 1.2, < 3) - ffi (1.9.3) + ffi (1.9.6) font-awesome-sass (4.1.0) sass (~> 3.2) gruff (0.3.7) haml (4.0.5) tilt + handlebars-source (1.3.0) hike (1.2.3) i18n (0.6.11) journey (1.0.4) @@ -134,37 +155,37 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.5.3) + mini_portile (0.6.0) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.15) + mysql2 (0.3.16) neat (1.6.0) bourbon (>= 3.1) sass (>= 3.3) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.0) + net-ssh (2.9.1) newrelic_rpm (3.7.2.195) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) oj (2.5.5) - poltergeist (1.5.0) + poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.5) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (1.3.2) + pry-byebug (1.3.3) byebug (~> 2.7) - pry (~> 0.9.12) + pry (~> 0.10) puma (2.9.1) rack (>= 1.1, < 2.0) - quiet_assets (1.0.2) + quiet_assets (1.0.3) railties (>= 3.1, < 5.0) rack (1.4.5) rack-cache (1.2) @@ -181,7 +202,7 @@ GEM activesupport (= 3.2.19) bundler (~> 1.0) railties (= 3.2.19) - rails_autolink (1.1.5) + rails_autolink (1.1.6) rails (> 3.1) railties (3.2.19) actionpack (= 3.2.19) @@ -193,7 +214,7 @@ GEM rake (10.3.2) rdoc (3.12.2) json (~> 1.4) - rmagick (2.13.2) + rmagick (2.13.3) rspec-core (2.14.8) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) @@ -206,10 +227,10 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rubyzip (1.1.3) + rubyzip (1.1.6) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.3.7) + sass (3.3.14) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -223,34 +244,31 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - slop (3.5.0) + slop (3.6.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sshkit (1.4.0) + sshkit (1.5.1) + colorize net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - term-ansicolor - term-ansicolor (1.3.0) - tins (~> 1.0) thor (0.19.1) tilt (1.4.1) timecop (0.7.1) - tins (1.1.0) tinymce-rails (3.5.9) railties (>= 3.1.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) tzinfo (0.3.41) - uglifier (2.5.0) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) websocket (1.0.7) - websocket-driver (0.3.3) - will_paginate (3.0.5) + websocket-driver (0.3.5) + will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -278,6 +296,9 @@ DEPENDENCIES database_cleaner (~> 1.2.0) dotenv-rails (~> 0.10.0) dynamic_form (~> 1.1.4) + ember-data-source (~> 1.0.0.beta.10) + ember-rails (~> 0.15.0) + ember-source (~> 1.8.0.beta.4) exceptional (~> 2.0.33) factory_girl_rails (~> 4.4.1) faraday (~> 0.9.0)