зеркало из https://github.com/microsoft/fog.git
small technicality cleanups
This commit is contained in:
Родитель
22ec5774dd
Коммит
090f66d3d2
16
bin/fog
16
bin/fog
|
@ -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)
|
||||
|
|
|
@ -278,7 +278,7 @@ module Fog
|
|||
end
|
||||
|
||||
if mod = credentials[:module]
|
||||
instance.extend eval "#{mod}"
|
||||
instance.extend eval("#{mod}")
|
||||
end
|
||||
|
||||
instance
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче