nephophobia 0.3.0 → 0.3.6

data/test/lib/nephophobia/{user_test.rb → response/user_test.rb}

@@ -1,6 +1,6 @@
 require "test_helper"
 
-describe Nephophobia::User do
+describe Nephophobia::Resource::User do
   ##
   # Note:
   #   Assumes there is always at least one valid project.

data/test/lib/{nephophobia_test.rb → nephophobia/util_test.rb}

@@ -1,17 +1,17 @@
 require "test_helper"
 
-describe Nephophobia do
+describe Nephophobia::Util do
   describe "::coerce" do
     it "wraps a Hash with an Array" do
       hash = { :foo => :bar }
 
-      Nephophobia.coerce(hash).must_equal [hash]
+      Nephophobia::Util.coerce(hash).must_equal [hash]
     end
 
     it "doesn't wrap others" do
       array = [:foo, :bar]
 
-      Nephophobia.coerce(array).must_equal array
+      Nephophobia::Util.coerce(array).must_equal array
     end
   end
 end

data/test/test_helper.rb

@@ -8,6 +8,10 @@ require "nokogiri"
 require "vcr"
 
 class MiniTest::Unit::TestCase
+  def wait seconds = 5
+    sleep seconds unless VCR.current_cassette.record_mode == :none
+  end
+
   def cassette_for cassette, interaction = 0
     c = VCR::Cassette.new(cassette).send :recorded_interactions
     VCR.eject_cassette
@@ -18,8 +22,11 @@ end
 
 VCR.config do |c|
   c.stub_with :fakeweb
+
   c.cassette_library_dir     = "test/cassettes"
   c.default_cassette_options = { :record => :none }
+
+  c.allow_http_connections_when_no_cassette = true
 end
 
 class Client

metadata

@@ -2,7 +2,7 @@
 name: nephophobia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.6
 platform: ruby
 authors: 
 - John Dewey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: 2.7.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,7 @@ dependencies:
 description: This gem is a simple binding to the EC2 API. It has specific extensions to allow extra functionality provided by OpenStack.
 email: 
 - john@dewey.ws
-- jkleinpeter@attinteractive.com
+- josh@kleinpeter.org
 executables: []
 
 extensions: []
@@ -101,12 +101,23 @@ files:
 - lib/hashify.rb
 - lib/nephophobia.rb
 - lib/nephophobia/client.rb
-- lib/nephophobia/compute.rb
-- lib/nephophobia/credential.rb
-- lib/nephophobia/image.rb
-- lib/nephophobia/project.rb
-- lib/nephophobia/role.rb
-- lib/nephophobia/user.rb
+- lib/nephophobia/resource/compute.rb
+- lib/nephophobia/resource/credential.rb
+- lib/nephophobia/resource/image.rb
+- lib/nephophobia/resource/project.rb
+- lib/nephophobia/resource/role.rb
+- lib/nephophobia/resource/user.rb
+- lib/nephophobia/response/address.rb
+- lib/nephophobia/response/compute.rb
+- lib/nephophobia/response/credential.rb
+- lib/nephophobia/response/image.rb
+- lib/nephophobia/response/member.rb
+- lib/nephophobia/response/project.rb
+- lib/nephophobia/response/return.rb
+- lib/nephophobia/response/role.rb
+- lib/nephophobia/response/user.rb
+- lib/nephophobia/response/vnc.rb
+- lib/nephophobia/util.rb
 - lib/nephophobia/version.rb
 - nephophobia.gemspec
 - test/cassettes/compute_all.yml
@@ -116,6 +127,7 @@ files:
 - test/cassettes/compute_associate_address.yml
 - test/cassettes/compute_create.yml
 - test/cassettes/compute_create_with_optional_params.yml
+- test/cassettes/compute_describe_addresses.yml
 - test/cassettes/compute_destroy.yml
 - test/cassettes/compute_disassociate_address.yml
 - test/cassettes/compute_find.yml
@@ -126,6 +138,7 @@ files:
 - test/cassettes/credential_all_without_keys.yml
 - test/cassettes/credential_create.yml
 - test/cassettes/credential_destroy.yml
+- test/cassettes/credential_import.yml
 - test/cassettes/image_all.yml
 - test/cassettes/image_all_with_filter.yml
 - test/cassettes/image_find.yml
@@ -141,6 +154,7 @@ files:
 - test/cassettes/project_members_with_invalid_project_name.yml
 - test/cassettes/project_remove_member.yml
 - test/cassettes/role_all.yml
+- test/cassettes/role_all_no_params.yml
 - test/cassettes/role_all_with_project_name.yml
 - test/cassettes/role_all_without_roles.yml
 - test/cassettes/role_create.yml
@@ -149,6 +163,7 @@ files:
 - test/cassettes/role_destroy.yml
 - test/cassettes/role_destroy_with_project_name.yml
 - test/cassettes/role_destroy_with_project_name_and_role_name.yml
+- test/cassettes/role_modify_role.yml
 - test/cassettes/user_create.yml
 - test/cassettes/user_credentials.yml
 - test/cassettes/user_destroy.yml
@@ -156,15 +171,16 @@ files:
 - test/cassettes/user_find_with_invalid_user_name.yml
 - test/cassettes/user_register.yml
 - test/cassettes/user_register_asserts.yml
+- test/dummy.pub
 - test/lib/aws_test.rb
 - test/lib/hashify_test.rb
-- test/lib/nephophobia/compute_test.rb
-- test/lib/nephophobia/credential_test.rb
-- test/lib/nephophobia/image_test.rb
-- test/lib/nephophobia/project_test.rb
-- test/lib/nephophobia/role_test.rb
-- test/lib/nephophobia/user_test.rb
-- test/lib/nephophobia_test.rb
+- test/lib/nephophobia/response/compute_test.rb
+- test/lib/nephophobia/response/credential_test.rb
+- test/lib/nephophobia/response/image_test.rb
+- test/lib/nephophobia/response/project_test.rb
+- test/lib/nephophobia/response/role_test.rb
+- test/lib/nephophobia/response/user_test.rb
+- test/lib/nephophobia/util_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/retr0h/nephophobia
@@ -202,6 +218,7 @@ test_files:
 - test/cassettes/compute_associate_address.yml
 - test/cassettes/compute_create.yml
 - test/cassettes/compute_create_with_optional_params.yml
+- test/cassettes/compute_describe_addresses.yml
 - test/cassettes/compute_destroy.yml
 - test/cassettes/compute_disassociate_address.yml
 - test/cassettes/compute_find.yml
@@ -212,6 +229,7 @@ test_files:
 - test/cassettes/credential_all_without_keys.yml
 - test/cassettes/credential_create.yml
 - test/cassettes/credential_destroy.yml
+- test/cassettes/credential_import.yml
 - test/cassettes/image_all.yml
 - test/cassettes/image_all_with_filter.yml
 - test/cassettes/image_find.yml
@@ -227,6 +245,7 @@ test_files:
 - test/cassettes/project_members_with_invalid_project_name.yml
 - test/cassettes/project_remove_member.yml
 - test/cassettes/role_all.yml
+- test/cassettes/role_all_no_params.yml
 - test/cassettes/role_all_with_project_name.yml
 - test/cassettes/role_all_without_roles.yml
 - test/cassettes/role_create.yml
@@ -235,6 +254,7 @@ test_files:
 - test/cassettes/role_destroy.yml
 - test/cassettes/role_destroy_with_project_name.yml
 - test/cassettes/role_destroy_with_project_name_and_role_name.yml
+- test/cassettes/role_modify_role.yml
 - test/cassettes/user_create.yml
 - test/cassettes/user_credentials.yml
 - test/cassettes/user_destroy.yml
@@ -242,13 +262,14 @@ test_files:
 - test/cassettes/user_find_with_invalid_user_name.yml
 - test/cassettes/user_register.yml
 - test/cassettes/user_register_asserts.yml
+- test/dummy.pub
 - test/lib/aws_test.rb
 - test/lib/hashify_test.rb
-- test/lib/nephophobia/compute_test.rb
-- test/lib/nephophobia/credential_test.rb
-- test/lib/nephophobia/image_test.rb
-- test/lib/nephophobia/project_test.rb
-- test/lib/nephophobia/role_test.rb
-- test/lib/nephophobia/user_test.rb
-- test/lib/nephophobia_test.rb
+- test/lib/nephophobia/response/compute_test.rb
+- test/lib/nephophobia/response/credential_test.rb
+- test/lib/nephophobia/response/image_test.rb
+- test/lib/nephophobia/response/project_test.rb
+- test/lib/nephophobia/response/role_test.rb
+- test/lib/nephophobia/response/user_test.rb
+- test/lib/nephophobia/util_test.rb
 - test/test_helper.rb

data/lib/nephophobia/compute.rb

