fog 0.0.42 → 0.0.43

data/README.rdoc

@@ -93,7 +93,7 @@ Now we will try again, but with Rackspace
   directory.files.create(:key => 'filename', :body => 'filebody')
 
   # connect to your directory
-  directory = connection.directories.get('filename')
+  directory = connection.directories.get('directoryname')
 
   # get your file
   file = directory.files.get('filename')

data/Rakefile

@@ -8,6 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.add_dependency('excon', '>=0.0.18')
+    gem.add_dependency('formatador')
     gem.add_dependency('json')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 42
-:build:
+:patch: 43
+:build: 

data/bin/fog

@@ -1,116 +1,37 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+require File.join(lib_dir, 'fog')
 require 'irb'
 require 'yaml'
 
-module Fog
-  module Credentials
-    Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
-    unless Fog.credentials
-      exit
-    end
-  end
-end
-
-module AWS
-  class << self
-    credential = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials[:aws_access_key_id] && Fog.credentials[:aws_secret_access_key]
-
-      def [](service)
-        @@connections ||= Hash.new do |hash, key|
-          credentials = Fog.credentials.reject do |k, v|
-            ![:aws_access_key_id, :aws_secret_access_key].include?(k)
-          end
-          hash[key] = case key
-          when :ec2
-            Fog::AWS::EC2.new(credentials)
-          when :s3
-            Fog::AWS::S3.new(credentials)
-          end
-        end
-        @@connections[service]
-      end
-
-      def addresses
-        self[:ec2].addresses
-      end
-
-      def directories
-        self[:s3].directories
-      end
-
-      def flavors
-        self[:ec2].flavors
-      end
-
-      def images
-        self[:ec2].images
-      end
-
-      def servers
-        self[:ec2].servers
-      end
-
-      def key_pairs
-        self[:ec2].key_pairs
-      end
-
-      def security_groups
-        self[:ec2].security_groups
-      end
+require File.join(lib_dir, 'fog', 'bin')
 
-      def snapshots
-        self[:ec2].snapshots
-      end
-
-      def volumes
-        self[:ec2].volumes
-      end
-
-    end
-  end
+Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
+unless Fog.credentials
+  exit
 end
 
-module Rackspace
-  class << self
-    if Fog.credentials[:rackspace_api_key] && Fog.credentials[:rackspace_username]
-
-      def [](service)
-        @@connections ||= Hash.new do |hash, key|
-          credential = (ARGV.first && :"#{ARGV.first}") || :default
-          credentials = Fog.credentials.reject do |k,v|
-            ![:rackspace_api_key, :rackspace_username].include?(k)
-          end
-          hash[key] = case key
-          when :files
-            Fog::Rackspace::Files.new(credentials)
-          when :servers
-            Fog::Rackspace::Servers.new(credentials)
-          end
-        end
-        @@connections[service]
-      end
-
-      def flavors
-        self[:servers].flavors
-      end
-
-      def images
-        self[:servers].images
-      end
-
-      def servers
-        self[:servers].servers
-      end
-      
-    end
-  end
-end
+require File.join(lib_dir, 'fog', 'aws', 'bin')
+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]
+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 }

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.42"
+  s.version = "0.0.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-15}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "fog.gemspec",
      "lib/fog.rb",
      "lib/fog/aws.rb",
+     "lib/fog/aws/bin.rb",
      "lib/fog/aws/ec2.rb",
      "lib/fog/aws/models/ec2/address.rb",
      "lib/fog/aws/models/ec2/addresses.rb",
@@ -132,11 +133,13 @@ Gem::Specification.new do |s|
      "lib/fog/aws/requests/simpledb/select.rb",
      "lib/fog/aws/s3.rb",
      "lib/fog/aws/simpledb.rb",
+     "lib/fog/bin.rb",
      "lib/fog/collection.rb",
      "lib/fog/connection.rb",
      "lib/fog/model.rb",
      "lib/fog/parser.rb",
      "lib/fog/rackspace.rb",
+     "lib/fog/rackspace/bin.rb",
      "lib/fog/rackspace/files.rb",
      "lib/fog/rackspace/models/servers/flavor.rb",
      "lib/fog/rackspace/models/servers/flavors.rb",
