fog 0.2.15 → 0.2.16

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.2.15'
-  s.date              = '2010-07-17'
+  s.version           = '0.2.16'
+  s.date              = '2010-07-22'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -116,6 +116,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/ec2/detach_volume.rb
     lib/fog/aws/parsers/ec2/get_console_output.rb
     lib/fog/aws/parsers/ec2/run_instances.rb
+    lib/fog/aws/parsers/ec2/start_stop_instances.rb
     lib/fog/aws/parsers/ec2/terminate_instances.rb
     lib/fog/aws/parsers/elb/create_load_balancer.rb
     lib/fog/aws/parsers/elb/delete_load_balancer.rb
@@ -169,6 +170,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/release_address.rb
     lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
     lib/fog/aws/requests/ec2/run_instances.rb
+    lib/fog/aws/requests/ec2/start_instances.rb
+    lib/fog/aws/requests/ec2/stop_instances.rb
     lib/fog/aws/requests/ec2/terminate_instances.rb
     lib/fog/aws/requests/elb/create_load_balancer.rb
     lib/fog/aws/requests/elb/delete_load_balancer.rb
@@ -570,6 +573,7 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
+    tests/aws/models/s3/directory_tests.rb
     tests/aws/requests/ec2/address_tests.rb
     tests/aws/requests/ec2/availability_zone_tests.rb
     tests/aws/requests/ec2/instance_tests.rb
@@ -584,6 +588,12 @@ Gem::Specification.new do |s|
     tests/bluebox/requests/template_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
+    tests/helpers/model_helper.rb
+    tests/linode/helper.rb
+    tests/linode/requests/datacenter_tests.rb
+    tests/linode/requests/distribution_tests.rb
+    tests/linode/requests/linode_tests.rb
+    tests/linode/requests/linodeplans_tests.rb
     tests/rackspace/helper.rb
     tests/rackspace/requests/servers/address_tests.rb
     tests/rackspace/requests/servers/flavor_tests.rb

data/lib/fog.rb

@@ -40,7 +40,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.15'
+    VERSION = '0.2.16'
   end
 
   module Mock
@@ -68,11 +68,11 @@ module Fog
     !!@mocking
   end
 
-  def self.wait_for(timeout = 600, &block)
+  def self.wait_for(timeout=600, interval=1, &block)
     duration = 0
     start = Time.now
     until yield || duration > timeout
-      sleep(1)
+      sleep(interval)
       duration = Time.now - start
     end
     if duration > timeout

data/lib/fog/aws/ec2.rb

@@ -57,6 +57,8 @@ module Fog
       request 'revoke_security_group_ingress'
       request 'run_instances'
       request 'terminate_instances'
+      request 'start_instances'
+      request 'stop_instances'
 
       class Mock
         include Collections

data/lib/fog/aws/models/ec2/server.rb

@@ -132,6 +132,18 @@ module Fog
           true
         end
 
+        def start
+          requires :id
+          connection.stop_instances(@id)
+          true
+        end
+
+        def stop
+          requires :id
+          connection.stop_instances(@id)
+          true
+        end
+
         def volumes
           requires :id
 

