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

allow passing a request into bin/fog to return json

Browse source
This commit is contained in:
geemus (Wesley Beary) 2010-03-27 18:06:32 -07:00
parent f77fdc9a7e
commit 1761fc53f8
3 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
bin/fog
View file

@ -16,22 +16,28 @@ require File.join(lib_dir, 'fog', 'rackspace', 'bin')
require File.join(lib_dir, 'fog', 'slicehost', 'bin')
require File.join(lib_dir, 'fog', 'terremark', 'bin')
ARGV.clear # Avoid passing args to IRB
IRB.setup(nil)
@irb = IRB::Irb.new(nil)
IRB.conf[:MAIN_CONTEXT] = @irb.context
IRB.conf[:PROMPT][:FOG] = IRB.conf[:PROMPT][:SIMPLE].dup
IRB.conf[:PROMPT][:FOG][:RETURN] = "%s\n"
@irb.context.prompt_mode = :FOG
@irb.context.workspace = IRB::WorkSpace.new(binding)
services = Fog.services.map{|service| service.to_s}
available_services = if services.length > 1
services[0...-1].join(', ') << ' and ' << services[-1]
if ARGV.length > 1
p instance_eval(ARGV[1..-1].join(' ')).to_json
else
services.first
end
print "Welcome to fog interactive!\n"
print "Your '#{Fog.credential.to_s}' configuration provides access to #{available_services}.\n"
catch(:IRB_EXIT) { @irb.eval_input }
ARGV.clear # Avoid passing args to IRB
IRB.setup(nil)
@irb = IRB::Irb.new(nil)
IRB.conf[:MAIN_CONTEXT] = @irb.context
IRB.conf[:PROMPT][:FOG] = IRB.conf[:PROMPT][:SIMPLE].dup
IRB.conf[:PROMPT][:FOG][:RETURN] = "%s\n"
@irb.context.prompt_mode = :FOG
@irb.context.workspace = IRB::WorkSpace.new(binding)
services = Fog.services.map{|service| service.to_s}
available_services = if services.length > 1
services[0...-1].join(', ') << ' and ' << services[-1]
else
services.first
end
print "Welcome to fog interactive!\n"
print "Your '#{Fog.credential.to_s}' configuration provides access to #{available_services}.\n"
catch(:IRB_EXIT) { @irb.eval_input }
end

4
lib/fog/collection.rb
View file

@ -145,6 +145,10 @@ module Fog
Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
end
def to_json
self.map {|member| member}.to_json
end
private
def lazy_load

4
lib/fog/model.rb
View file

@ -102,6 +102,10 @@ module Fog
end
end
def to_json
attributes.to_json
end
def wait_for(timeout = 600, &block)
start = Time.now
until instance_eval(&block)