You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/05/22 22:19:37 UTC
[19/50] [abbrv] git commit: Add a core_ext.rb to ease loading of all
core extensions
Add a core_ext.rb to ease loading of all core extensions
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/833e5dbc
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/833e5dbc
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/833e5dbc
Branch: refs/heads/master
Commit: 833e5dbcbe742975eb6a7369fcbfc1cbab0de15a
Parents: 273d348
Author: David Lutterkort <lu...@redhat.com>
Authored: Wed May 16 15:37:05 2012 -0700
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue May 22 22:17:38 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud.rb | 6 +-----
server/lib/deltacloud/core_ext.rb | 21 +++++++++++++++++++++
server/lib/deltacloud_rack.rb | 6 +-----
server/spec/spec_helper.rb | 4 +---
4 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/833e5dbc/server/lib/deltacloud.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud.rb b/server/lib/deltacloud.rb
index 6160cce..bf5345f 100644
--- a/server/lib/deltacloud.rb
+++ b/server/lib/deltacloud.rb
@@ -18,11 +18,7 @@ require 'ostruct'
load File.join(File.dirname(__FILE__), 'deltacloud/core_ext.rb')
-require_relative 'deltacloud/core_ext/string'
-require_relative 'deltacloud/core_ext/array'
-require_relative 'deltacloud/core_ext/hash'
-require_relative 'deltacloud/core_ext/integer'
-require_relative 'deltacloud/core_ext/proc'
+require_relative 'deltacloud/core_ext'
require_relative 'deltacloud/models'
require_relative 'deltacloud/drivers'
require_relative 'deltacloud/helpers/driver_helper'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/833e5dbc/server/lib/deltacloud/core_ext.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/core_ext.rb b/server/lib/deltacloud/core_ext.rb
new file mode 100644
index 0000000..b54df66
--- /dev/null
+++ b/server/lib/deltacloud/core_ext.rb
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership. The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+require 'deltacloud/core_ext/array'
+require 'deltacloud/core_ext/hash'
+require 'deltacloud/core_ext/integer'
+require 'deltacloud/core_ext/proc'
+require 'deltacloud/core_ext/string'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/833e5dbc/server/lib/deltacloud_rack.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud_rack.rb b/server/lib/deltacloud_rack.rb
index a52354c..e59b11a 100644
--- a/server/lib/deltacloud_rack.rb
+++ b/server/lib/deltacloud_rack.rb
@@ -21,11 +21,7 @@ unless Kernel.respond_to?(:require_relative)
end
end
-require_relative './deltacloud/core_ext/string'
-require_relative './deltacloud/core_ext/array'
-require_relative './deltacloud/core_ext/hash'
-require_relative './deltacloud/core_ext/integer'
-require_relative './deltacloud/core_ext/proc'
+require_relative './deltacloud/core_ext'
module Deltacloud
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/833e5dbc/server/spec/spec_helper.rb
----------------------------------------------------------------------
diff --git a/server/spec/spec_helper.rb b/server/spec/spec_helper.rb
index 22809e2..51aa1fe 100644
--- a/server/spec/spec_helper.rb
+++ b/server/spec/spec_helper.rb
@@ -19,9 +19,7 @@ require 'pp'
require 'rspec/core'
require 'xmlsimple'
-load File.join(File.dirname(__FILE__), '..', 'lib', 'deltacloud', 'core_ext', 'array.rb')
-load File.join(File.dirname(__FILE__), '..', 'lib', 'deltacloud', 'core_ext', 'string.rb')
-load File.join(File.dirname(__FILE__), '..', 'lib', 'cimi', 'models.rb')
+load File.join(File.dirname(__FILE__), '..', 'lib', 'deltacloud', 'core_ext.rb')
DATA_DIR = File::join(File::expand_path(File::dirname(__FILE__)), 'cimi', 'data')