data/lib/fog/aws/parsers/ec2/start_stop_instances.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Parsers
+    module AWS
+      module EC2
+
+        class StartStopInstances < Fog::Parsers::Base
+
+          def reset
+            @instance = { 'currentState' => {}, 'previousState' => {} }
+            @response = { 'instancesSet' => [] }
+            @state = nil
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'currentState', 'previousState'
+              @state = name
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'code'
+              @instance[@state][name] = @value.to_s
+            when 'instanceId'
+              @instance[name] = @value
+            when 'item'
+              @response['instancesSet'] << @instance
+              @instance = { 'currentState' => {}, 'previousState' => {} }
+            when 'name'
+              @instance[@state][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -93,7 +93,7 @@ module Fog
                   @data[:deleted_at].delete(instance['instanceId'])
                   @data[:instances].delete(instance['instanceId'])
                 elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
-                  instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
+                  instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' }
                 end
               when 'terminating'
                 if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay

data/lib/fog/aws/requests/ec2/start_instances.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        require 'fog/aws/parsers/ec2/start_stop_instances'
+
+        # Start specified instance
+        #
+        # ==== Parameters
+        # * instance_id<~Array> - Id of instance to start
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * TODO: fill in the blanks
+        def start_instances(instance_id)
+          params = AWS.indexed_param('InstanceId', instance_id)
+          request({
+            'Action'    => 'StartInstances',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::EC2::StartStopInstances.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def start_instances(instance_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/stop_instances.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        require 'fog/aws/parsers/ec2/start_stop_instances'
+
+        # Stop specified instance
+        #
+        # ==== Parameters
+        # * instance_id<~Array> - Id of instance to start
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * TODO: fill in the blanks
+        def stop_instances(instance_id)
+          params = AWS.indexed_param('InstanceId', instance_id)
+          request({
+            'Action'    => 'StopInstances',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::EC2::StartStopInstances.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def stop_instances(instance_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -55,9 +55,11 @@ module Fog
               when 'shutting-down'
                 32
               when 'terminated'
+                48
+              when 'stopping'
                 64
-              when 'rebooting'
-                128
+              when 'stopped'
+                80
               end
               state = { 'name' => 'shutting-down', 'code' => 32}
               response.body['instancesSet'] << {

data/lib/fog/linode.rb

@@ -58,19 +58,19 @@ module Fog
         params[:query] ||= {}
         params[:query].merge!(:api_key => @linode_api_key)
 
-        begin
-          response = @connection.request(params.merge!({:host => @host}))
-        rescue Excon::Errors::Error => error
-          raise case error
-          when Excon::Errors::NotFound
-            Fog::Linode::NotFound.slurp(error)
-          else
-            error
-          end
-        end
+        response = @connection.request(params.merge!({:host => @host}))
 
         unless response.body.empty?
           response.body = JSON.parse(response.body)
+          if data = response.body['ERRORARRAY'].first
+            error = case data['ERRORCODE']
+            when 5
+              Fog::Linode::NotFound
+            else
+              Fog::Linode::Error
+            end
+            raise error.new(data['ERRORMESSAGE'])
+          end
         end
         response
       end

data/lib/fog/linode/requests/avail_distributions.rb

@@ -5,14 +5,17 @@ module Fog
       # Get available distributions
       #
       # ==== Parameters
-      # * options<~Hash>:
-      #   * distributionId<~Integer>: id to limit results to
+      # * distributionId<~Integer>: id to limit results to
       #
       # ==== Returns
       # * response<~Excon::Response>:
       #   * body<~Array>:
       # TODO: docs
-      def avail_distributions(options={})
+      def avail_distributions(distribution_id=nil)
+        options = {}
+        if distribution_id
+          options.merge!(:distributionId => distribution_id)
+        end
         request(
           :expects  => 200,
           :method   => 'GET',

data/lib/fog/linode/requests/avail_linodeplans.rb

@@ -8,11 +8,15 @@ module Fog
       # * response<~Excon::Response>:
       #   * body<~Array>:
       # TODO: docs
-      def avail_linodeplans
+      def avail_linodeplans(linodeplan_id=nil)
+        options = {}
+        if linodeplan_id
+          options.merge!(:planId => linodeplan_id)
+        end
         request(
           :expects  => 200,
           :method   => 'GET',
-          :query    => { :api_action => 'avail.linodeplans' }
+          :query    => { :api_action => 'avail.linodeplans' }.merge!(options)
         )
       end
 

data/lib/fog/linode/requests/linode_list.rb

@@ -5,14 +5,17 @@ module Fog
       # List all linodes user has access or delete to
       #
       # ==== Parameters
-      # * options<~Hash>:
-      #   * linodeId<~Integer>: Limit the list to the specified LinodeID
+      # * linodeId<~Integer>: Limit the list to the specified LinodeID
       #
       # ==== Returns
       # * response<~Excon::Response>:
       #   * body<~Array>:
       # TODO: docs
-      def linode_list(options={})
+      def linode_list(linode_id=nil)
+        options = {}
+        if linode_id
+          options.merge!(:linodeId => linode_id)
+        end
         request(
           :expects  => 200,
           :method   => 'GET',

data/lib/fog/model.rb

@@ -39,9 +39,9 @@ module Fog
       attributes.to_json
     end
 
-    def wait_for(timeout = 600, &block)
+    def wait_for(timeout=600, interval=1, &block)
       reload
-      Fog.wait_for(timeout) do
+      Fog.wait_for(timeout, interval) do
         reload or raise StandardError.new("Reload failed, #{self.class} #{self.identity} went away.")
         instance_eval(&block)
       end

data/lib/fog/rackspace/models/files/file.rb

@@ -41,9 +41,9 @@ module Fog
           end
         end
 
-        def save(options = {})
+        def save
           requires :body, :directory, :key
-          data = connection.put_object(directory.name, @key, @body, options)
+          data = connection.put_object(directory.name, @key, @body)
           @etag = data.headers['ETag']
           true
         end

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

@@ -65,7 +65,7 @@ module Fog
         end
 
         def save
-          requires :flavor_id, :image_id
+          requires :flavor_id, :image_id, :name
           options = {
             'metadata'    => @metadata,
             'name'        => @name,

data/lib/fog/slicehost/models/server.rb

@@ -18,6 +18,11 @@ module Fog
       attribute :progress
       attribute :status
 
+      def initialize(attributes={})
+        @flavor_id ||= 1
+        super
+      end
+
       def destroy
         requires :id
         connection.delete_slice(@id)

data/lib/fog/vcloud.rb

@@ -3,8 +3,9 @@ require 'fog/vcloud/model'
 require 'fog/vcloud/collection'
 require 'fog/vcloud/generators'
 require 'fog/vcloud/extension'
-require 'fog/vcloud/terremark/vcloud'
 require 'fog/vcloud/terremark/ecloud'
+require 'fog/vcloud/terremark/vcloud'
+
 
 module URI
   class Generic
@@ -46,6 +47,10 @@ module Fog
       attr_accessor :login_uri
       attr_reader :versions_uri
 
+      def supporting_versions
+        ["v0.8"]
+      end
+
       def initialize(options = {})
         @connections = {}
         @versions_uri = URI.parse(options[:versions_uri])
@@ -138,18 +143,21 @@ module Fog
         end
       end
 
-      # Load up @all_versions and supported_versions from the provided :versions_uri
-      # If there are no supported versions raise an error
-      # And choose a default version is none is specified
+      # If we don't support any versions the service does, then raise an error.
+      # If the @version that super selected isn't in our supported list, then select one that is.
       def check_versions
-        supported_versions = get_versions(@versions_uri).body[:VersionInfo]
-
-        if supported_versions.empty?
-          raise UnsupportedVersion.new("No supported versions found @ #{@version_uri}")
-        end
-
-        unless @version
-          @version = supported_version_numbers.first
+        if @version
+          unless supported_version_numbers.include?(@version.to_s)
+            raise UnsupportedVersion.new("#{@version} is not supported by the server.")
+          end
+          unless supporting_versions.include?(@version.to_s)
+            raise UnsupportedVersion.new("#{@version} is not supported by #{self.class}")
+          end
+        else
+          unless @version = (supported_version_numbers & supporting_versions).sort.first
+            raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_numbers.join(', ')}\n" +
+                                         "#{self.class} supports: #{supporting_versions.join(', ')}")
+          end
         end
       end
 
@@ -163,10 +171,13 @@ module Fog
         "Basic #{Base64.encode64("#{@username}:#{@password}").chomp!}"
       end
 
+      def login_uri
+        @login_uri ||= get_login_uri
+      end
+
       # login handles the auth, but we just need the Set-Cookie
       # header from that call.
       def do_login
-        @login_uri ||= get_login_uri
         @login_results = login
         @cookie = @login_results.headers['Set-Cookie']
       end

data/lib/fog/vcloud/extension.rb

@@ -12,9 +12,6 @@ module Fog
           end
           module #{other}::Mock
           end
-            def self.supported_versions
-              @versions
-            end
           def self.extended(klass)
             unless @required
               models.each do |model|
@@ -35,10 +32,6 @@ module Fog
         EOS
       end
 
-      def versions(*args)
-        @versions = args
-      end
-
     end
   end
 end

data/lib/fog/vcloud/requests/login.rb

@@ -12,7 +12,7 @@ module Fog
           },
           :method   => 'POST',
           :parse    => true,
-          :uri      => @login_uri
+          :uri      => login_uri
         })
       end
 

data/lib/fog/vcloud/terremark/ecloud.rb

@@ -63,8 +63,6 @@ module Fog
         request :power_reset
         request :power_shutdown
 
-        versions "v0.8b-ext2.3", "0.8b-ext2.3"
-
         module Mock
           def self.base_url
             "https://fakey.com/api/v0.8b-ext2.3"
@@ -190,26 +188,11 @@ module Fog
         end
 
         module Real
-          private
-
-          # If we don't support any versions the service does, then raise an error.
-          # If the @version that super selected isn't in our supported list, then select one that is.
-          def check_versions
-            if @version
-              unless supported_version_numbers.include?(@version.to_s)
-                raise UnsupportedVersion.new("#{@version} is not supported by the server.")
-              end
-              unless Fog::Vcloud::Terremark::Ecloud.supported_versions.include?(@version.to_s)
-                raise UnsupportedVersion.new("#{@version} is not supported by Fog::Vcloud::Terremark::Ecloud")
-              end
-            else
-                unless @version = (supported_version_numbers & Fog::Vcloud::Terremark::Ecloud.supported_versions).sort.first
-                  raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_numbers.join(', ')}\n" +
-                                               "Fog::Vcloud::Terremark::Ecloud supports: #{Fog::Vcloud::Terremark::Ecloud.supported_versions.join(', ')}")
-                end
-            end
+          def supporting_versions
+            ["v0.8b-ext2.3", "0.8b-ext2.3"]
           end
         end
+
       end
     end
   end

data/lib/fog/vcloud/terremark/vcloud.rb

@@ -4,23 +4,12 @@ module Fog
       module Vcloud
         extend Fog::Vcloud::Extension
 
-        versions "v0.8"
-
         request_path 'fog/vcloud/terremark/vcloud/requests'
         request :get_vdc
 
-        private
-
-        # If we don't support any versions the service does, then raise an error.
-        # If the @version that super selected isn't in our supported list, then select one that is.
-        def check_versions
-          super
-          unless (supported_version_ids & Versions::SUPPORTED).length > 0
-            raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_ids.join(', ')}\n" +
-                                         "Fog::Vcloud::Terremark::Vcloud supports: #{Versions::SUPPORTED.join(', ')}")
-          end
-          unless supported_version_ids.include?(@version)
-            @version = (supported_version_ids & Versions::SUPPORTED).sort.first
+        module Real
+          def supporting_versions
+            ["0.8", "0.8a-ext1.6"]
           end
         end
       end

data/spec/vcloud/requests/get_versions_spec.rb

@@ -1,28 +1,54 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_vcloud_request do
-    subject { @vcloud }
+shared_examples_for "real or mock get_versions requests" do
+
+  subject { @vcloud }
+
+  it { should respond_to :get_versions }
 
-    it { should respond_to :get_versions }
+  describe "#get_versions" do
+    subject { @vcloud.get_versions( @vcloud.versions_uri ) }
 
-    describe "#get_versions" do
-      before { @versions = @vcloud.get_versions( @vcloud.versions_uri ) }
-      subject { @versions }
+    it_should_behave_like "all responses"
 
-      it_should_behave_like "all responses"
+    describe "body" do
+      subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
 
-      describe "body" do
-        subject { @versions.body }
+      it { should have(4).keys }
+      it_should_behave_like "it has the standard xmlns attributes"   # 2 keys
 
-        it { should have(4).keys }
-        it_should_behave_like "it has the standard xmlns attributes"   # 2 keys
+      its(:xmlns) { should == "http://www.vmware.com/vcloud/versions" }
 
-        its(:xmlns) { should == "http://www.vmware.com/vcloud/versions" }
-        its(:VersionInfo) { should == { :LoginUrl => @mock_version[:login_url] , :Version => @mock_version[:version] } }
+      its(:VersionInfo) { should be_either_a_hash_or_array }
 
+      describe ":VersionInfo" do
+        subject { arrayify(@vcloud.get_versions( @vcloud.versions_uri ).body[:VersionInfo]) }
+
+        specify {
+          subject.each do |version_info|
+            version_info.should include(:LoginUrl)
+            version_info[:LoginUrl].should be_a_url
+            version_info.should include(:Version)
+            version_info[:Version].should be_an_instance_of String
+          end
+        }
       end
     end
   end
+end
+
+if Fog.mocking?
+  describe Fog::Vcloud, :type => :mock_vcloud_request do
+
+    it_should_behave_like "real or mock get_versions requests"
+
+    describe "body" do
+      subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
+      its(:VersionInfo) { should == { :LoginUrl => @mock_version[:login_url] , :Version => @mock_version[:version] } }
+    end
+  end
 else
+  describe Fog::Vcloud, :type => :vcloud_request do
+    it_should_behave_like "real or mock get_versions requests"
+  end
 end

data/spec/vcloud/requests/login_spec.rb

@@ -1,11 +1,24 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
+shared_examples_for "real or mock login requests" do
+  subject { @vcloud }
+  it_should_behave_like "all login requests"
+end
+
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do
-    subject { @vcloud }
+    it_should_behave_like "real or mock login requests"
 
-    it_should_behave_like "all login requests"
+    describe "#body" do
+      subject { @vcloud.login.body }
+      its(:Org) { should == { :type => "application/vnd.vmware.vcloud.org+xml",
+                              :href => @mock_organization[:info][:href],
+                              :name => @mock_organization[:info][:name]} }
+    end
   end
 else
+  describe Fog::Vcloud, :type => :vcloud_request do
+    it_should_behave_like "real or mock login requests"
+  end
 end
 

data/spec/vcloud/spec_helper.rb

@@ -27,6 +27,10 @@ Fog.mock! if ENV['FOG_MOCK']
 
 require "#{current_directory}/../../lib/fog/vcloud/bin"
 
+def arrayify(item)
+  item.is_a?(Array) ? item : [ item ]
+end
+
 shared_examples_for "all responses" do
   it { should be_an_instance_of Excon::Response }
   it { should respond_to :body }
@@ -98,17 +102,27 @@ shared_examples_for "all login requests" do
 
     its(:headers) { should include "Set-Cookie" }
 
-    it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.orgslist+xml" }
-
     describe "#body" do
       subject { @login.body }
 
-      it { should have(4).organizations }
-
+      it { should have(4).items }
       it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
-      its(:Org) { should == { :type => "application/vnd.vmware.vcloud.org+xml",
-                              :href => @mock_organization[:info][:href],
-                              :name => @mock_organization[:info][:name]} }
+      it { should include(:Org) }
+
+      describe ":Org" do
+        subject { arrayify(@login.body[:Org]) }
+
+        specify do
+          subject.each do |org|
+            org.should include(:type)
+            org[:type].should be_of_type "application/vnd.vmware.vcloud.org+xml"
+            org.should include(:name)
+            org[:name].should be_an_instance_of String
+            org.should include(:href)
+            org[:href].should be_a_url
+          end
+        end
+      end
     end
   end
 end
@@ -218,7 +232,12 @@ Spec::Runner.configure do |config|
   config.after(:all) do
     Fog::Vcloud::Mock.data_reset
   end
-  config.before(:each, :type => :mock_vcloud_model) do
+
+  config.before(:each, :type => :vcloud_request) do
+    @vcloud = Fog.services.detect { |service| service == Vcloud }[:vcloud]
+  end
+
+  config.before(:all, :type => :mock_vcloud_model) do
     @vcloud = Fog::Vcloud.new(:username => "foo", :password => "bar", :versions_uri => "http://fakey.com/api/versions")
   end
   config.before(:all, :type => :mock_vcloud_model) do
@@ -332,3 +351,33 @@ Spec::Matchers.define :have_all_attributes_be_nil do
     actual.class.attributes.all? { |attribute| actual.send(attribute.to_sym) == nil }
   end
 end
+
+Spec::Matchers.define :be_a_url do
+  match do |actual|
+    actual.match(/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix)
+  end
+end
+
+Spec::Matchers.define :be_either_a_hash_or_array  do
+  match do |actual|
+    actual.is_a?(Hash) || actual.is_a?(Array)
+  end
+end
+
+Spec::Matchers.define :be_a_known_vmware_type do
+  match do |actual|
+    ["application/vnd.vmware.vcloud.org+xml"].include?(actual)
+  end
+end
+
+Spec::Matchers.define :be_of_type do |type|
+  match do |actual|
+    actual == type ||
+      if actual.is_a?(Hash) && actual[:type]
+        actual[:type] == type
+      end ||
+      if actual.respond_to(:type)
+        actual.type == type
+      end
+  end
+end

data/tests/aws/models/s3/directory_tests.rb

@@ -0,0 +1,8 @@
+Shindo.tests('AWS::S3 | directory models', ['aws']) do
+
+  @collection = AWS[:s3].directories
+  @model = @collection.new(:key => Time.now.to_f.to_s)
+
+  tests_models
+
+end

data/tests/helper.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog', 'bin'))
 
+require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'model_helper'))
+
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end