@@ -171,17 +174,45 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/requests/servers/update_server.rb",
      "lib/fog/rackspace/servers.rb",
      "lib/fog/slicehost.rb",
+     "lib/fog/slicehost/bin.rb",
+     "lib/fog/slicehost/models/flavor.rb",
+     "lib/fog/slicehost/models/flavors.rb",
+     "lib/fog/slicehost/models/image.rb",
+     "lib/fog/slicehost/models/images.rb",
+     "lib/fog/slicehost/models/server.rb",
+     "lib/fog/slicehost/models/servers.rb",
      "lib/fog/slicehost/parsers/create_slice.rb",
      "lib/fog/slicehost/parsers/get_backups.rb",
+     "lib/fog/slicehost/parsers/get_flavor.rb",
      "lib/fog/slicehost/parsers/get_flavors.rb",
+     "lib/fog/slicehost/parsers/get_image.rb",
      "lib/fog/slicehost/parsers/get_images.rb",
+     "lib/fog/slicehost/parsers/get_slice.rb",
      "lib/fog/slicehost/parsers/get_slices.rb",
      "lib/fog/slicehost/requests/create_slice.rb",
      "lib/fog/slicehost/requests/delete_slice.rb",
      "lib/fog/slicehost/requests/get_backups.rb",
+     "lib/fog/slicehost/requests/get_flavor.rb",
      "lib/fog/slicehost/requests/get_flavors.rb",
+     "lib/fog/slicehost/requests/get_image.rb",
      "lib/fog/slicehost/requests/get_images.rb",
+     "lib/fog/slicehost/requests/get_slice.rb",
      "lib/fog/slicehost/requests/get_slices.rb",
+     "lib/fog/slicehost/requests/reboot_slice.rb",
+     "lib/fog/terremark.rb",
+     "lib/fog/terremark/bin.rb",
+     "lib/fog/terremark/parsers/get_catalog.rb",
+     "lib/fog/terremark/parsers/get_catalog_item.rb",
+     "lib/fog/terremark/parsers/get_organization.rb",
+     "lib/fog/terremark/parsers/get_organizations.rb",
+     "lib/fog/terremark/parsers/get_vapp_template.rb",
+     "lib/fog/terremark/parsers/get_vdc.rb",
+     "lib/fog/terremark/requests/get_catalog.rb",
+     "lib/fog/terremark/requests/get_catalog_item.rb",
+     "lib/fog/terremark/requests/get_organization.rb",
+     "lib/fog/terremark/requests/get_organizations.rb",
+     "lib/fog/terremark/requests/get_vapp_template.rb",
+     "lib/fog/terremark/requests/get_vdc.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
      "spec/aws/models/ec2/key_pair_spec.rb",
@@ -279,12 +310,18 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/shared_examples/server_examples.rb",
      "spec/shared_examples/servers_examples.rb",
+     "spec/slicehost/models/server_spec.rb",
+     "spec/slicehost/models/servers_spec.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
+     "spec/slicehost/requests/get_flavor_spec.rb",
      "spec/slicehost/requests/get_flavors_spec.rb",
+     "spec/slicehost/requests/get_image_spec.rb",
      "spec/slicehost/requests/get_images_spec.rb",
+     "spec/slicehost/requests/get_slice_spec.rb",
      "spec/slicehost/requests/get_slices_spec.rb",
+     "spec/slicehost/requests/reboot_slice_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/geemus/fog}
@@ -423,12 +460,18 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/shared_examples/server_examples.rb",
      "spec/shared_examples/servers_examples.rb",
+     "spec/slicehost/models/server_spec.rb",
+     "spec/slicehost/models/servers_spec.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
+     "spec/slicehost/requests/get_flavor_spec.rb",
      "spec/slicehost/requests/get_flavors_spec.rb",
+     "spec/slicehost/requests/get_image_spec.rb",
      "spec/slicehost/requests/get_images_spec.rb",
+     "spec/slicehost/requests/get_slice_spec.rb",
      "spec/slicehost/requests/get_slices_spec.rb",
