[1/2] git commit: Core: Fixed displaying drivers using deltacloudd --drivers

[mf...@apache.org]

Updated Branches:
  refs/heads/master d88ee48b1 -> 5aa335bef


Core: Fixed displaying drivers using deltacloudd --drivers

Signed-off-by: Michal fojtik <mf...@redhat.com>


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/5aa335be
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/5aa335be
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/5aa335be

Branch: refs/heads/master
Commit: 5aa335beff48436fa913d0c145bfe9169f3a8342
Parents: cabbe9b
Author: Michal Fojtik <mf...@redhat.com>
Authored: Mon May 28 10:51:29 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Mon May 28 15:02:42 2012 +0200

----------------------------------------------------------------------
 server/bin/deltacloudd            |    4 ++--
 server/lib/deltacloud/core_ext.rb |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5aa335be/server/bin/deltacloudd
----------------------------------------------------------------------
diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
index 8eb448d..3dbe967 100755
--- a/server/bin/deltacloudd
+++ b/server/bin/deltacloudd
@@ -128,9 +128,9 @@ end
 if options[:drivers]
   $:.unshift File.join($top_srcdir, 'lib')
   server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
-  load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
+  load File.join($top_srcdir, 'lib', server_dir, 'api.rb')
   puts "Available drivers:\n\n"
-  puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
+  puts Deltacloud.drivers.keys.join("\n")
   puts
   exit(0)
 end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5aa335be/server/lib/deltacloud/core_ext.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/core_ext.rb b/server/lib/deltacloud/core_ext.rb
index edaaa00..b448adb 100644
--- a/server/lib/deltacloud/core_ext.rb
+++ b/server/lib/deltacloud/core_ext.rb
@@ -14,6 +14,14 @@
 # under the License.
 #
 
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 require_relative './core_ext/array'
 require_relative './core_ext/hash'
 require_relative './core_ext/integer'