data/tests/helpers/model_helper.rb

@@ -0,0 +1,76 @@
+def tests_models
+
+  after do
+    if @model && !@model.new_record?
+      if @model.respond_to?(:ready?)
+        @model.wait_for { ready? }
+      end
+      @model.destroy
+    end
+  end
+
+  tests('collection') do
+
+    test('#all includes persisted models') do
+      @model.save
+      @collection.all.map {|model| model.identity}.include? @model.identity
+    end
+
+    tests('#get') do
+
+      test 'should return a matching model if one exists' do
+        @model.save
+        get = @collection.get(@model.identity)
+        @model.attributes == get.attributes
+      end
+
+      test 'should return nil if no matching model exists' do
+        !@collection.get('0')
+      end
+
+    end
+
+    test('#reload') do
+      @model.save
+      @collection.all
+      reloaded = @collection.reload
+      @collection.attributes == reloaded.attributes
+    end
+
+  end
+
+  tests('model') do
+
+    test('#reload') do
+      @model.save
+      if @model.respond_to?(:ready?)
+        @model.wait_for { ready? }
+      end
+      reloaded = @model.reload
+      @model.attributes == reloaded.attributes
+    end
+
+    tests('#save') do
+
+      test('does not exist remotely before save') do
+        !@collection.get(@model.identity)
+      end
+
+      test('succeeds') do
+        @model.save
+      end
+
+      test('does exist remotely after save') do
+        @model.save
+        if @model.respond_to?(:ready?)
+          @model.wait_for { ready? }
+        end
+        reloaded = @model.reload
+        @model.attributes == reloaded.attributes
+      end
+
+    end
+
+  end
+
+end