+     "spec/slicehost/requests/reboot_slice_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -438,12 +481,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<excon>, [">= 0.0.18"])
+      s.add_runtime_dependency(%q<formatador>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
       s.add_dependency(%q<excon>, [">= 0.0.18"])
+      s.add_dependency(%q<formatador>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -451,6 +496,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<excon>, [">= 0.0.18"])
+    s.add_dependency(%q<formatador>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

data/lib/fog.rb

@@ -3,6 +3,7 @@ require 'base64'
 require 'cgi'
 require 'digest/md5'
 require 'excon'
+require 'formatador'
 require 'hmac-sha1'
 require 'hmac-sha2'
 require 'json'
@@ -18,6 +19,8 @@ $LOAD_PATH.unshift __DIR__ unless
 
 module Fog
 
+  class MockNotImplemented < StandardError; end
+
   def self.mock!
     @mocking = true
     self.reload
@@ -27,55 +30,23 @@ module Fog
     !!@mocking
   end
 
-  def self.reload
-    load "fog/collection.rb"
-    load "fog/connection.rb"
-    load "fog/model.rb"
-    load "fog/parser.rb"
-
-    load "fog/aws.rb"
-    load "fog/rackspace.rb"
-    load "fog/slicehost.rb"
-  end
-
-  def self.credential=(new_credential)
-    @credential = new_credential
-    @credentials = nil
+  def self.dependencies
+    [
+      'fog/collection.rb',
+      'fog/connection.rb',
+      'fog/model.rb',
+      'fog/parser.rb',
+      'fog/aws.rb',
+      'fog/rackspace.rb',
+      'fog/slicehost.rb',
+      'fog/terremark.rb'
+      ]
   end
 
-  def self.credential
-    @credential || :default
-  end
-
-  def self.credentials
-    @credentials ||= begin
-      path = File.expand_path('~/.fog')
-      credentials = if File.exists?(path)
-        File.open(path) do |file|
-          YAML.load(file.read)
-        end
-      else
-        nil
-      end
-      unless credentials && credentials[credential]
-        print("\n  To run as '#{credential}', add credentials like the following to ~/.fog\n")
-        yml = <<-YML
-
-:#{credential}:
-  :aws_access_key_id:     INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
-  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
-  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
-
-YML
-        print(yml)
-        raise(ArgumentError.new("Missing Credentials"))
-      end
-      credentials[credential]
-    end
+  def self.reload
+    self.dependencies.each {|dependency| load(dependency)}
   end
 
 end
 
-Fog.reload
+Fog.dependencies.each {|dependency| require(dependency)}

data/lib/fog/aws.rb

@@ -1,10 +1,16 @@
 module Fog
   module AWS
 
+    def self.dependencies
+      [
+        'fog/aws/ec2.rb',
+        'fog/aws/simpledb.rb',
+        'fog/aws/s3.rb'
+      ]
+    end
+
     def self.reload
-      load "fog/aws/ec2.rb"
-      load "fog/aws/simpledb.rb"
-      load "fog/aws/s3.rb"
+      self.dependencies.each {|dependency| load(dependency)}
     end
 
     def self.indexed_param(key, values)
@@ -172,4 +178,4 @@ module Fog
   end
 end
 
-Fog::AWS.reload
+Fog::AWS.dependencies.each {|dependency| require(dependency)}

data/lib/fog/aws/bin.rb

@@ -0,0 +1,69 @@
+module AWS
+  class << self
+    credential = (ARGV.first && :"#{ARGV.first}") || :default
+    if Fog.credentials[:aws_access_key_id] && Fog.credentials[:aws_secret_access_key]
+
+      def initialized?
+        true
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          credentials = Fog.credentials.reject do |k, v|
+            ![:aws_access_key_id, :aws_secret_access_key].include?(k)
+          end
+          hash[key] = case key
+          when :ec2
+            Fog::AWS::EC2.new(credentials)
+          when :s3
+            Fog::AWS::S3.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+      def addresses
+        self[:ec2].addresses
+      end
+
+      def directories
+        self[:s3].directories
+      end
+
+      def flavors
+        self[:ec2].flavors
+      end
+
+      def images
+        self[:ec2].images
+      end
+
+      def servers
+        self[:ec2].servers
+      end
+
+      def key_pairs
+        self[:ec2].key_pairs
+      end
+
+      def security_groups
+        self[:ec2].security_groups
+      end
+
+      def snapshots
+        self[:ec2].snapshots
+      end
+
+      def volumes
+        self[:ec2].volumes
+      end
+
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end