@@ -1,243 +0,0 @@
-module Nephophobia
-  class ComputeData
-    attr_reader :description, :dns_name, :image_id, :instance_id, :instance_type
-    attr_reader :key_name, :launch_time, :name, :owner_id, :placement
-    attr_reader :private_dns_name, :project_id, :public_dns_name, :state
-
-    attr_accessor :attributes
-
-    def initialize attributes
-      @attributes = attributes
-
-      @project_id       = attributes['ownerId']
-      item              = attributes['instancesSet']['item']
-      item              = item.first if item.is_a?(Array)
-      @description      = item['displayDescription']
-      @name             = item['displayName']
-      @key_name         = item['keyName']
-      @instance_id      = item['instanceId']
-      @state            = item['instanceState']['name']
-      @public_dns_name  = item['publicDnsName']
-      @private_dns_name = item['privateDnsName']
-      @image_id         = item['imageId']
-      @dns_name         = item['dnsName']
-      @launch_time      = DateTime.parse(item['launchTime'])
-      @placement        = item['placement']['availabilityZone']
-      @instance_type    = item['instanceType']
-    end
-  end
-
-  class VncData
-    attr_reader :attributes, :url
-
-    def initialize attributes
-      @url = attributes['url']
-    end
-  end
-
-  class AddressData
-    attr_reader :attributes, :floating_ip, :status
-
-    def initialize attributes
-      @floating_ip = attributes['publicIp']
-      @status      = attributes['item']
-    end
-  end
-
-  class Compute
-    def initialize client
-      @client = client
-    end
-
-    ##
-    # Returns information about instances that +@client+ owns.
-    #
-    # +filter+: An optional Hash, intended for filtering.
-    #           See the API Reference for further details.
-    #           {
-    #             "Filter.1.Name"    => "instance-type",
-    #             "Filter.1.Value.1" => "m1.small"
-    #           }
-
-    def all filter = {}
-      response = @client.action "DescribeInstances", filter
-
-      item = response.body['DescribeInstancesResponse']['reservationSet']['item']
-      Nephophobia.coerce(item).collect do |data|
-        ComputeData.new data
-      end
-    end
-
-    ##
-    # Create a compute instance with the given 'image_id'.
-    # Returns information about the new instance.
-    #
-    # +image_id+: A String representing the ID of the image.
-    # +params+: An optional Hash.
-    #           See the API Reference for further details.
-    #           {
-    #             "DisplayName"        => "testserver1",
-    #             "DisplayDescription" => "test description"
-    #           }
-
-    def create image_id, params = {}
-      response = @client.action "RunInstances", { "ImageId" => image_id }.merge(params)
-
-      ComputeData.new response.body['RunInstancesResponse']
-    end
-
-    ##
-    # Removes the given 'instance_id'.
-    # Returns instances response to a state change.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def destroy instance_id
-      params = {
-        "InstanceId.1" => instance_id
-      }
-
-      response = @client.action "TerminateInstances", params
-
-      ResponseData.new response.body['TerminateInstancesResponse']
-    end
-
-    ##
-    # Returns information about the given 'instance_id'.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def find instance_id
-      params = {
-        "InstanceId.1" => instance_id
-      }
-
-      response = @client.action "DescribeInstances", params
-
-      ComputeData.new response.body['DescribeInstancesResponse']['reservationSet']['item']
-    end
-
-    ##
-    # Reboot the given 'instance_id'.
-    # Returns instances response to a state change.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def reboot instance_id
-      params = {
-        "InstanceId.1" => instance_id
-      }
-
-      response = @client.action "RebootInstances", params
-
-      ResponseData.new response.body['RebootInstancesResponse']
-    end
-
-    ##
-    # Starts the given 'instance_id'.
-    # Returns instances current and previous state.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def start instance_id
-      params = {
-        "InstanceId.1" => instance_id
-      }
-
-      response = @client.action "StopInstances", params
-
-      ResponseData.new response.body
-    end
-
-    ##
-    # Stops the given 'instance_id'
-    # Returns instances current and previous state.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def stop instance_id
-      params = {
-        "InstanceId.1" => instance_id
-      }
-
-      response = @client.action "StartInstances", params
-
-      ResponseData.new response.body
-    end
-
-    ##
-    # Returns the VNC browser URL.  Used by the Portal.
-    # __Must__ execute as a user with the +admin+ role.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-
-    def vnc_url instance_id
-      params = {
-        "InstanceId" => instance_id
-      }
-
-      response = @client.action "GetVncConsole", params
-
-      VncData.new response.body['GetVncConsoleResponse']
-    end
-
-    ##
-    # Acquires an elastic IP address.
-    # Returns an elastic IP.
-
-    def allocate_address
-      response = @client.action "AllocateAddress", {}
-
-      AddressData.new response.body['AllocateAddressResponse']
-    end
-
-    ##
-    # Releases an elastic IP address.
-    #
-    # +floating_ip+: A String representing a floating IP address.
-
-    def release_address floating_ip
-      params = {
-        "PublicIp" => floating_ip
-      }
-
-      response = @client.action "ReleaseAddress", params
-
-      AddressData.new response.body['ReleaseAddressResponse']['releaseResponse']
-    end
-
-    ##
-    # Associates an elastic IP address with an instance.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-    # +floating_ip+: A String representing a floating IP address.
-
-    def associate_address instance_id, floating_ip
-      params = {
-        "InstanceId" => instance_id,
-        "PublicIp"   => floating_ip
-      }
-
-      response = @client.action "AssociateAddress", params
-
-      AddressData.new response.body['AssociateAddressResponse']['associateResponse']
-    end
-
-    ##
-    # Disassociates the specified elastic IP address from the instance
-    # to which it is assigned.
-    #
-    # +instance_id+: A String representing the ID of the instance.
-    # +floating_ip+: A String representing a floating IP address.
-
-    def disassociate_address floating_ip
-      params = {
-        "PublicIp" => floating_ip
-      }
-
-      response = @client.action "DisassociateAddress", params
-
-      AddressData.new response.body['DisassociateAddressResponse']['disassociateResponse']
-    end
-  end
-end