data/tests/linode/helper.rb

@@ -0,0 +1,25 @@
+module Linode
+
+  def self.[](service)
+    @@connections ||= Hash.new do |hash, key|
+      credentials = Fog.credentials.reject do |k,v|
+        ![:linode_api_key].include?(k)
+      end
+      hash[key] = case key
+      when :linode
+        Fog::Linode.new(credentials)
+      end
+    end
+    @@connections[service]
+  end
+
+  module Formats
+
+    BASIC = {
+      'ERRORARRAY'  => [],
+      'ACTION'      => String
+    }
+
+  end
+
+end

data/tests/linode/requests/datacenter_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests('Linode | datacenter requests', ['linode']) do
+
+  @datacenters_format = Linode::Formats::BASIC.merge({
+    'DATA' => [{ 
+      'DATACENTERID'  => Integer,
+      'LOCATION'      => String
+    }]
+  })
+
+  tests('success') do
+
+    tests('#avail_datacenters').formats(@datacenters_format) do
+      Linode[:linode].avail_datacenters.body
+    end
+
+  end
+
+end

data/tests/linode/requests/distribution_tests.rb

@@ -0,0 +1,30 @@
+Shindo.tests('Linode | distribution requests', ['linode']) do
+
+  @distributions_format = Linode::Formats::BASIC.merge({
+    'DATA' => [{ 
+      'CREATE_DT'           => String,
+      'DISTRIBUTIONID'      => Integer,
+      'IS64BIT'             => Integer,
+      'LABEL'               => String,
+      'MINIMAGESIZE'        => Integer,
+      'REQUIRESPVOPSKERNEL' => Integer
+    }]
+  })
+
+  tests('success') do
+
+    @distribution_id = nil
+
+    tests('#avail_distributions').formats(@distributions_format) do
+      data = Linode[:linode].avail_distributions.body
+      @distribution_id = data['DATA'].first['DISTRIBUTIONID']
+      data
+    end
+
+    tests("@avail_distributions(#{@distribution_id})").formats(@distributions_format) do
+      Linode[:linode].avail_distributions(@distribution_id).body
+    end
+
+  end
+
+end

