small fixes to facilitate command line usage

This commit is contained in:
geemus 2010-10-19 13:00:27 -07:00
parent bcbbdbba41
commit c04f777b93
2 changed files with 11 additions and 8 deletions

17
bin/fog
View File

@ -12,8 +12,17 @@ end
require 'fog/core/bin' require 'fog/core/bin'
providers = Fog.providers.map{|provider| provider.to_s}
providers = if providers.length > 1
providers[0...-1].join(', ') << ' and ' << providers[-1]
else
providers.first
end
if ARGV.length > 1 if ARGV.length > 1
print(instance_eval(ARGV[1..-1].join(' ')).to_json)
puts(instance_eval(ARGV[1..-1].join(' ')).to_json)
else else
ARGV.clear # Avoid passing args to IRB ARGV.clear # Avoid passing args to IRB
@ -25,12 +34,6 @@ else
@irb.context.prompt_mode = :FOG @irb.context.prompt_mode = :FOG
@irb.context.workspace = IRB::WorkSpace.new(binding) @irb.context.workspace = IRB::WorkSpace.new(binding)
providers = Fog.providers.map{|provider| provider.to_s}
providers = if providers.length > 1
providers[0...-1].join(', ') << ' and ' << providers[-1]
else
providers.first
end
Formatador.display_line('Welcome to fog interactive!') Formatador.display_line('Welcome to fog interactive!')
Formatador.display_line(":#{Fog.credential.to_s} credentials provide #{providers}") Formatador.display_line(":#{Fog.credential.to_s} credentials provide #{providers}")
providers = Fog.providers providers = Fog.providers

View File

@ -112,7 +112,7 @@ module Fog
end end
def to_json def to_json
self.map {|member| member}.to_json self.map {|member| member.attributes}.to_json
end end
private private