From: František Dvořák Date: Wed, 17 Sep 2014 22:58:11 +0000 (+0200) Subject: Proper unbundle with central requires. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bbdb3b58b287ac9076c90331336888801666c9fe;p=rOCCI-packaging-fedora.git Proper unbundle with central requires. --- diff --git a/rocci-server-requires.diff b/rocci-server-requires.diff deleted file mode 100644 index 39bfa07..0000000 --- a/rocci-server-requires.diff +++ /dev/null @@ -1,89 +0,0 @@ -commit b695e2bad951a1ed051ae78bde50cbb8811fbec4 -Author: FrantiÅ¡ek Dvořák -Date: Tue Sep 16 00:25:08 2014 +0200 - - Requires needed when bundler is not used. - -diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb -index 980305c..5d4a179 100644 ---- a/app/controllers/application_controller.rb -+++ b/app/controllers/application_controller.rb -@@ -1,3 +1,5 @@ -+require 'rails-api' -+ - # Base class for all rOCCI-server's controllers. Implements - # parsing and authentication callbacks, exposes user information, - # declares supported media formats and handles raised errors. -diff --git a/config/environments/development.rb b/config/environments/development.rb -index 687aed9..62f4f5e 100644 ---- a/config/environments/development.rb -+++ b/config/environments/development.rb -@@ -1,3 +1,5 @@ -+require 'logstasher' -+ - ROCCIServer::Application.configure do - # Settings specified here will take precedence over those in config/application.rb. - -diff --git a/config/environments/production.rb b/config/environments/production.rb -index 0fb04f8..2e49e52 100644 ---- a/config/environments/production.rb -+++ b/config/environments/production.rb -@@ -1,3 +1,5 @@ -+require 'logstasher' -+ - ROCCIServer::Application.configure do - # Settings specified here will take precedence over those in config/application.rb. - -diff --git a/config/environments/test.rb b/config/environments/test.rb -index f50130e..4081aec 100644 ---- a/config/environments/test.rb -+++ b/config/environments/test.rb -@@ -1,3 +1,5 @@ -+require 'logstasher' -+ - ROCCIServer::Application.configure do - # Settings specified here will take precedence over those in config/application.rb. - -diff --git a/config/initializers/10_configuration.rb b/config/initializers/10_configuration.rb -index 581f7a7..5d9c72f 100644 ---- a/config/initializers/10_configuration.rb -+++ b/config/initializers/10_configuration.rb -@@ -1,3 +1,6 @@ -+require 'hashie' -+require 'ice_nine' -+ - # Initialize a Mash - ROCCI_SERVER_CONFIG = Hashie::Mash.new - -diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb -index 8c59a9f..089a361 100644 ---- a/config/initializers/warden.rb -+++ b/config/initializers/warden.rb -@@ -1,3 +1,5 @@ -+require 'warden' -+ - # Insert Warden::Manager as Rack::Middleware - Rails.configuration.middleware.insert_before Rack::Head, Warden::Manager do |manager| - manager.default_strategies ROCCI_SERVER_CONFIG.common.authn_strategies.map { |strategy| strategy.to_sym } -diff --git a/config/version.rb b/config/version.rb -index a445104..dcd3caf 100644 ---- a/config/version.rb -+++ b/config/version.rb -@@ -1,3 +1,5 @@ -+require 'occi-core' -+ - module ROCCIServer - VERSION = '1.0.5' - ROCCI_VERSION = ::Occi::VERSION -diff --git a/lib/backends/opennebula/authn/cloud_auth_client.rb b/lib/backends/opennebula/authn/cloud_auth_client.rb -index a6674a2..2e2b480 100644 ---- a/lib/backends/opennebula/authn/cloud_auth_client.rb -+++ b/lib/backends/opennebula/authn/cloud_auth_client.rb -@@ -14,6 +14,7 @@ - # limitations under the License. # - #--------------------------------------------------------------------------- # - -+require 'opennebula' - require 'thread' - - module Backends::Opennebula::Authn diff --git a/rocci-server-unbundle.diff b/rocci-server-unbundle.diff index 7cf08f0..f4ca918 100644 --- a/rocci-server-unbundle.diff +++ b/rocci-server-unbundle.diff @@ -1,18 +1,51 @@ ---- ./config/application.rb.orig 2014-08-13 20:47:29.000000000 +0200 -+++ ./config/application.rb 2014-08-20 20:22:35.635715445 +0200 -@@ -8,10 +8,6 @@ require 'action_controller/railtie' +commit 6472c939703f3a9a64c669a2fd826ad2a98e8bdd +Author: FrantiÅ¡ek Dvořák +Date: Thu Sep 18 00:47:31 2014 +0200 + + Remove bundler. + +diff --git a/config/application.rb b/config/application.rb +index 98480fb..268b1ca 100644 +--- a/config/application.rb ++++ b/config/application.rb +@@ -8,9 +8,30 @@ require 'action_controller/railtie' require 'rails/test_unit/railtie' # require 'sprockets/railtie' -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) -- ++require 'rails' ++require 'rails-api' ++require 'jbuilder' ++require 'rack-cors' ++require 'passenger' ++require 'dalli' ++require 'kgio' ++require 'warden' ++require 'logstasher' ++require 'hashie' ++require 'ice_nine' ++require 'occi-core' ++# ec2 backend ++begin ++ require 'aws-sdk-core' ++rescue ++end ++# opennebula backend ++begin ++ require 'opennebula' ++ require 'erubis' ++ require 'ox' ++rescue ++end + # Extend Object with #deep_freeze require 'ice_nine/core_ext/object' - ---- ./config/boot.rb.orig 2014-08-13 20:47:29.000000000 +0200 -+++ ./config/boot.rb 2014-08-20 20:22:05.051097805 +0200 +diff --git a/config/boot.rb b/config/boot.rb +index 3596736..e69de29 100644 +--- a/config/boot.rb ++++ b/config/boot.rb @@ -1,4 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)