data/tests/linode/requests/linode_tests.rb

@@ -0,0 +1,79 @@
+Shindo.tests('Linode | linode requests', ['linode']) do
+
+  @linode_format = Linode::Formats::BASIC.merge({
+    'DATA' => { 'LinodeID' => Integer }
+  })
+
+  @linodes_format = Linode::Formats::BASIC.merge({
+    'DATA' => [{
+      'ALERT_BWIN_ENABLED'      => Integer,
+      'ALERT_CPU_THRESHOLD'     => Integer,
+      'ALERT_BWOUT_ENABLED'     => Integer,
+      'ALERT_BWOUT_THRESHOLD'   => Integer,
+      'ALERT_BWQUOTA_ENABLED'   => Integer,
+      'ALERT_BWQUOTA_THRESHOLD' => Integer,
+      'ALERT_BWIN_THRESHOLD'    => Integer,
+      'ALERT_CPU_ENABLED'       => Integer,
+      'ALERT_DISKIO_ENABLED'    => Integer,
+      'ALERT_DISKIO_THRESHOLD'  => Integer,
+      'BACKUPSENABLED'          => Integer,
+      'BACKUPWEEKLYDAY'         => Integer,
+      'BACKUPWINDOW'            => Integer,
+      'DATACENTERID'            => Integer,
+      'LABEL'                   => String,
+      'LINODEID'                => Integer,
+      'LPM_DISPLAYGROUP'        => String,
+      'STATUS'                  => Integer,
+      'TOTALHD'                 => Integer,
+      'TOTALRAM'                => Integer,
+      'TOTALXFER'               => Integer,
+      'WATCHDOG'                => Integer,
+    }]
+  })
+
+  @reboot_format = Linode::Formats::BASIC.merge({
+    'DATA' => { 'JobID' => Integer }
+  })
+
+  tests('success') do
+
+    @linode_id = nil
+
+    # (2 => Dallas, TX, USA), (1 => 1 month), (1 => Linode 512)
+    tests('#linode_create(2, 1, 1)').formats(@linode_format) do
+      data = Linode[:linode].linode_create(2, 1, 1).body
+      @linode_id = data['DATA']['LinodeID']
+      data
+    end
+
+    tests("#linode_list(#{@linode_id})").formats(@linodes_format) do
+      Linode[:linode].linode_list(@linode_id).body
+    end
+
+    tests('#linode_list').formats(@linodes_format) do
+      Linode[:linode].linode_list.body
+    end
+
+    # tests("#linode_reboot(#{@linode_id})").formats(@reboot_format) do
+    #   Linode[:linode].linode_reboot(@linode_id).body
+    # end
+
+    tests('#linode_delete(#{@linode_id})').succeeds do
+      Linode[:linode].linode_delete(@linode_id)
+    end
+
+  end
+
+  tests('failure') do
+
+    tests('#linode_reboot(0)').raises(Fog::Linode::NotFound) do
+      Linode[:linode].linode_reboot(0)
+    end
+
+    tests('#linode_delete(0)').raises(Fog::Linode::NotFound) do
+      Linode[:linode].linode_delete(0)
+    end
+
+  end
+
+end

