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                             | 47 ++-----------------------------------
 Gemfile.lock                        | 33 +++++++-------------------
 app/controllers/home_controller.rb  |  5 ++++
 certs/Gemfile                       | 12 +++-------
 certs/leap_web_certs.gemspec        |  3 ---
 certs/lib/leap_web_certs.rb         |  1 +
 certs/lib/leap_web_certs/engine.rb  |  3 ---
 certs/lib/leap_web_certs/version.rb |  3 ---
 common_dependencies.rb              |  6 +++++
 config/routes.rb                    |  6 ++---
 core/leap_web_core.gemspec          |  2 ++
 core/lib/leap_web_core.rb           |  9 ++++++-
 core/lib/leap_web_core/version.rb   |  3 ---
 help/Gemfile                        | 18 ++++----------
 help/leap_web_help.gemspec          |  8 +------
 help/lib/leap_web_help.rb           |  1 +
 help/lib/leap_web_help/engine.rb    |  4 ----
 help/lib/leap_web_help/version.rb   |  3 ---
 lib/tasks/task_helper.rb            |  2 +-
 ui_dependencies.rb                  | 16 +++++++++++++
 users/Gemfile                       | 13 ++++------
 users/leap_web_users.gemspec        |  8 +------
 users/lib/leap_web_users.rb         |  2 ++
 users/lib/leap_web_users/engine.rb  |  4 +---
 users/lib/leap_web_users/version.rb |  3 ---
 25 files changed, 70 insertions(+), 145 deletions(-)
 create mode 100644 app/controllers/home_controller.rb
 delete mode 100644 certs/lib/leap_web_certs/version.rb
 create mode 100644 common_dependencies.rb
 delete mode 100644 core/lib/leap_web_core/version.rb
 delete mode 100644 help/lib/leap_web_help/version.rb
 create mode 100644 ui_dependencies.rb
 delete mode 100644 users/lib/leap_web_users/version.rb

diff --git a/Gemfile b/Gemfile
index 2aedae1..6d28e3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,57 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.8'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-
-gem 'json'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'haml-rails',   '~> 0.3.4'
-  gem 'sass-rails',   '~> 3.2.5'
-  gem 'coffee-rails', '~> 3.2.2'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.2.7'
-end
-
-gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 2.0.4'
-gem 'haml', '~> 3.1.7'
-gem 'simple_form'
+eval(File.read(File.dirname(__FILE__) + '/common_dependencies.rb'))
+eval(File.read(File.dirname(__FILE__) + '/ui_dependencies.rb'))
 
 # EITHER fetch all of the leap_web gems in one go
 # gem 'leap_web' 
 # OR use the local versions for development instead:
-gem 'leap_web_core', :path => 'core'
 gem 'leap_web_users', :path => 'users'
 gem 'leap_web_certs', :path => 'certs'
 # gem 'leap_web_help', :path => 'help'
 
-gem 'couchrest_session_store'
-
-
-group :development, :test do
-  gem 'mocha'
-end
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
 # To use debugger
 gem 'ruby-debug'
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)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
new file mode 100644
index 0000000..7db5397
--- /dev/null
+++ b/app/controllers/home_controller.rb
@@ -0,0 +1,5 @@
+
+class HomeController < ApplicationController
+  def index
+  end
+end
diff --git a/certs/Gemfile b/certs/Gemfile
index 9028024..ab2aa7a 100644
--- a/certs/Gemfile
+++ b/certs/Gemfile
@@ -1,17 +1,11 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in leap_web_certs.gemspec.
+eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
+
+# Declare your gem's dependencies in leap_web_users.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
 # To use debugger
 # gem 'ruby-debug'
diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec
index 14708df..15a45be 100644
--- a/certs/leap_web_certs.gemspec
+++ b/certs/leap_web_certs.gemspec
@@ -15,9 +15,6 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.8"
   s.add_dependency "leap_web_core", LeapWeb::VERSION
-  
-  s.add_development_dependency "mocha"
 
 end
diff --git a/certs/lib/leap_web_certs.rb b/certs/lib/leap_web_certs.rb
index beb683d..129d1a9 100644
--- a/certs/lib/leap_web_certs.rb
+++ b/certs/lib/leap_web_certs.rb
@@ -1,3 +1,4 @@
+require "leap_web_core"
 require "leap_web_certs/engine"
 
 module LeapWebCerts
