diff options
author | Azul <azul@leap.se> | 2014-04-08 09:12:37 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2014-04-08 09:12:37 +0200 |
commit | 53808b073f539ba2b442738b6abf97228488e311 (patch) | |
tree | 67e344defee90e4d0c5f91f6136f6619e97c4ace | |
parent | cb6442c344d6bdaf52c3878b2de2fcf4d85f2648 (diff) |
moving all of core into toplevel, tests fail.
-rw-r--r-- | Gemfile | 10 | ||||
-rw-r--r-- | Gemfile.lock | 20 | ||||
-rw-r--r-- | app/assets/javascripts/leap.js (renamed from core/app/assets/javascripts/leap.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/platform.js (renamed from core/app/assets/javascripts/platform.js) | 0 | ||||
-rw-r--r-- | app/helpers/core_helper.rb (renamed from core/app/helpers/core_helper.rb) | 0 | ||||
-rw-r--r-- | app/helpers/download_helper.rb (renamed from core/app/helpers/download_helper.rb) | 0 | ||||
-rw-r--r-- | app/helpers/navigation_helper.rb (renamed from core/app/helpers/navigation_helper.rb) | 0 | ||||
-rw-r--r-- | app/views/common/_download_for_os.html.haml (renamed from core/app/views/common/_download_for_os.html.haml) | 0 | ||||
-rw-r--r-- | app/views/common/_home_page_buttons.html.haml (renamed from core/app/views/common/_home_page_buttons.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_first_page.html.haml (renamed from core/app/views/kaminari/_first_page.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_gap.html.haml (renamed from core/app/views/kaminari/_gap.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_last_page.html.haml (renamed from core/app/views/kaminari/_last_page.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_next_page.html.haml (renamed from core/app/views/kaminari/_next_page.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_page.html.haml (renamed from core/app/views/kaminari/_page.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_paginator.html.haml (renamed from core/app/views/kaminari/_paginator.html.haml) | 0 | ||||
-rw-r--r-- | app/views/kaminari/_prev_page.html.haml (renamed from core/app/views/kaminari/_prev_page.html.haml) | 0 | ||||
-rw-r--r-- | billing/leap_web_billing.gemspec | 1 | ||||
-rw-r--r-- | billing/lib/leap_web_billing/engine.rb | 3 | ||||
-rw-r--r-- | certs/leap_web_certs.gemspec | 1 | ||||
-rw-r--r-- | certs/lib/leap_web_certs/engine.rb | 2 | ||||
-rw-r--r-- | config/initializers/couchrest_model.rb (renamed from core/config/initializers/couchrest_model.rb) | 0 | ||||
-rw-r--r-- | config/initializers/simple_form.rb (renamed from core/config/initializers/simple_form.rb) | 0 | ||||
-rw-r--r-- | config/initializers/simple_form_bootstrap.rb (renamed from core/config/initializers/simple_form_bootstrap.rb) | 0 | ||||
-rw-r--r-- | config/initializers/validations.rb (renamed from core/config/initializers/validations.rb) | 0 | ||||
-rw-r--r-- | config/locales/en.yml | 42 | ||||
-rw-r--r-- | config/locales/simple_form.en.yml (renamed from core/config/locales/simple_form.en.yml) | 0 | ||||
-rw-r--r-- | core/Gemfile | 17 | ||||
-rw-r--r-- | core/Rakefile | 44 | ||||
-rw-r--r-- | core/Readme.md | 6 | ||||
-rw-r--r-- | core/config/initializers/backtrace_silencers.rb | 7 | ||||
-rw-r--r-- | core/config/initializers/inflections.rb | 15 | ||||
-rw-r--r-- | core/config/initializers/mime_types.rb | 5 | ||||
-rw-r--r-- | core/config/initializers/wrap_parameters.rb | 10 | ||||
-rw-r--r-- | core/config/locales/en.yml | 41 | ||||
-rw-r--r-- | core/config/routes.rb | 2 | ||||
-rw-r--r-- | core/leap_web_core.gemspec | 25 | ||||
-rwxr-xr-x | core/script/rails | 8 | ||||
-rw-r--r-- | help/leap_web_help.gemspec | 1 | ||||
-rw-r--r-- | help/lib/leap_web_help/engine.rb | 4 | ||||
-rw-r--r-- | lib/extensions/couchrest.rb (renamed from core/lib/extensions/couchrest.rb) | 0 | ||||
-rw-r--r-- | lib/extensions/testing.rb (renamed from core/lib/extensions/testing.rb) | 0 | ||||
-rw-r--r-- | lib/leap_web_core.rb (renamed from core/lib/leap_web_core.rb) | 0 | ||||
-rw-r--r-- | lib/leap_web_core/dependencies.rb (renamed from core/lib/leap_web_core/dependencies.rb) | 0 | ||||
-rw-r--r-- | lib/leap_web_core/engine.rb (renamed from core/lib/leap_web_core/engine.rb) | 0 | ||||
-rw-r--r-- | lib/leap_web_core/ui_dependencies.rb (renamed from core/lib/leap_web_core/ui_dependencies.rb) | 0 | ||||
-rw-r--r-- | lib/tasks/leap_web_core_tasks.rake (renamed from core/lib/tasks/leap_web_core_tasks.rake) | 0 | ||||
-rw-r--r-- | test/support/browser_integration_test.rb (renamed from core/test/support/browser_integration_test.rb) | 0 | ||||
-rw-r--r-- | test/support/rack_test.rb (renamed from core/test/support/rack_test.rb) | 0 | ||||
-rw-r--r-- | test/support/with_config_helper.rb (renamed from core/test/support/with_config_helper.rb) | 0 | ||||
-rw-r--r-- | users/leap_web_users.gemspec | 2 | ||||
-rw-r--r-- | users/lib/leap_web_users/engine.rb | 2 |
51 files changed, 52 insertions, 216 deletions
@@ -3,10 +3,12 @@ source 'https://rubygems.org' 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 "rails", "~> 3.2.11" +gem "couchrest", "~> 1.1.3" +gem "couchrest_model", "~> 2.0.0" +gem "couchrest_session_store", "~> 0.2.4" +gem "json" + gem 'leap_web_users', :path => 'users' gem 'leap_web_certs', :path => 'certs' gem 'leap_web_help', :path => 'help' diff --git a/Gemfile.lock b/Gemfile.lock index 0c7486f..6c43a9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,36 +10,22 @@ PATH specs: leap_web_billing (0.5.0) braintree - leap_web_core (= 0.5.0) PATH remote: certs specs: leap_web_certs (0.5.0) certificate_authority (>= 0.2.0) - leap_web_core (= 0.5.0) - -PATH - remote: core - specs: - leap_web_core (0.5.0) - couchrest (~> 1.1.3) - couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.4) - json - rails (~> 3.2.11) PATH remote: help specs: leap_web_help (0.5.0) - leap_web_core (= 0.5.0) PATH remote: users specs: leap_web_users (0.5.0) - leap_web_core (= 0.5.0) rails_warden ruby-srp (~> 0.2.1) @@ -271,6 +257,9 @@ DEPENDENCIES client_side_validations client_side_validations-simple_form coffee-rails (~> 3.2.2) + couchrest (~> 1.1.3) + couchrest_model (~> 2.0.0) + couchrest_session_store (~> 0.2.4) debugger factory_girl_rails fake_braintree @@ -279,11 +268,11 @@ DEPENDENCIES haml-rails (~> 0.3.4) http_accept_language jquery-rails + json kaminari (= 0.13.0) launchy leap_web_billing! leap_web_certs! - leap_web_core! leap_web_help! leap_web_users! minitest-stub-const @@ -291,6 +280,7 @@ DEPENDENCIES phantomjs-binaries poltergeist quiet_assets + rails (~> 3.2.11) rails-i18n rdiscount sass-rails (~> 3.2.5) diff --git a/core/app/assets/javascripts/leap.js b/app/assets/javascripts/leap.js index 94e602d..94e602d 100644 --- a/core/app/assets/javascripts/leap.js +++ b/app/assets/javascripts/leap.js diff --git a/core/app/assets/javascripts/platform.js b/app/assets/javascripts/platform.js index 108c162..108c162 100644 --- a/core/app/assets/javascripts/platform.js +++ b/app/assets/javascripts/platform.js diff --git a/core/app/helpers/core_helper.rb b/app/helpers/core_helper.rb index a6c7479..a6c7479 100644 --- a/core/app/helpers/core_helper.rb +++ b/app/helpers/core_helper.rb diff --git a/core/app/helpers/download_helper.rb b/app/helpers/download_helper.rb index ee0fe73..ee0fe73 100644 --- a/core/app/helpers/download_helper.rb +++ b/app/helpers/download_helper.rb diff --git a/core/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb index 19cb934..19cb934 100644 --- a/core/app/helpers/navigation_helper.rb +++ b/app/helpers/navigation_helper.rb diff --git a/core/app/views/common/_download_for_os.html.haml b/app/views/common/_download_for_os.html.haml index 3a11d10..3a11d10 100644 --- a/core/app/views/common/_download_for_os.html.haml +++ b/app/views/common/_download_for_os.html.haml diff --git a/core/app/views/common/_home_page_buttons.html.haml b/app/views/common/_home_page_buttons.html.haml index c9ea7a2..c9ea7a2 100644 --- a/core/app/views/common/_home_page_buttons.html.haml +++ b/app/views/common/_home_page_buttons.html.haml diff --git a/core/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml index 34436e3..34436e3 100644 --- a/core/app/views/kaminari/_first_page.html.haml +++ b/app/views/kaminari/_first_page.html.haml diff --git a/core/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml index 51de678..51de678 100644 --- a/core/app/views/kaminari/_gap.html.haml +++ b/app/views/kaminari/_gap.html.haml diff --git a/core/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml index c90433c..c90433c 100644 --- a/core/app/views/kaminari/_last_page.html.haml +++ b/app/views/kaminari/_last_page.html.haml diff --git a/core/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml index ea6cab2..ea6cab2 100644 --- a/core/app/views/kaminari/_next_page.html.haml +++ b/app/views/kaminari/_next_page.html.haml diff --git a/core/app/views/kaminari/_page.html.haml b/app/views/kaminari/_page.html.haml index 2f2f142..2f2f142 100644 --- a/core/app/views/kaminari/_page.html.haml +++ b/app/views/kaminari/_page.html.haml diff --git a/core/app/views/kaminari/_paginator.html.haml b/app/views/kaminari/_paginator.html.haml index 79c5b92..79c5b92 100644 --- a/core/app/views/kaminari/_paginator.html.haml +++ b/app/views/kaminari/_paginator.html.haml diff --git a/core/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml index d274bf4..d274bf4 100644 --- a/core/app/views/kaminari/_prev_page.html.haml +++ b/app/views/kaminari/_prev_page.html.haml diff --git a/billing/leap_web_billing.gemspec b/billing/leap_web_billing.gemspec index 94d92e0..cb0335e 100644 --- a/billing/leap_web_billing.gemspec +++ b/billing/leap_web_billing.gemspec @@ -15,7 +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 "leap_web_core", LeapWeb::VERSION # s.add_dependency "braintree-rails", "~> 0.4.5" s.add_dependency "braintree" #s.add_dependency "carmen-rails" diff --git a/billing/lib/leap_web_billing/engine.rb b/billing/lib/leap_web_billing/engine.rb index 6d76add..ab574f2 100644 --- a/billing/lib/leap_web_billing/engine.rb +++ b/billing/lib/leap_web_billing/engine.rb @@ -1,7 +1,4 @@ # thou shall require all your dependencies in an engine. -require "leap_web_core" -require "leap_web_core/ui_dependencies" - #require "braintree-rails" require "braintree" #require "carmen-rails" diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec index 21be09d..87b5be4 100644 --- a/certs/leap_web_certs.gemspec +++ b/certs/leap_web_certs.gemspec @@ -15,7 +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 "leap_web_core", LeapWeb::VERSION s.add_dependency "certificate_authority", [">= 0.2.0"] end diff --git a/certs/lib/leap_web_certs/engine.rb b/certs/lib/leap_web_certs/engine.rb index 3c8948a..33a446e 100644 --- a/certs/lib/leap_web_certs/engine.rb +++ b/certs/lib/leap_web_certs/engine.rb @@ -1,5 +1,3 @@ -require "leap_web_core" - module LeapWebCerts class Engine < ::Rails::Engine diff --git a/core/config/initializers/couchrest_model.rb b/config/initializers/couchrest_model.rb index ce4f41a..ce4f41a 100644 --- a/core/config/initializers/couchrest_model.rb +++ b/config/initializers/couchrest_model.rb diff --git a/core/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index e3f8d09..e3f8d09 100644 --- a/core/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb diff --git a/core/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb index c949f5e..c949f5e 100644 --- a/core/config/initializers/simple_form_bootstrap.rb +++ b/config/initializers/simple_form_bootstrap.rb diff --git a/core/config/initializers/validations.rb b/config/initializers/validations.rb index e8acfbe..e8acfbe 100644 --- a/core/config/initializers/validations.rb +++ b/config/initializers/validations.rb diff --git a/config/locales/en.yml b/config/locales/en.yml index 96c47ca..ac154d6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,4 +3,44 @@ en: terms_of_service: Terms of Service pricing: Pricing about: About Us - contact: Contact
\ No newline at end of file + contact: Contact + no_such_thing: "No such %{thing}." + thing_was_successfully_created: "%{thing} was successfully created." + create_thing: "Create %{thing}" + + overview: "Overview" + user_control_panel: "user control panel" + + created: "Created" + created_by_on: "Created by %{user} on %{time}" + updated: "Updated" + + none: "None" + unknown: "Unknown" + admin: "Admin" + anonymous: "Anonymous" + save: "Save" + add: "Add" + remove: "Remove" + changes_saved: "Changes saved successfully." + are_you_sure: "Are you sure? This change cannot be undone." + + download_client: "Download Bitmask" + client_info: "The Bitmask application allows you to use %{provider} services." + all_downloads_info: "It is available for %{clients}." + other_downloads_info: "Bitmask is also available for %{clients}." + login_info: "Log in to change your account settings, create support tickets, and manage payments." + signup_info: "Sign up for a new user account via this website (it is better if you use the Bitmask application to sign up, but this website works too)." + welcome: "Welcome to %{provider}." + get_help: "Get Help" + help_info: "Can't login? Create a new support ticket anonymously." + example_email: 'user@domain.org' + os: + linux32: "Linux (32 bit)" + linux64: "Linux (64 bit)" + linux: "GNU/Linux" + windows: "Windows" + android: "Android" + osx: "Mac OS" + other: "(not available for your OS)" + diff --git a/core/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 0df11fe..0df11fe 100644 --- a/core/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml diff --git a/core/Gemfile b/core/Gemfile deleted file mode 100644 index b552dc5..0000000 --- a/core/Gemfile +++ /dev/null @@ -1,17 +0,0 @@ -source "https://rubygems.org" - -# Declare your gem's dependencies in leap_web_core.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/core/Rakefile b/core/Rakefile deleted file mode 100644 index 3c6539c..0000000 --- a/core/Rakefile +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env rake - -require 'rake/packagetask' -require 'rubygems/package_task' - -begin - require 'bundler/setup' -rescue LoadError - puts 'You must `gem install bundler` and `bundle install` to run rake tasks' -end -begin - require 'rdoc/task' -rescue LoadError - require 'rdoc/rdoc' - require 'rake/rdoctask' - RDoc::Task = Rake::RDocTask -end - -RDoc::Task.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'LeapWebCore' - rdoc.options << '--line-numbers' - rdoc.rdoc_files.include('README.rdoc') - rdoc.rdoc_files.include('lib/**/*.rb') -end - -spec = eval(File.read('leap_web_core.gemspec')) -Gem::PackageTask.new(spec) do |p| - p.gem_spec = spec -end - -Bundler::GemHelper.install_tasks - -require 'rake/testtask' - -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.libs << 'test' - t.pattern = 'test/**/*_test.rb' - t.verbose = false -end - - -task :default => :test diff --git a/core/Readme.md b/core/Readme.md deleted file mode 100644 index 795c0a4..0000000 --- a/core/Readme.md +++ /dev/null @@ -1,6 +0,0 @@ -Leap Web Core -=== - -[Leap](http://www.leap.se) is the Leap Encryption Access Project and this is the rails app for its web interface. - -This is the its core gem. Currently it only serves to load shared dependencies. diff --git a/core/config/initializers/backtrace_silencers.rb b/core/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cd..0000000 --- a/core/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/core/config/initializers/inflections.rb b/core/config/initializers/inflections.rb deleted file mode 100644 index 5d8d9be..0000000 --- a/core/config/initializers/inflections.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end -# -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/core/config/initializers/mime_types.rb b/core/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e..0000000 --- a/core/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/core/config/initializers/wrap_parameters.rb b/core/config/initializers/wrap_parameters.rb deleted file mode 100644 index 5fe232e..0000000 --- a/core/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters :format => [:json] -end - diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml deleted file mode 100644 index bb510d4..0000000 --- a/core/config/locales/en.yml +++ /dev/null @@ -1,41 +0,0 @@ -en: - no_such_thing: "No such %{thing}." - thing_was_successfully_created: "%{thing} was successfully created." - create_thing: "Create %{thing}" - - overview: "Overview" - user_control_panel: "user control panel" - - created: "Created" - created_by_on: "Created by %{user} on %{time}" - updated: "Updated" - - none: "None" - unknown: "Unknown" - admin: "Admin" - anonymous: "Anonymous" - save: "Save" - add: "Add" - remove: "Remove" - changes_saved: "Changes saved successfully." - are_you_sure: "Are you sure? This change cannot be undone." - - download_client: "Download Bitmask" - client_info: "The Bitmask application allows you to use %{provider} services." - all_downloads_info: "It is available for %{clients}." - other_downloads_info: "Bitmask is also available for %{clients}." - login_info: "Log in to change your account settings, create support tickets, and manage payments." - signup_info: "Sign up for a new user account via this website (it is better if you use the Bitmask application to sign up, but this website works too)." - welcome: "Welcome to %{provider}." - get_help: "Get Help" - help_info: "Can't login? Create a new support ticket anonymously." - example_email: 'user@domain.org' - os: - linux32: "Linux (32 bit)" - linux64: "Linux (64 bit)" - linux: "GNU/Linux" - windows: "Windows" - android: "Android" - osx: "Mac OS" - other: "(not available for your OS)" - diff --git a/core/config/routes.rb b/core/config/routes.rb deleted file mode 100644 index 1daf9a4..0000000 --- a/core/config/routes.rb +++ /dev/null @@ -1,2 +0,0 @@ -Rails.application.routes.draw do -end diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec deleted file mode 100644 index 7ca4d90..0000000 --- a/core/leap_web_core.gemspec +++ /dev/null @@ -1,25 +0,0 @@ -$:.push File.expand_path("../lib", __FILE__) - -require File.expand_path('../../lib/leap_web/version.rb', __FILE__) - -# Describe your gem and declare its dependencies: -Gem::Specification.new do |s| - s.name = "leap_web_core" - s.version = LeapWeb::VERSION - s.authors = ["Azul"] - s.email = ["azul@leap.se"] - s.homepage = "http://www.leap.se" - s.summary = "Web interface to the leap platform - core engine" - s.description = "This web interface provides various administrative tools for the leap platform through plugins. Currently it manages user accounts and certificates." - - s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"] - s.test_files = Dir["test/**/*"] - - s.add_dependency "rails", "~> 3.2.11" - - s.add_dependency "couchrest", "~> 1.1.3" - s.add_dependency "couchrest_model", "~> 2.0.0" - s.add_dependency "couchrest_session_store", "~> 0.2.4" - - s.add_dependency "json" -end diff --git a/core/script/rails b/core/script/rails deleted file mode 100755 index c2ad538..0000000 --- a/core/script/rails +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ruby1.8 -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -ENGINE_ROOT = File.expand_path('../..', __FILE__) -ENGINE_PATH = File.expand_path('../../lib/leap_web_core/engine', __FILE__) - -require 'rails/all' -require 'rails/engine/commands' diff --git a/help/leap_web_help.gemspec b/help/leap_web_help.gemspec index 4914694..ac6d78d 100644 --- a/help/leap_web_help.gemspec +++ b/help/leap_web_help.gemspec @@ -15,5 +15,4 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md"] s.test_files = Dir["test/**/*"] - s.add_dependency "leap_web_core", LeapWeb::VERSION end diff --git a/help/lib/leap_web_help/engine.rb b/help/lib/leap_web_help/engine.rb index 4146dfc..dfa763f 100644 --- a/help/lib/leap_web_help/engine.rb +++ b/help/lib/leap_web_help/engine.rb @@ -1,7 +1,3 @@ -# 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 end diff --git a/core/lib/extensions/couchrest.rb b/lib/extensions/couchrest.rb index a9a195e..a9a195e 100644 --- a/core/lib/extensions/couchrest.rb +++ b/lib/extensions/couchrest.rb diff --git a/core/lib/extensions/testing.rb b/lib/extensions/testing.rb index 8f7e73c..8f7e73c 100644 --- a/core/lib/extensions/testing.rb +++ b/lib/extensions/testing.rb diff --git a/core/lib/leap_web_core.rb b/lib/leap_web_core.rb index a58d140..a58d140 100644 --- a/core/lib/leap_web_core.rb +++ b/lib/leap_web_core.rb diff --git a/core/lib/leap_web_core/dependencies.rb b/lib/leap_web_core/dependencies.rb index 877e3d1..877e3d1 100644 --- a/core/lib/leap_web_core/dependencies.rb +++ b/lib/leap_web_core/dependencies.rb diff --git a/core/lib/leap_web_core/engine.rb b/lib/leap_web_core/engine.rb index 940b5e2..940b5e2 100644 --- a/core/lib/leap_web_core/engine.rb +++ b/lib/leap_web_core/engine.rb diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/lib/leap_web_core/ui_dependencies.rb index 2daee37..2daee37 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/lib/leap_web_core/ui_dependencies.rb diff --git a/core/lib/tasks/leap_web_core_tasks.rake b/lib/tasks/leap_web_core_tasks.rake index ec6abac..ec6abac 100644 --- a/core/lib/tasks/leap_web_core_tasks.rake +++ b/lib/tasks/leap_web_core_tasks.rake diff --git a/core/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb index 2885c3a..2885c3a 100644 --- a/core/test/support/browser_integration_test.rb +++ b/test/support/browser_integration_test.rb diff --git a/core/test/support/rack_test.rb b/test/support/rack_test.rb index 2d8e5c4..2d8e5c4 100644 --- a/core/test/support/rack_test.rb +++ b/test/support/rack_test.rb diff --git a/core/test/support/with_config_helper.rb b/test/support/with_config_helper.rb index 65eb7bc..65eb7bc 100644 --- a/core/test/support/with_config_helper.rb +++ b/test/support/with_config_helper.rb diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec index 7d1f220..630c095 100644 --- a/users/leap_web_users.gemspec +++ b/users/leap_web_users.gemspec @@ -15,8 +15,6 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile"] s.test_files = Dir["test/**/*"] - s.add_dependency "leap_web_core", LeapWeb::VERSION - s.add_dependency "ruby-srp", "~> 0.2.1" s.add_dependency "rails_warden" end diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb index f8ed71c..a2be168 100644 --- a/users/lib/leap_web_users/engine.rb +++ b/users/lib/leap_web_users/engine.rb @@ -1,6 +1,4 @@ # thou shall require all your dependencies in an engine. -require "leap_web_core" -require "leap_web_core/ui_dependencies" require "rails_warden" require "ruby-srp" |