data/tests/linode/requests/linodeplans_tests.rb

@@ -0,0 +1,37 @@
+Shindo.tests('Linode | linodeplans requests', ['linode']) do
+
+  @linodeplans_format = Linode::Formats::BASIC.merge({
+    'DATA' => [{ 
+      'AVAIL' => {
+         '2' => Integer,
+         '3' => Integer,
+         '4' => Integer,
+         '6' => Integer,
+         '7' => Integer
+      },
+      'DISK'    => Integer,
+      'PLANID'  => Integer,
+      'PRICE'   => Float,
+      'RAM'     => Integer,
+      'LABEL'   => String,
+      'XFER'    => Integer
+    }]
+  })
+
+  tests('success') do
+
+    @linodeplan_id = nil
+
+    tests('#avail_linodeplans').formats(@linodeplans_format) do
+      data = Linode[:linode].avail_linodeplans.body
+      @linodeplan_id = data['DATA'].first['PLANID']
+      data
+    end
+
+    tests("#avail_linodeplans(#{@linodeplan_id})").formats(@linodeplans_format) do
+      Linode[:linode].avail_linodeplans(@linodeplan_id).body
+    end
+
+  end
+
+end

data/tests/slicehost/requests/slice_tests.rb

@@ -54,7 +54,7 @@ Shindo.tests('Slicehost | slice requests', ['slicehost']) do
       Slicehost[:slices].reboot_slice(0)
     end
 