diff --git a/certs/lib/leap_web_certs/engine.rb b/certs/lib/leap_web_certs/engine.rb
index 7dbc572..33a446e 100644
--- a/certs/lib/leap_web_certs/engine.rb
+++ b/certs/lib/leap_web_certs/engine.rb
@@ -1,6 +1,3 @@
-# thou shall require all your dependencies in an engine.
-require "leap_web_core"
-
 module LeapWebCerts
   class Engine < ::Rails::Engine
 
diff --git a/certs/lib/leap_web_certs/version.rb b/certs/lib/leap_web_certs/version.rb
deleted file mode 100644
index 800ca0b..0000000
--- a/certs/lib/leap_web_certs/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebCerts
-  VERSION = "0.0.4"
-end
diff --git a/common_dependencies.rb b/common_dependencies.rb
new file mode 100644
index 0000000..5312a80
--- /dev/null
+++ b/common_dependencies.rb
@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+group :test do
+  gem 'mocha', :require => false
+end
+
diff --git a/config/routes.rb b/config/routes.rb
index ca8d753..3b29251 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
 LeapWeb::Application.routes.draw do
+  root :to => "home#index"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -46,10 +48,6 @@ LeapWeb::Application.routes.draw do
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
   # See how all your routes lay out with "rake routes"
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec
index c3bb98d..e721637 100644
--- a/core/leap_web_core.gemspec
+++ b/core/leap_web_core.gemspec
@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "~> 3.2.8"
+
   s.add_dependency "couchrest", "~> 1.1.3"
   s.add_dependency "couchrest_model", "~> 2.0.0.beta2"
   s.add_dependency "couchrest_session_store", "~> 0.0.1"
 
+  s.add_dependency "json"
 end
diff --git a/core/lib/leap_web_core.rb b/core/lib/leap_web_core.rb
index 16004f8..5b53978 100644
--- a/core/lib/leap_web_core.rb
+++ b/core/lib/leap_web_core.rb
@@ -1,5 +1,12 @@
+require "rails/all"
+
+require "couchrest"
+require "couchrest_model"
+require "couchrest_session_store"
+
+require "json"
+
 require "extensions/testing"
-require "leap_web_core/dependencies"
 require "leap_web_core/engine"
 
 module LeapWebCore
diff --git a/core/lib/leap_web_core/version.rb b/core/lib/leap_web_core/version.rb
deleted file mode 100644
index 6a34982..0000000
--- a/core/lib/leap_web_core/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebCore
-  VERSION = "0.0.1"
-end
diff --git a/help/Gemfile b/help/Gemfile
index 8dfcd78..bfd760e 100644
--- a/help/Gemfile
+++ b/help/Gemfile
@@ -1,20 +1,12 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in leap_web_help.gemspec.
+eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
+eval(File.read(File.dirname(__FILE__) + '/..//ui_dependencies.rb'))
+
+# Declare your gem's dependencies in leap_web_users.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
 # To use debugger
- gem 'ruby-debug'
-
- # TODO: not sure I actually want this here, but trying:
-  gem 'therubyracer', :platforms => :ruby
+# gem 'ruby-debug'
diff --git a/help/leap_web_help.gemspec b/help/leap_web_help.gemspec
index 2cc147c..09827dc 100644
--- a/help/leap_web_help.gemspec
+++ b/help/leap_web_help.gemspec
@@ -1,6 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
 
-require "leap_web_core/dependencies"
 require File.expand_path('../../lib/leap_web/version.rb', __FILE__)
 
 # Describe your gem and declare its dependencies:
@@ -16,10 +15,5 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.8"
-  s.add_dependency "leap_web_core", "~> #{LeapWeb::VERSION}"
- 
-  LeapWebCore::Dependencies.add_ui_gems_to_spec(s)
-  
-  # s.add_dependency "jquery-rails"
+  s.add_dependency "leap_web_core", LeapWeb::VERSION
 end
diff --git a/help/lib/leap_web_help.rb b/help/lib/leap_web_help.rb
index f5b04aa..89dabcf 100644
--- a/help/lib/leap_web_help.rb
+++ b/help/lib/leap_web_help.rb
@@ -1,3 +1,4 @@
+require "leap_web_core"
 require "leap_web_help/engine"
 
 module LeapWebHelp
