fog 0.0.30 → 0.0.31

data/VERSION

@@ -1 +1 @@
-0.0.30
+0.0.31

data/bin/fog

@@ -5,7 +5,11 @@ require 'yaml'
 
 def credentials
   @credentials ||= begin
-    YAML.load(File.open(File.expand_path('~/.fog')).read)
+    if ARGV[0] && File.exists?(File.expand_path(ARGV[0]))
+      YAML.load(File.open(File.expand_path(ARGV[0])).read)
+    elsif File.exists?(File.expand_path('~/.fog'))
+      YAML.load(File.open(File.expand_path('~/.fog')).read)
+    end
   end
 end
 
@@ -72,20 +76,9 @@ module Rackspace
   end
 end
 
-if ARGV[0]
-  result = eval(ARGV[0])
-  result = case result
-  when Fog::Collection
-    result.map {|model| model.attributes.reject {|key, value| key == :owner}}
-  when Fog::Model
-    result.attributes
-  end
-  print(Marshal.dump(result))
-else
-  ARGV.clear # Avoid passing args to IRB
-  IRB.setup(nil)
-  @irb = IRB::Irb.new(nil)
-  IRB.conf[:MAIN_CONTEXT] = @irb.context
-  @irb.context.workspace = IRB::WorkSpace.new(binding)
-  catch(:IRB_EXIT) { @irb.eval_input }
-end
+ARGV.clear # Avoid passing args to IRB
+IRB.setup(nil)
+@irb = IRB::Irb.new(nil)
+IRB.conf[:MAIN_CONTEXT] = @irb.context
+@irb.context.workspace = IRB::WorkSpace.new(binding)
+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.30"
+  s.version = "0.0.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-11-14}
+  s.date = %q{2009-11-16}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -135,6 +135,8 @@ Gem::Specification.new do |s|
      "lib/fog/parser.rb",
      "lib/fog/rackspace.rb",
      "lib/fog/rackspace/files.rb",
+     "lib/fog/rackspace/models/servers/flavor.rb",
+     "lib/fog/rackspace/models/servers/flavors.rb",
      "lib/fog/rackspace/models/servers/server.rb",
      "lib/fog/rackspace/models/servers/servers.rb",
      "lib/fog/rackspace/requests/files/delete_container.rb",
@@ -149,6 +151,7 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/requests/servers/create_server.rb",
      "lib/fog/rackspace/requests/servers/delete_image.rb",
      "lib/fog/rackspace/requests/servers/delete_server.rb",
+     "lib/fog/rackspace/requests/servers/get_flavor_details.rb",
      "lib/fog/rackspace/requests/servers/get_server_details.rb",
      "lib/fog/rackspace/requests/servers/list_addresses.rb",
      "lib/fog/rackspace/requests/servers/list_flavors.rb",
@@ -242,6 +245,7 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/create_server_spec.rb",
      "spec/rackspace/requests/servers/delete_image_spec.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
      "spec/rackspace/requests/servers/list_addresses_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
@@ -343,6 +347,7 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/create_server_spec.rb",
      "spec/rackspace/requests/servers/delete_image_spec.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
      "spec/rackspace/requests/servers/list_addresses_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",

data/lib/fog.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'base64'
 require 'cgi'
 require 'digest/md5'
+require 'excon'
 require 'hmac-sha1'
 require 'hmac-sha2'
 require 'json'

data/lib/fog/connection.rb

@@ -1,9 +1,3 @@
-require 'rubygems'
-require 'excon'
-
-require "fog/errors"
-require "fog/response"
-
 unless Fog.mocking?
 
   module Fog

data/lib/fog/rackspace/models/servers/flavor.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Servers
+
+      class Flavor < Fog::Model
+
+        identity :id
+
+        attribute :disk
+        attribute :id
+        attribute :name
+        attribute :ram
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/servers/flavors.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Rackspace
+    class Servers
+
+      def flavors
+        Fog::Rackspace::Servers::Flavors.new(:connection => self)
+      end
+
+      class Flavors < Fog::Collection
+
+        model Fog::Rackspace::Servers::Flavor
+
+        def all
+          data = connection.list_flavors_detail.body
+          flavors = Fog::Rackspace::Servers::Flavors.new({
+            :connection => connection
+          })
+          for flavor in data['flavors']
+            flavors << Fog::Rackspace::Servers::Flavor.new({
+              :collection => flavors,
+              :connection => connection
+            }.merge!(flavor))
+          end
+          flavors
+        end
+
+        def get(flavor_id)
+          connection.get_flavor_details(flavor_id)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/servers/servers.rb

@@ -24,8 +24,8 @@ module Fog
           servers
         end
 
-        def get(id)
-          connection.get_server_details(id)
+        def get(server_id)
+          connection.get_server_details(server_id)
         rescue Excon::Errors::NotFound
           nil
         end

