From 00b7b36516d1d07300870029ad5190f06122a493 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 10 Oct 2012 19:56:35 +0200
Subject: first steps at reducing core

---
 Gemfile.lock | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index f23e74e..955c637 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,32 +2,16 @@ PATH
   remote: certs
   specs:
     leap_web_certs (0.1.0)
-      leap_web_core (= 0.1.0)
-      rails (~> 3.2.8)
-
-PATH
-  remote: core
-  specs:
-    leap_web_core (0.1.0)
-      couchrest (~> 1.1.3)
-      couchrest_model (~> 2.0.0.beta2)
-      couchrest_session_store (~> 0.0.1)
-      rails (~> 3.2.8)
 
 PATH
   remote: users
   specs:
     leap_web_users (0.1.0)
-      bootstrap-sass (~> 2.0.4)
-      haml (~> 3.1.7)
-      jquery-rails
-      leap_web_core (= 0.1.0)
-      rails (~> 3.2.8)
       ruby-srp (~> 0.1.1)
-      simple_form
 
 GEM
   remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     actionmailer (3.2.8)
       actionpack (= 3.2.8)
@@ -147,7 +131,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_form (2.0.3)
+    simple_form (2.0.4)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sprockets (2.1.3)
@@ -162,9 +146,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.3.0)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      multi_json (~> 1.3)
 
 PLATFORMS
   ruby
@@ -172,18 +156,19 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass (~> 2.0.4)
   coffee-rails (~> 3.2.2)
-  couchrest_session_store
+  couchrest (~> 1.1.3)
+  couchrest_model (~> 2.0.0.beta2)
+  couchrest_session_store (~> 0.0.1)
   haml (~> 3.1.7)
   haml-rails (~> 0.3.4)
   jquery-rails
   json
   leap_web_certs!
-  leap_web_core!
   leap_web_users!
   mocha
-  rails (= 3.2.8)
+  rails (~> 3.2.8)
   ruby-debug
   sass-rails (~> 3.2.5)
   simple_form
   therubyracer
-  uglifier (>= 1.2.7)
+  uglifier (~> 1.2.7)
-- 
cgit v1.2.3


From add8d015c87a00626b739080bd75c7e7aeb9c1df Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 11 Oct 2012 10:22:34 +0200
Subject: moved core dependency into */Gemfile with :path

In order to get the rails generators and the like to work properly in engines we need to require all the dependencies in the engine.rb file.

Since I want to keep that list of engines in a centralized place we still need core and we need to require it from the other engines.

We don't want to require the core gem to be installed so I added it with :path option to the Gemfile.
---
 Gemfile.lock | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index 955c637..fe49476 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,11 +2,23 @@ PATH
   remote: certs
   specs:
     leap_web_certs (0.1.0)
+      leap_web_core (= 0.1.0)
+
+PATH
+  remote: core
+  specs:
+    leap_web_core (0.1.0)
+      couchrest (~> 1.1.3)
+      couchrest_model (~> 2.0.0.beta2)
+      couchrest_session_store (~> 0.0.1)
+      json
+      rails (~> 3.2.8)
 
 PATH
   remote: users
   specs:
     leap_web_users (0.1.0)
+      leap_web_core (= 0.1.0)
       ruby-srp (~> 0.1.1)
 
 GEM
@@ -156,17 +168,13 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass (~> 2.0.4)
   coffee-rails (~> 3.2.2)
-  couchrest (~> 1.1.3)
-  couchrest_model (~> 2.0.0.beta2)
-  couchrest_session_store (~> 0.0.1)
   haml (~> 3.1.7)
   haml-rails (~> 0.3.4)
   jquery-rails
-  json
   leap_web_certs!
+  leap_web_core!
   leap_web_users!
   mocha
-  rails (~> 3.2.8)
   ruby-debug
   sass-rails (~> 3.2.5)
   simple_form
-- 
cgit v1.2.3