-    tests('delete_slice(0)').raises(Fog::Slicehost::NotFound) do
+    tests('#delete_slice(0)').raises(Fog::Slicehost::NotFound) do
       Slicehost[:slices].delete_slice(0)
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 -05:00
+date: 2010-07-22 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,6 +205,7 @@ files:
 - lib/fog/aws/parsers/ec2/detach_volume.rb
 - lib/fog/aws/parsers/ec2/get_console_output.rb
 - lib/fog/aws/parsers/ec2/run_instances.rb
+- lib/fog/aws/parsers/ec2/start_stop_instances.rb
 - lib/fog/aws/parsers/ec2/terminate_instances.rb
 - lib/fog/aws/parsers/elb/create_load_balancer.rb
 - lib/fog/aws/parsers/elb/delete_load_balancer.rb
@@ -258,6 +259,8 @@ files:
 - lib/fog/aws/requests/ec2/release_address.rb
 - lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
 - lib/fog/aws/requests/ec2/run_instances.rb
+- lib/fog/aws/requests/ec2/start_instances.rb
+- lib/fog/aws/requests/ec2/stop_instances.rb
 - lib/fog/aws/requests/ec2/terminate_instances.rb
 - lib/fog/aws/requests/elb/create_load_balancer.rb
 - lib/fog/aws/requests/elb/delete_load_balancer.rb
@@ -659,6 +662,7 @@ files:
 - spec/vcloud/terremark/ecloud/requests/login_spec.rb
 - spec/vcloud/vcloud_spec.rb
 - tests/aws/helper.rb
+- tests/aws/models/s3/directory_tests.rb
 - tests/aws/requests/ec2/address_tests.rb
 - tests/aws/requests/ec2/availability_zone_tests.rb
 - tests/aws/requests/ec2/instance_tests.rb
@@ -673,6 +677,12 @@ files:
 - tests/bluebox/requests/template_tests.rb
 - tests/helper.rb
 - tests/helper_tests.rb
+- tests/helpers/model_helper.rb
+- tests/linode/helper.rb
+- tests/linode/requests/datacenter_tests.rb
+- tests/linode/requests/distribution_tests.rb
+- tests/linode/requests/linode_tests.rb
+- tests/linode/requests/linodeplans_tests.rb
 - tests/rackspace/helper.rb
 - tests/rackspace/requests/servers/address_tests.rb
 - tests/rackspace/requests/servers/flavor_tests.rb