data/lib/fog/rackspace/requests/servers/get_flavor_details.rb

@@ -0,0 +1,41 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # Get details for flavor by id
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'id'<~Integer> - Id of the flavor
+        #     * 'name'<~String> - Name of the flavor
+        #     * 'ram'<~Integer> - Amount of ram for the flavor
+        #     * 'disk'<~Integer> - Amount of diskspace for the flavor
+        def get_flavor_details(flavor_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "flavors/#{flavor_id}.json"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def get_flavor_details(flavor_id)
+        end
+
+      end
+    end
+  end
+
+end

data/lib/fog/rackspace/requests/servers/list_flavors.rb

@@ -4,7 +4,7 @@ unless Fog.mocking?
     module Rackspace
       class Servers
 
-        # List all images (IDs and names only)
+        # List all flavors (IDs and names only)
         #
         # ==== Returns
         # * response<~Excon::Response>:

data/lib/fog/rackspace/requests/servers/list_flavors_detail.rb

@@ -4,7 +4,7 @@ unless Fog.mocking?
     module Rackspace
       class Servers
 
-        # List all images (IDs and names only)
+        # List all flavors
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -15,7 +15,7 @@ unless Fog.mocking?
         #     * 'disk'<~Integer> - Amount of diskspace for the flavor
         def list_flavors_detail
           request(
-            :expects  => 200,
+            :expects  => [200, 203],
             :method   => 'GET',
             :path     => 'flavors/detail.json'
           )

data/lib/fog/rackspace/servers.rb

@@ -15,6 +15,8 @@ module Fog
       end
 
       def self.reload
+        load "fog/rackspace/models/servers/flavor.rb"
+        load "fog/rackspace/models/servers/flavors.rb"
         load "fog/rackspace/models/servers/server.rb"
         load "fog/rackspace/models/servers/servers.rb"
 
@@ -22,6 +24,7 @@ module Fog
         load "fog/rackspace/requests/servers/create_server.rb"
         load "fog/rackspace/requests/servers/delete_image.rb"
         load "fog/rackspace/requests/servers/delete_server.rb"
+        load "fog/rackspace/requests/servers/get_flavor_details.rb"
         load "fog/rackspace/requests/servers/get_server_details.rb"
         load "fog/rackspace/requests/servers/list_addresses.rb"
         load "fog/rackspace/requests/servers/list_private_addresses.rb"

data/spec/rackspace/requests/servers/get_flavor_details_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.get_flavor_details' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = servers.get_flavor_details(1).body['flavor']
+      actual['disk'].should be_an(Integer)
+      actual['id'].should be_an(Integer)
+      actual['name'].should be_a(String)
+      actual['ram'].should be_an(Integer)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -08:00
+date: 2009-11-16 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -178,6 +178,8 @@ files:
 - lib/fog/parser.rb
 - lib/fog/rackspace.rb
 - lib/fog/rackspace/files.rb
+- lib/fog/rackspace/models/servers/flavor.rb
+- lib/fog/rackspace/models/servers/flavors.rb
 - lib/fog/rackspace/models/servers/server.rb
 - lib/fog/rackspace/models/servers/servers.rb
 - lib/fog/rackspace/requests/files/delete_container.rb
@@ -192,6 +194,7 @@ files:
 - lib/fog/rackspace/requests/servers/create_server.rb
 - lib/fog/rackspace/requests/servers/delete_image.rb
 - lib/fog/rackspace/requests/servers/delete_server.rb
+- lib/fog/rackspace/requests/servers/get_flavor_details.rb
 - lib/fog/rackspace/requests/servers/get_server_details.rb
 - lib/fog/rackspace/requests/servers/list_addresses.rb
 - lib/fog/rackspace/requests/servers/list_flavors.rb
@@ -285,6 +288,7 @@ files:
 - spec/rackspace/requests/servers/create_server_spec.rb
 - spec/rackspace/requests/servers/delete_image_spec.rb
 - spec/rackspace/requests/servers/delete_server_spec.rb
+- spec/rackspace/requests/servers/get_flavor_details_spec.rb
 - spec/rackspace/requests/servers/get_server_details_spec.rb
 - spec/rackspace/requests/servers/list_addresses_spec.rb
 - spec/rackspace/requests/servers/list_flavors_detail_spec.rb
@@ -407,6 +411,7 @@ test_files:
 - spec/rackspace/requests/servers/create_server_spec.rb
 - spec/rackspace/requests/servers/delete_image_spec.rb
 - spec/rackspace/requests/servers/delete_server_spec.rb
+- spec/rackspace/requests/servers/get_flavor_details_spec.rb
 - spec/rackspace/requests/servers/get_server_details_spec.rb
 - spec/rackspace/requests/servers/list_addresses_spec.rb
 - spec/rackspace/requests/servers/list_flavors_detail_spec.rb