RubyGems - ogle - Versions diffs - 0.2.4 → 0.2.5 - Mend

ogle 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

data/README.md +1 -1
data/lib/ogle/image.rb +26 -8
data/lib/ogle/version.rb +1 -1
data/ogle.gemspec +1 -1
data/test/cassettes/{images_all.yml → image_all.yml} +1 -1
data/test/cassettes/{images_all_with_details.yml → image_all_with_details.yml} +1 -1
data/test/cassettes/image_create.yml +16 -8
data/test/cassettes/image_destroy.yml +67 -2
data/test/cassettes/image_find.yml +51 -172
data/test/cassettes/image_find_with_decimal.yml +72 -0
data/test/cassettes/image_find_with_hexadecimal.yml +68 -0
data/test/cassettes/{images_runable.yml → image_runable.yml} +1 -1
data/test/cassettes/{images_runable_with_details.yml → image_runable_with_details.yml} +1 -1
data/test/cassettes/image_update_metadata.yml +120 -0
data/test/cassettes/image_update_properties.yml +120 -0
data/test/lib/ogle/image_test.rb +124 -29
metadata +19 -13
data/test/cassettes/images_find.yml +0 -143

data/README.md CHANGED Viewed

@@ -24,7 +24,7 @@ ruby 1.9.2
 ## Testing
-Add gluster.trunk to your hosts file.
+Add glance.trunk to your hosts file.
     $ bundle exec rake

data/lib/ogle/image.rb CHANGED Viewed

@@ -1,4 +1,6 @@
 module Ogle
+  Struct.new "ImageDestroy", :return
   class ImageData
     ##
     # Return a valid ami id from the given 'glance id'.
@@ -45,7 +47,6 @@ module Ogle
       path = details ? "/v1/images/detail" : "/v1/images"
       response = @connection.get path
       response.body['images'].collect do |r|
         ImageData.new r
       end
@@ -93,18 +94,35 @@ module Ogle
     def destroy image_id
       response = @connection.delete "/v1/images/#{image_id}"
+      Struct::ImageDestroy.new response.code == "200"
+    end
+    ##
+    # Upload (create) a new image.
+    #
+    # +name+: The name of the file in glance (x-image-meta-name).
+    # +file+: The file to upload.
+    # +metadata+: A hash of custom defined metadata to be added to the image (x-image-meta-properties-*).
+    def create name, file, metadata
+      response = @connection.post "/v1/images", :upload => {
+        :file => file, :headers => { "x-image-meta-name" => name }.merge(metadata)
+      }
+      ImageData.new response.body['image']
     end
     ##
-    # Upload (create) a new image
+    # Update the metadata for an image
     #
-    # +file+: The file to upload
-    # +name+: The name of the file in glance (x-image-meta-name)
-    # +meta+: A hash of custom defined metadata to be added to the image (x-image-meta-properties-*)
+    # +image_id+: A string representing an image_id.
+    # +metadata+: A hash of custom defined metadata to updated in the image.
-    def create file, name, meta
-      headers = { "x-image-meta-name" => name }.merge meta
-      response = @connection.post "/v1/images", :upload => { :file => file, :headers => headers }
+    def update image_id, metadata
+      response = @connection.put "/v1/images/#{image_id}", :headers => metadata
+      ImageData.new response.body['image']
     end
   private

data/lib/ogle/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Ogle
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/ogle.gemspec CHANGED Viewed

@@ -19,7 +19,7 @@ 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.6.0"
+  s.add_dependency "hugs", "~> 2.7.0"
   s.add_development_dependency "rake", "0.8.7"
   s.add_development_dependency "vcr", "1.5.0"

data/test/cassettes/{images_all.yml → image_all.yml} RENAMED Viewed

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :get
-    uri: http://gluster.trunk:9292/v1/images
+    uri: http://glance.trunk:9292/v1/images
     body:
     headers:
       accept:

data/test/cassettes/{images_all_with_details.yml → image_all_with_details.yml} RENAMED Viewed

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :get
-    uri: http://gluster.trunk:9292/v1/images/detail
+    uri: http://glance.trunk:9292/v1/images/detail
     body:
     headers:
       accept:

data/test/cassettes/image_create.yml CHANGED Viewed