diff --git a/help/lib/leap_web_help/engine.rb b/help/lib/leap_web_help/engine.rb
index 2ff3e86..1006c29 100644
--- a/help/lib/leap_web_help/engine.rb
+++ b/help/lib/leap_web_help/engine.rb
@@ -1,8 +1,4 @@
 # thou shall require all your dependencies in an engine.
-require "leap_web_core"
-#require "leap_web_users" #necessary? 
-
-LeapWebCore::Dependencies.require_ui_gems
 
 module LeapWebHelp
   class Engine < ::Rails::Engine
diff --git a/help/lib/leap_web_help/version.rb b/help/lib/leap_web_help/version.rb
deleted file mode 100644
index 6a7c85d..0000000
--- a/help/lib/leap_web_help/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebHelp
-  VERSION = "0.0.1"
-end
diff --git a/lib/tasks/task_helper.rb b/lib/tasks/task_helper.rb
index aa37698..26e60bc 100644
--- a/lib/tasks/task_helper.rb
+++ b/lib/tasks/task_helper.rb
@@ -2,7 +2,7 @@ require File.expand_path('../../../lib/leap_web/version', __FILE__)
 
 module TaskHelper
 
-  ENGINES = %w(core users certs help)
+  ENGINES = %w(users certs help)
 
   def putsys(cmd)
     puts cmd
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
new file mode 100644
index 0000000..21de1c6
--- /dev/null
+++ b/ui_dependencies.rb
@@ -0,0 +1,16 @@
+gem "haml", "~> 3.1.7"
+gem "bootstrap-sass", "~> 2.0.4"
+gem "jquery-rails"
+gem "simple_form"
+
+group :assets do
+  gem "haml-rails", "~> 0.3.4"
+  gem "sass-rails", "~> 3.2.5"
+  gem "coffee-rails", "~> 3.2.2"
+  gem "uglifier", "~> 1.2.7"
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyracer', :platforms => :ruby
+
+end
+
diff --git a/users/Gemfile b/users/Gemfile
index 5e6ebd6..81b0ae8 100644
--- a/users/Gemfile
+++ b/users/Gemfile
@@ -1,17 +1,12 @@
 source "http://rubygems.org"
 
+eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
+eval(File.read(File.dirname(__FILE__) + '/../ui_dependencies.rb'))
+
 # Declare your gem's dependencies in leap_web_users.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
 # To use debugger
-gem 'ruby-debug'
+# gem 'ruby-debug'
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index 94c32ff..f64a76a 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -1,6 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
 
-require "leap_web_core/dependencies"
 require File.expand_path('../../lib/leap_web/version.rb', __FILE__)
 
 # Describe your gem and declare its dependencies:
@@ -16,12 +15,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.8"
   s.add_dependency "leap_web_core", LeapWeb::VERSION
-  s.add_dependency "ruby-srp", "~> 0.1.1"
-
-  LeapWebCore::Dependencies.add_ui_gems_to_spec(s)
-  
-  s.add_development_dependency "mocha"
 
+  s.add_dependency "ruby-srp", "~> 0.1.1"
 end
diff --git a/users/lib/leap_web_users.rb b/users/lib/leap_web_users.rb
index e1b7b1f..1ea1c40 100644
--- a/users/lib/leap_web_users.rb
+++ b/users/lib/leap_web_users.rb
@@ -1,3 +1,5 @@
+require "leap_web_core"
+require "leap_web_core/ui_dependencies"
 require "leap_web_users/engine"
 
 module LeapWebUsers
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
index b6ab60e..734564b 100644
--- a/users/lib/leap_web_users/engine.rb
+++ b/users/lib/leap_web_users/engine.rb
@@ -1,8 +1,6 @@
 # thou shall require all your dependencies in an engine.
 require "ruby-srp"
-require "leap_web_core"
-LeapWebCore::Dependencies.require_ui_gems
-
+require "haml-rails"
 
 module LeapWebUsers
   class Engine < ::Rails::Engine
diff --git a/users/lib/leap_web_users/version.rb b/users/lib/leap_web_users/version.rb
deleted file mode 100644
index 14e54c1..0000000
--- a/users/lib/leap_web_users/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebUsers
-  VERSION = "0.0.1"
-end
-- 
cgit v1.2.3