1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

small technicality cleanups

This commit is contained in:
geemus 2010-05-15 21:05:16 -07:00
parent 22ec5774dd
commit 090f66d3d2
3 changed files with 10 additions and 10 deletions

16
bin/fog
View file

@ -2,20 +2,20 @@
require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
require 'irb'
require 'yaml'
require 'fog/credentials'
require 'fog/bin'
require File.join('fog', 'credentials')
require File.join('fog', 'bin')
Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
unless Fog.credentials
exit
end
require 'fog/aws/bin'
require 'fog/local/bin'
require 'fog/rackspace/bin'
require 'fog/slicehost/bin'
require 'fog/terremark/bin'
require 'fog/vcloud/bin'
require File.join('fog', 'aws', 'bin')
require File.join('fog', 'local', 'bin')
require File.join('fog', 'rackspace', 'bin')
require File.join('fog', 'slicehost', 'bin')
require File.join('fog', 'terremark', 'bin')
require File.join('fog', 'vcloud', 'bin')
if ARGV.length > 1
print(instance_eval(ARGV[1..-1].join(' ')).to_json)

View file

@ -278,7 +278,7 @@ module Fog
end
if mod = credentials[:module]
instance.extend eval "#{mod}"
instance.extend eval("#{mod}")
end
instance

View file

@ -25,7 +25,7 @@ module Vcloud
false
end
if Vcloud.services.all? { |service| Vcloud.complete_service_options?(service) }
if Vcloud.services.any? && Vcloud.services.all? { |service| Vcloud.complete_service_options?(service) }
def initialized?
true