@@ -16,15 +16,23 @@
       transfer-encoding:
       - chunked
       x-image-meta-name:
-      - test-image
+      - image_create
       x-image-meta-is-public:
       - "true"
-      x-image-meta-property-test:
-      - "yes"
       x-image-meta-property-distro:
       - test-distro
+      x-image-meta-property-arch:
+      - test-arch
+      x-image-meta-property-uploader:
+      - test-uploader
+      x-image-meta-property-type:
+      - test-type
+      x-image-meta-property-kernel-name:
+      - test-kernel-name
+      x-image-meta-property-kernel-id:
+      - test-kernel-id
       x-image-meta-property-version:
-      - test-version-1
+      - test-version
       connection:
       - keep-alive
       keep-alive:
@@ -37,14 +45,14 @@
       content-type:
       - text/plain; charset=UTF-8
       content-length:
-      - "434"
+      - "556"
       location:
-      - http://glance.trunk:9292/v1/images/56
+      - http://glance.trunk:9292/v1/images/71
       etag:
       - 8cb22c184821cdc62a9dc5c34cf8a125
       date:
-      - Thu, 02 Jun 2011 15:20:11 GMT
+      - Tue, 07 Jun 2011 23:53:53 GMT
       connection:
       - keep-alive
-    body: "{\"image\": {\"status\": \"active\", \"name\": \"test-image\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-02T15:20:11\", \"disk_format\": null, \"updated_at\": \"2011-06-02T15:20:11\", \"id\": 56, \"location\": \"file:///var/lib/glance/images/56\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"test\": \"yes\", \"version\": \"test-version-1\", \"distro\": \"test-distro\"}, \"size\": 11}}"
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_create\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-07T23:53:53\", \"disk_format\": null, \"updated_at\": \"2011-06-07T23:53:53\", \"id\": 71, \"location\": \"file:///var/lib/glance/images/71\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"test-kernel-id\", \"type\": \"test-type\", \"version\": \"test-version\", \"kernel_name\": \"test-kernel-name\", \"uploader\": \"test-uploader\", \"arch\": \"test-arch\", \"distro\": \"test-distro\"}, \"size\": 11}}"
     http_version: "1.1"

data/test/cassettes/image_destroy.yml CHANGED Viewed

@@ -1,12 +1,77 @@
 ---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://glance.trunk:9292/v1/images
+    body: |
+      Test-Image
+    headers:
+      accept:
+      - application/json
+      content-type:
+      - application/octet-stream
+      content-length:
+      - 11
+      transfer-encoding:
+      - chunked
+      x-image-meta-name:
+      - image_destroy
+      x-image-meta-is-public:
+      - "true"
+      x-image-meta-property-test:
+      - "yes"
+      x-image-meta-property-distro:
+      - test-distro
+      x-image-meta-property-version:
+      - test-version-1
+      connection:
+      - keep-alive
+      keep-alive:
+      - 30
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 201
+      message: Created
+    headers:
+      content-type:
+      - text/plain; charset=UTF-8
+      content-length:
+      - "437"
+      location:
+      - http://glance.trunk:9292/v1/images/67
+      etag:
+      - 8cb22c184821cdc62a9dc5c34cf8a125
+      date:
+      - Tue, 07 Jun 2011 23:32:47 GMT
+      connection:
+      - keep-alive
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_destroy\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-07T23:32:47\", \"disk_format\": null, \"updated_at\": \"2011-06-07T23:32:47\", \"id\": 67, \"location\": \"file:///var/lib/glance/images/67\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"test\": \"yes\", \"version\": \"test-version-1\", \"distro\": \"test-distro\"}, \"size\": 11}}"
+    http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :delete
-    uri: http://glance.trunk:9292/v1/images/56
+    uri: http://glance.trunk:9292/v1/images/67
     body:
     headers:
       accept:
       - application/json
+      content-type:
+      - application/octet-stream
+      content-length:
+      - 11
+      transfer-encoding:
+      - chunked
+      x-image-meta-name:
+      - image_destroy
+      x-image-meta-is-public:
+      - "true"
+      x-image-meta-property-test:
+      - "yes"
+      x-image-meta-property-distro:
+      - test-distro
+      x-image-meta-property-version:
+      - test-version-1
       connection:
       - keep-alive
       keep-alive:
@@ -21,7 +86,7 @@
       content-length:
       - "0"
       date:
-      - Thu, 02 Jun 2011 15:38:50 GMT
+      - Tue, 07 Jun 2011 23:32:47 GMT
       connection:
       - keep-alive
     body:

data/test/cassettes/image_find.yml CHANGED Viewed

@@ -1,146 +1,65 @@
 ---
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
-    method: :head
-    uri: http://gluster.trunk:9292/v1/images/4
-    body:
+    method: :post
+    uri: http://glance.trunk:9292/v1/images
+    body: |
+      Test-Image
     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
+      - application/octet-stream
       content-length:
-      - "0"
+      - 11
+      transfer-encoding:
+      - chunked
+      x-image-meta-name:
+      - image_find
+      x-image-meta-is-public:
+      - "true"
       x-image-meta-property-distro:
-      - Ubuntu
-      x-image-meta-id:
-      - "4"
+      - test-distro
       x-image-meta-property-arch:
-      - amd64
-      x-image-meta-deleted:
-      - "False"
-      x-image-meta-container-format:
-      - ami
+      - test-arch
       x-image-meta-property-uploader:
-      - root@enc1b11
-      x-image-meta-location:
-      - file:///var/lib/glance/images/4
-      x-image-meta-deleted-at:
-      - ""
-      x-image-meta-created-at:
-      - 2011-05-11T15:48:02
-      x-image-meta-size:
-      - "1476395008"
-      x-image-meta-status:
-      - active
+      - test-uploader
       x-image-meta-property-type:
-      - machine
+      - test-type
       x-image-meta-property-kernel-name:
-      - natty-server-uec-amd64-vmlinuz-virtual
-      x-image-meta-is-public:
-      - "True"
+      - test-kernel-name
       x-image-meta-property-kernel-id:
-      - "3"
-      x-image-meta-updated-at:
-      - 2011-05-11T15:48:08
-      x-image-meta-checksum:
-      - b6149317c554d2c335365e7bd43e9bf0
+      - test-kernel-id
       x-image-meta-property-version:
-      - "11.04"
-      x-image-meta-disk-format:
-      - ami
-      x-image-meta-name:
-      - natty-server-uec-amd64.img
-      location:
-      - http://gluster.trunk:9292/v1/images/4
-      etag:
-      - b6149317c554d2c335365e7bd43e9bf0
-      date:
-      - Sat, 28 May 2011 02:32:55 GMT
-      connection:
-      - keep-alive
-    body:
-    http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :head
-    uri: http://gluster.trunk:9292/v1/images/36
-    body:
-    headers:
-      accept:
-      - application/json
+      - test-version
       connection:
       - keep-alive
       keep-alive:
       - 30
   response: !ruby/struct:VCR::Response
     status: !ruby/struct:VCR::ResponseStatus
-      code: 200
-      message: OK
+      code: 201
+      message: Created
     headers:
       content-type:
-      - text/html; charset=UTF-8
+      - text/plain; charset=UTF-8
       content-length:
-      - "0"
-      x-image-meta-property-distro:
-      - CentOS
-      x-image-meta-id:
-      - "36"
-      x-image-meta-property-arch:
-      - x86_64
-      x-image-meta-deleted:
-      - "False"
-      x-image-meta-container-format:
-      - ami
-      x-image-meta-location:
-      - file:///var/lib/glance/images/36
-      x-image-meta-deleted-at:
-      - ""
-      x-image-meta-created-at:
-      - 2011-05-26T15:13:11
-      x-image-meta-size:
-      - "1430192128"
-      x-image-meta-status:
-      - active
-      x-image-meta-property-type:
-      - machine
-      x-image-meta-property-uploader:
-      - root@enc1b11
-      x-image-meta-is-public:
-      - "True"
-      x-image-meta-updated-at:
-      - 2011-05-26T15:13:16
-      x-image-meta-checksum:
-      - 8731b6dcb85e7554cc69aeb8acc6ad09
-      x-image-meta-property-version:
-      - "5.4"
-      x-image-meta-disk-format:
-      - ami
-      x-image-meta-name:
-      - CentOS-5.4-cloudinit
+      - "554"
       location:
-      - http://gluster.trunk:9292/v1/images/36
+      - http://glance.trunk:9292/v1/images/80
       etag:
-      - 8731b6dcb85e7554cc69aeb8acc6ad09
+      - 8cb22c184821cdc62a9dc5c34cf8a125
       date:
-      - Sat, 28 May 2011 02:32:56 GMT
+      - Wed, 08 Jun 2011 05:44:10 GMT
       connection:
       - keep-alive
-    body:
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_find\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-08T05:44:10\", \"disk_format\": null, \"updated_at\": \"2011-06-08T05:44:10\", \"id\": 80, \"location\": \"file:///var/lib/glance/images/80\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"test-kernel-id\", \"type\": \"test-type\", \"version\": \"test-version\", \"kernel_name\": \"test-kernel-name\", \"uploader\": \"test-uploader\", \"arch\": \"test-arch\", \"distro\": \"test-distro\"}, \"size\": 11}}"
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :head
-    uri: http://glance.trunk:9292/v1/images/4
+    uri: http://glance.trunk:9292/v1/images/80
     body:
     headers:
       accept:
@@ -159,59 +78,59 @@
       content-length:
       - "0"
       x-image-meta-property-distro:
-      - Ubuntu
+      - test-distro
       x-image-meta-id:
-      - "4"
+      - "80"
       x-image-meta-property-arch:
-      - amd64
+      - test-arch
       x-image-meta-deleted:
       - "False"
       x-image-meta-container-format:
-      - ami
+      - ""
       x-image-meta-property-uploader:
-      - root@enc1b11
+      - test-uploader
       x-image-meta-location:
-      - file:///var/lib/glance/images/4
+      - file:///var/lib/glance/images/80
       x-image-meta-deleted-at:
       - ""
       x-image-meta-created-at:
-      - 2011-05-11T15:48:02
+      - 2011-06-08T05:44:10
       x-image-meta-size:
-      - "1476395008"
+      - "11"
       x-image-meta-status:
       - active
       x-image-meta-property-type:
-      - machine
+      - test-type
       x-image-meta-property-kernel-name:
-      - natty-server-uec-amd64-vmlinuz-virtual
+      - test-kernel-name
       x-image-meta-is-public:
       - "True"
       x-image-meta-property-kernel-id:
-      - "3"
+      - test-kernel-id
       x-image-meta-updated-at:
-      - 2011-05-11T15:48:08
+      - 2011-06-08T05:44:10
       x-image-meta-checksum:
-      - b6149317c554d2c335365e7bd43e9bf0
+      - 8cb22c184821cdc62a9dc5c34cf8a125
       x-image-meta-property-version:
-      - "11.04"
+      - test-version
       x-image-meta-disk-format:
-      - ami
+      - ""
       x-image-meta-name:
-      - natty-server-uec-amd64.img
+      - image_find
       location:
-      - http://glance.trunk:9292/v1/images/4
+      - http://glance.trunk:9292/v1/images/80
       etag:
-      - b6149317c554d2c335365e7bd43e9bf0
+      - 8cb22c184821cdc62a9dc5c34cf8a125
       date:
-      - Wed, 01 Jun 2011 21:01:43 GMT
+      - Wed, 08 Jun 2011 05:44:10 GMT
       connection:
       - keep-alive
     body:
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
-    method: :head
-    uri: http://glance.trunk:9292/v1/images/36
+    method: :delete
+    uri: http://glance.trunk:9292/v1/images/80
     body:
     headers:
       accept:
@@ -229,48 +148,8 @@
       - text/html; charset=UTF-8
       content-length:
       - "0"
-      x-image-meta-property-distro:
-      - CentOS
-      x-image-meta-id:
-      - "36"
-      x-image-meta-property-arch:
-      - x86_64
-      x-image-meta-deleted:
-      - "False"
-      x-image-meta-container-format:
-      - ami
-      x-image-meta-location:
-      - file:///var/lib/glance/images/36
-      x-image-meta-deleted-at:
-      - ""
-      x-image-meta-created-at:
-      - 2011-05-26T15:13:11
-      x-image-meta-size:
-      - "1430192128"
-      x-image-meta-status:
-      - active
-      x-image-meta-property-type:
-      - machine
-      x-image-meta-property-uploader:
-      - root@enc1b11
-      x-image-meta-is-public:
-      - "True"
-      x-image-meta-updated-at:
-      - 2011-05-26T15:13:16
-      x-image-meta-checksum:
-      - 8731b6dcb85e7554cc69aeb8acc6ad09
-      x-image-meta-property-version:
-      - "5.4"
-      x-image-meta-disk-format:
-      - ami
-      x-image-meta-name:
-      - CentOS-5.4-cloudinit
-      location:
-      - http://glance.trunk:9292/v1/images/36
-      etag:
-      - 8731b6dcb85e7554cc69aeb8acc6ad09
       date:
-      - Wed, 01 Jun 2011 21:01:44 GMT
+      - Wed, 08 Jun 2011 05:44:10 GMT
       connection:
       - keep-alive
     body:

data/test/cassettes/image_find_with_decimal.yml ADDED Viewed

@@ -0,0 +1,72 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :head
+    uri: http://glance.trunk:9292/v1/images/4
+    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:
+      - "0"
+      x-image-meta-property-distro:
+      - Ubuntu
+      x-image-meta-id:
+      - "4"
+      x-image-meta-property-arch:
+      - amd64
+      x-image-meta-deleted:
+      - "False"
+      x-image-meta-container-format:
+      - ami
+      x-image-meta-property-uploader:
+      - root@enc1b11
+      x-image-meta-location:
+      - file:///var/lib/glance/images/4
+      x-image-meta-deleted-at:
+      - ""
+      x-image-meta-created-at:
+      - 2011-05-11T15:48:02
+      x-image-meta-size:
+      - "1476395008"
+      x-image-meta-status:
+      - active
+      x-image-meta-property-type:
+      - machine
+      x-image-meta-property-kernel-name:
+      - natty-server-uec-amd64-vmlinuz-virtual
+      x-image-meta-is-public:
+      - "True"
+      x-image-meta-property-kernel-id:
+      - "3"
+      x-image-meta-updated-at:
+      - 2011-05-11T15:48:08
+      x-image-meta-checksum:
+      - b6149317c554d2c335365e7bd43e9bf0
+      x-image-meta-property-version:
+      - "11.04"
+      x-image-meta-disk-format:
+      - ami
+      x-image-meta-name:
+      - ubuntu_11.04-amd64
+      location:
+      - http://glance.trunk:9292/v1/images/4
+      etag:
+      - b6149317c554d2c335365e7bd43e9bf0
+      date:
+      - Tue, 07 Jun 2011 23:43:10 GMT
+      connection:
+      - keep-alive
+    body:
+    http_version: "1.1"

data/test/cassettes/image_find_with_hexadecimal.yml ADDED Viewed

@@ -0,0 +1,68 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :head
+    uri: http://glance.trunk:9292/v1/images/36
+    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:
+      - "0"
+      x-image-meta-property-distro:
+      - CentOS
+      x-image-meta-id:
+      - "36"
+      x-image-meta-property-arch:
+      - x86_64
+      x-image-meta-deleted:
+      - "False"
+      x-image-meta-container-format:
+      - ami
+      x-image-meta-location:
+      - file:///var/lib/glance/images/36
+      x-image-meta-deleted-at:
+      - ""
+      x-image-meta-created-at:
+      - 2011-05-26T15:13:11
+      x-image-meta-size:
+      - "1430192128"
+      x-image-meta-status:
+      - active
+      x-image-meta-property-type:
+      - machine
+      x-image-meta-property-uploader:
+      - root@enc1b11
+      x-image-meta-is-public:
+      - "True"
+      x-image-meta-updated-at:
+      - 2011-05-26T15:13:16
+      x-image-meta-checksum:
+      - 8731b6dcb85e7554cc69aeb8acc6ad09
+      x-image-meta-property-version:
+      - "5.4"
+      x-image-meta-disk-format:
+      - ami
+      x-image-meta-name:
+      - centos_5.4-x86_64
+      location:
+      - http://glance.trunk:9292/v1/images/36
+      etag:
+      - 8731b6dcb85e7554cc69aeb8acc6ad09
+      date:
+      - Tue, 07 Jun 2011 23:46:31 GMT
+      connection:
+      - keep-alive
+    body:
+    http_version: "1.1"