ogle 0.1.0 → 0.1.1

data/lib/ogle/image.rb

@@ -7,11 +7,11 @@ module Ogle
     ##
     # Returns information about images.
     #
-    # +verbose+: A Boolean toggling the returning of
-    # additional image information.
+    # +details+: A Boolean toggling the returning of detailed image
+    # information.
 
-    def all verbose = false
-      path = verbose ? "/images/detail" : "/images"
+    def all details = false
+      path = details ? "/images/detail" : "/images"
 
       response = @connection.get path
 
@@ -39,8 +39,14 @@ module Ogle
       end
     end
 
-    def runable
-      all.select do |image|
+    ##
+    # Return only runable images.
+    #
+    # +details+: A Boolean toggling the returning of detailed image
+    # information.
+
+    def runable details = false
+      all(details).select do |image|
         runable? image
       end
     end

data/lib/ogle/version.rb

@@ -1,3 +1,3 @@
 module Ogle
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/cassettes/images_runable_with_details.yml

@@ -0,0 +1,28 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.32:9292/images/detail
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html; charset=UTF-8
+      content-length: 
+      - "3113"
+      date: 
+      - Wed, 13 Apr 2011 23:30:22 GMT
+      connection: 
+      - keep-alive
+    body: "{\"images\": [{\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T17:18:44\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T17:18:44\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.35\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"Ubuntu\"}, \"size\": 4408912}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T17:18:45\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T17:18:51\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"d2d3b3049f897dff2f86295d5a9e879e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"1\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@cc-01\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:04:51\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:04:56\", \"id\": 6, \"location\": \"file:///var/lib/glance/images/6\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.5\", \"type\": \"machine\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 816906240}, {\"status\": \"active\", \"name\": \"initrd.img-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"ari\", \"created_at\": \"2011-04-11T21:18:33\", \"disk_format\": \"ari\", \"updated_at\": \"2011-04-11T21:18:33\", \"id\": 7, \"location\": \"file:///var/lib/glance/images/7\", \"checksum\": \"4ee1b2aa5c15472b41dafe39f4854aac\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"type\": \"ramdisk\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 8679404}, {\"status\": \"active\", \"name\": \"vmlinuz-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T21:18:34\", \"id\": 8, \"location\": \"file:///var/lib/glance/images/8\", \"checksum\": \"d15243d1203d0aecf187ff969d6764ea\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"2.6.28-11-generic\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 3522336}, {\"status\": \"active\", \"name\": \"centos.5-3.x86-64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:18:39\", \"id\": 9, \"location\": \"file:///var/lib/glance/images/9\", \"checksum\": \"79523e49084752f61b49398b19831b23\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"8\", \"arch\": \"x86_64\", \"ramdisk_id\": \"7\", \"version\": \"5.3\", \"kernel_name\": \"vmlinuz-2.6.28-11-generic\", \"ramdisk_name\": \"initrd.img-2.6.28-11-generic\", \"uploader\": \"root@cc-01\", \"type\": \"machine\", \"distro\": \"CentOS\"}, \"size\": 1049624576}]}"
+    http_version: "1.1"

data/test/lib/ogle/resource_test.rb

@@ -18,64 +18,55 @@ describe Ogle::Image do
     end
 
     it "returns a hash of images" do
-      @response.size.must_be :>=, 5
+      @response.size.must_be :>=, 1
     end
 
     it "returns metadata" do
-      must_have_valid_keys @response.first, %w(
-        name
-        container_format
-        disk_format
-        checksum
-        id
-        size
-      )
+      must_have_valid_keys @response.first, METADATA_KEYS
     end
   end
 
-  describe "#all true" do
+  describe "#all with details" do
     before do
-      VCR.use_cassette "images_all_verbose" do
+      VCR.use_cassette "images_all_with_details" do
         @response = CONNECTION.image.all true
       end
     end
 
     it "returns a detailed hash of images" do
-      @response.size.must_be :>=, 5
+      @response.size.must_be :>=, 1
     end
 
     it "returns metadata" do
-      must_have_valid_keys @response.first, %w(
-        status
-        name
-        deleted
-        container_format
-        created_at
-        disk_format
-        updated_at
-        id
-        location
-        checksum
-        is_public
-        deleted_at
-        properties
-        size
-      )
+      must_have_valid_keys @response.first, DETAILED_METADATA_KEYS
     end
   end
 
-  ##
-  # TODO: Make these tests less brittle
-  
-  describe "#all runable" do
+  describe "#runable" do
     before do
-      VCR.use_cassette "images_all_runable" do
+      VCR.use_cassette "images_runable" do
         @response = CONNECTION.image.runable
       end
     end
 
     it "returns a hash of all images which are runable" do
-      @response.size.must_be :==, 3
+      @response.any? { |i| i['id'] != 1}.must_equal true
+    end
+
+    it "returns metadata" do
+      must_have_valid_keys @response.first, METADATA_KEYS
+    end
+  end
+
+  describe "#runable with details" do
+    before do
+      VCR.use_cassette "images_runable_with_details" do
+        @response = CONNECTION.image.runable(true)
+      end
+    end
+
+    it "returns metadata" do
+      must_have_valid_keys @response.first, DETAILED_METADATA_KEYS
     end
   end
 
@@ -86,25 +77,8 @@ describe Ogle::Image do
       end
     end
 
-    ### TODO: May want to refactor these keys into a variable,
-    ### TODO: since Images#find verbose shares them.
     it "returns X-Image-Meta-* headers as a hash" do
-      must_have_valid_keys @response, %w(
-        status
-        name
-        deleted
-        container_format
-        created_at
-        disk_format
-        updated_at
-        id
-        location
-        checksum
-        is_public
-        deleted_at
-        properties
-        size
-      )
+      must_have_valid_keys @response, DETAILED_METADATA_KEYS
     end
 
     it "returns a nested properties hash" do

data/test/test_helper.rb

@@ -3,6 +3,31 @@ Bundler.setup :default, :test
 %w(minitest/spec ogle vcr webmock).each { |r| require r }
 
 class MiniTest::Unit::TestCase
+  METADATA_KEYS = %w(
+    name
+    container_format
+    disk_format
+    checksum
+    id
+    size
+  )
+
+  DETAILED_METADATA_KEYS = %w(
+    status
+    name
+    deleted
+    container_format
+    created_at
+    disk_format
+    updated_at
+    id
+    location
+    checksum
+    is_public
+    deleted_at
+    properties
+    size
+  )
 end
 
 VCR.config do |c|

metadata

@@ -2,7 +2,7 @@
 name: ogle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kevin Bringard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -06:00
+date: 2011-04-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,9 +89,10 @@ files:
 - lib/ogle/version.rb
 - ogle.gemspec
 - test/cassettes/images_all.yml
-- test/cassettes/images_all_runable.yml
-- test/cassettes/images_all_verbose.yml
+- test/cassettes/images_all_with_details.yml
 - test/cassettes/images_find.yml
+- test/cassettes/images_runable.yml
+- test/cassettes/images_runable_with_details.yml
 - test/lib/ogle/resource_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -124,8 +125,9 @@ specification_version: 3
 summary: Ruby interface for OpenStack Glance
 test_files: 
 - test/cassettes/images_all.yml
-- test/cassettes/images_all_runable.yml
-- test/cassettes/images_all_verbose.yml
+- test/cassettes/images_all_with_details.yml
 - test/cassettes/images_find.yml
+- test/cassettes/images_runable.yml
+- test/cassettes/images_runable_with_details.yml
 - test/lib/ogle/resource_test.rb
 - test/test_helper.rb