From 00b7b36516d1d07300870029ad5190f06122a493 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 10 Oct 2012 19:56:35 +0200 Subject: first steps at reducing core --- 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 --- 5 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 help/lib/leap_web_help/version.rb (limited to 'help') 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 -- cgit v1.2.3 From add8d015c87a00626b739080bd75c7e7aeb9c1df Mon Sep 17 00:00:00 2001 From: Azul 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. --- help/Gemfile | 3 +++ help/lib/leap_web_help.rb | 1 - help/lib/leap_web_help/engine.rb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'help') diff --git a/help/Gemfile b/help/Gemfile index bfd760e..5e895e9 100644 --- a/help/Gemfile +++ b/help/Gemfile @@ -3,6 +3,9 @@ source "http://rubygems.org" eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb')) eval(File.read(File.dirname(__FILE__) + '/..//ui_dependencies.rb')) +# We require leap_web_core from here so we can use the path option. +gem "leap_web_core", :path => '../core' + # 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. diff --git a/help/lib/leap_web_help.rb b/help/lib/leap_web_help.rb index 89dabcf..f5b04aa 100644 --- a/help/lib/leap_web_help.rb +++ b/help/lib/leap_web_help.rb @@ -1,4 +1,3 @@ -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 1006c29..4146dfc 100644 --- a/help/lib/leap_web_help/engine.rb +++ b/help/lib/leap_web_help/engine.rb @@ -1,4 +1,6 @@ # thou shall require all your dependencies in an engine. +require "leap_web_core" +require "leap_web_core/ui_dependencies" module LeapWebHelp class Engine < ::Rails::Engine -- cgit v1.2.3