nephophobia 0.1.2 → 0.2.0

data/LICENSE

@@ -0,0 +1,4 @@
+"THE BEER-WARE LICENSE" (Revision 42):
+<john@dewey.ws> wrote this file. As long as you retain this notice you
+can do whatever you want with this stuff. If we meet some day, and you think
+this stuff is worth it, you can buy me a beer in return John-B Dewey Jr.

data/lib/nephophobia/client.rb

@@ -12,13 +12,12 @@ module Nephophobia
       @port = options[:port] || 8773
 
       @connection = Hugs::Client.new(
-        :host     => options[:host],
-        :scheme   => options[:scheme] || "http",
-        :port     => @port,
-        :type     => options[:type] || :xml
+        :host         => options[:host],
+        :scheme       => options[:scheme] || "http",
+        :port         => @port,
+        :type         => options[:type] || :xml,
+        :raise_errors => true
       )
-      @connection.raise_4xx = true
-      @connection.raise_5xx = true
 
       @aws = AWS.new(
         :host       => options[:host],

data/lib/nephophobia/compute.rb

@@ -27,6 +27,14 @@ module Nephophobia
     end
   end
 
+  class VncData
+    attr_reader :url
+
+    def initialize attributes
+      @url = attributes['url']
+    end
+  end
+
   class Compute
     def initialize client
       @client = client
@@ -147,5 +155,21 @@ module Nephophobia
 
       ResponseData.new response.body
     end
+
+    ##
+    # Returns the VNC browser URL.  Used by the Portal.
+    # __Must__ have an +admin+ role to use.
+    #
+    # +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
   end
 end

data/lib/nephophobia/version.rb

@@ -1,3 +1,3 @@
 module Nephophobia
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/nephophobia.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "hugs", "~> 2.5.2"
+  s.add_dependency "hugs", "~> 2.6.0"
 
   s.add_development_dependency "fakeweb", "~> 1.3.0"
-  s.add_development_dependency "minitest", "~> 2.0.2"
+  s.add_development_dependency "minitest", "~> 2.1.0"
   s.add_development_dependency "nokogiri", "~> 1.4.4"
   s.add_development_dependency "rake", "~> 0.8.7"
   s.add_development_dependency "vcr", "1.5.0"

data/test/cassettes/compute_vnc_url.yml

@@ -0,0 +1,82 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.35:8773/services/Cloud?AWSAccessKeyId=2ea76797-229c-4e52-a21b-f30513cb91a6%3Asandbox&Action=RunInstances&ImageId=ami-00000002&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=1999-12-31T19%3A59%3A59Z&Version=2010-11-15&Signature=tPz8K7mYsXFNuGeGmQCf3JFCOWsQ5iGKP%2B4CU1PUoOI%3D
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/xml
+      content-length: 
+      - "838"
+      date: 
+      - Tue, 17 May 2011 22:54:02 GMT
+      connection: 
+      - keep-alive
+    body: <?xml version="1.0" ?><RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-11-15/"><requestId>UQI84EDZKAJCI9OD6P7-</requestId><ownerId>sandbox</ownerId><groupSet><item><groupId>default</groupId></item></groupSet><reservationId>r-g3dtl3nz</reservationId><instancesSet><item><displayDescription/><displayName>Server 44</displayName><keyName>None (sandbox, None)</keyName><instanceId>i-0000002c</instanceId><instanceState><code>0</code><name>scheduling</name></instanceState><publicDnsName/><imageId>ami-00000002</imageId><productCodesSet/><privateDnsName/><dnsName/><launchTime>2011-05-17T22:54:02Z</launchTime><amiLaunchIndex>0</amiLaunchIndex><placement><availabilityZone>unknown zone</availabilityZone></placement><ipAddress/><instanceType>m1.small</instanceType><privateIpAddress/></item></instancesSet></RunInstancesResponse>
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.35:8773/services/Cloud?AWSAccessKeyId=2ea76797-229c-4e52-a21b-f30513cb91a6%3Asandbox&Action=GetVncConsole&InstanceId=i-0000002c&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=1999-12-31T19%3A59%3A59Z&Version=2010-11-15&Signature=CTnwl8XghsgR%2BvLufr6apb%2F7CxBRHWXMDzbVqARIvM0%3D
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/xml
+      content-length: 
+      - "292"
+      date: 
+      - Tue, 17 May 2011 22:55:08 GMT
+      connection: 
+      - keep-alive
+    body: <?xml version="1.0" ?><GetVncConsoleResponse xmlns="http://ec2.amazonaws.com/doc/2010-11-15/"><requestId>MQGGGBRZT52RW30-Q0HC</requestId><url>http://10.3.170.35:6080/vnc_auto.html?token=43d60f5f-b4d6-406a-a4ec-c6ff8e8a741e&amp;host=hostignore&amp;port=portignore</url></GetVncConsoleResponse>
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.35:8773/services/Cloud?AWSAccessKeyId=2ea76797-229c-4e52-a21b-f30513cb91a6%3Asandbox&Action=TerminateInstances&InstanceId.1=i-0000002c&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=1999-12-31T19%3A59%3A59Z&Version=2010-11-15&Signature=jM8GDD%2B9KoSnyC2CgqXhvp2FXKlZriKt6ZVEU1w38Fk%3D
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/xml
+      content-length: 
+      - "192"
+      date: 
+      - Tue, 17 May 2011 22:55:19 GMT
+      connection: 
+      - keep-alive
+    body: <?xml version="1.0" ?><TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-11-15/"><requestId>3JEB2L90CZG-HQ6-KDG5</requestId><return>true</return></TerminateInstancesResponse>
+    http_version: "1.1"

data/test/lib/hashify_test.rb

@@ -1,15 +1,13 @@
 require "test_helper"
 
-describe Hashify do
-  #TODO: *WAY* more testing
+#describe Hashify do
+#  describe "::convert" do
+#    it "creates a hash from a Nokogiri::XML::Document" do
+#      xml  = cassette_for "compute_all", 1
+#      hash = Hashify.convert xml.root
 
-  describe "::convert" do
-    it "creates a hash from a Nokogiri::XML::Document" do
-      xml  = cassette_for "compute_all", 1
-      hash = Hashify.convert xml.root
-
-      assert_equal "Server 42", hash['DescribeInstancesResponse']['reservationSet']['item'].first['instancesSet']['item'].first['displayName']
-      assert_equal "Server 46", hash['DescribeInstancesResponse']['reservationSet']['item'].first['instancesSet']['item'].last['displayName']
-    end
-  end
-end
+#      assert_equal "Server 42", hash['DescribeInstancesResponse']['reservationSet']['item'].first['instancesSet']['item'].first['displayName']
+#      assert_equal "Server 46", hash['DescribeInstancesResponse']['reservationSet']['item'].first['instancesSet']['item'].last['displayName']
+#    end
+#  end
+#end

data/test/lib/nephophobia/compute_test.rb

@@ -32,7 +32,7 @@ describe Nephophobia::Compute do
       @response.size.must_be :>=, 1
     end
   end
-  
+
   describe "#all with filter" do
     before do
       VCR.use_cassette "compute_all_with_filter" do
@@ -157,4 +157,33 @@ describe Nephophobia::Compute do
       @response.return.must_equal true
     end
   end
+  describe "#vnc_url" do
+    before do
+      VCR.use_cassette "compute_vnc_url" do
+        ##
+        # Pointing to the nova trunk version.
+
+        @compute = ::Client.with(:admin,
+          :access_key => "2ea76797-229c-4e52-a21b-f30513cb91a6",
+          :secret_key => "3d16b391-820f-4f5c-893b-0f65d5f35312",
+          :host       => "10.3.170.35",
+          :project    => "sandbox"
+        ).compute
+
+        @instance_id = @compute.create(@image_id).instance_id
+
+        @response = @compute.vnc_url @instance_id
+      end
+    end
+
+    after do
+      VCR.use_cassette "compute_vnc_url" do
+        @compute.destroy @instance_id
+      end
+    end
+
+    it "has a vnc url for the given 'instance_id'" do
+      @response.url.must_match %r{/vnc_auto.html\?token=[a-z0-9-]+}
+    end
+  end
 end

data/test/test_helper.rb

@@ -10,6 +10,7 @@ require "vcr"
 class MiniTest::Unit::TestCase
   def cassette_for cassette, interaction = 0
     c = VCR::Cassette.new(cassette).send :recorded_interactions
+    VCR.eject_cassette
 
     Nokogiri::XML::Document.parse c[interaction].response.body
   end

metadata

@@ -2,7 +2,7 @@
 name: nephophobia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - John Dewey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -07:00
+date: 2011-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.2
+        version: 2.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/aws.rb
@@ -115,6 +116,7 @@ files:
 - test/cassettes/compute_destroy.yml
 - test/cassettes/compute_find.yml
 - test/cassettes/compute_reboot.yml
+- test/cassettes/compute_vnc_url.yml
 - test/cassettes/credential_all.yml
 - test/cassettes/credential_all_without_keys.yml
 - test/cassettes/credential_create.yml
@@ -194,6 +196,7 @@ test_files:
 - test/cassettes/compute_destroy.yml
 - test/cassettes/compute_find.yml
 - test/cassettes/compute_reboot.yml
+- test/cassettes/compute_vnc_url.yml
 - test/cassettes/credential_all.yml
 - test/cassettes/credential_all_without_keys.yml
 - test/cassettes/credential_create.yml