brightbox-cli 0.17.1 → 0.17.2

data/spec/cloud_ips_spec.rb

@@ -10,7 +10,7 @@ describe "Cloud IP" do
       output = capture_stdout {
         Brightbox.render_table(ips.sort, :vertical => true)
       }
-      output.should match(/cip-33fjw/)
+      output.should match(/cip-6r5a4/)
     end
   end
 

data/spec/fixtures/vcr_cassettes/list_cloud_ip.yml

@@ -1,36 +1,68 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: POST
+    uri: https://api.gb1s.brightbox.com:443/token
+    body: ! '{"client_id":"cli-cfv8i","grant_type":"none"}'
+    headers:
+      authorization:
+      - Basic Y2xpLWNmdjhpOjMwcjE3cWJ3cWFsb2VtZw==
+      content-type:
+      - application/json
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:19:10 GMT
+      server:
+      - Apache
+      cache-control:
+      - no-store
+      content-length:
+      - '77'
+      status:
+      - '200'
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+    body: ! '{"expires_in":7200,"access_token":"9b1d6a22503562503acde9740b410b89e2444009"}'
+    http_version: 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: GET
     uri: https://api.gb1s.brightbox.com:443/1.0/cloud_ips
     body: 
-    headers: 
-      content-type: 
+    headers:
+      authorization:
+      - OAuth 9b1d6a22503562503acde9740b410b89e2444009
+      content-type:
       - application/json
-      authorization: 
-      - OAuth 3f373f2fdb5f3b84101607e69f82b5a810905b67
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: 
-    headers: 
-      etag: 
-      - "\"941714dc085643e75d2d19f01554aa6b\""
-      content-type: 
-      - application/json; charset=utf-8
-      server: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:19:11 GMT
+      server:
       - Apache
-      date: 
-      - Fri, 21 Oct 2011 12:13:56 GMT
-      x-runtime: 
-      - "56"
-      content-length: 
-      - "2980"
-      cache-control: 
+      etag:
+      - ! '"99340bd6fc2084a8fc85d34f409dcfe1"'
+      x-runtime:
+      - '66'
+      cache-control:
       - private, max-age=0, must-revalidate
-      status: 
-      - "200"
-      vary: 
+      content-length:
+      - '904'
+      status:
+      - '200'
+      vary:
       - Accept-Encoding
-    body: "[{\"id\":\"cip-33fjw\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1s.brightbox.com/1.0/cloud_ips/cip-33fjw\",\"reverse_dns\":\"cip-109-107-39-5.gb1s.brightbox.com\",\"status\":\"mapped\",\"public_ip\":\"109.107.39.5\",\"account\":{\"id\":\"acc-8gq0k\",\"resource_type\":\"account\",\"url\":\"https://api.gb1s.brightbox.com/1.0/account\",\"name\":\"Hemant Account\",\"status\":\"active\"},\"server\":{\"id\":\"srv-7yilp\",\"resource_type\":\"server\",\"url\":\"https://api.gb1s.brightbox.com/1.0/servers/srv-7yilp\",\"name\":\"\",\"created_at\":\"2011-08-18T03:43:30Z\",\"deleted_at\":null,\"hostname\":\"srv-7yilp\",\"started_at\":null,\"status\":\"active\"},\"interface\":{\"id\":\"int-p6vyz\",\"resource_type\":\"interface\",\"url\":\"https://api.gb1s.brightbox.com/1.0/interfaces/int-p6vyz\",\"mac_address\":\"02:24:19:fb:11:ea\",\"ipv4_address\":\"10.251.17.234\",\"ipv6_address\":\"2a02:1348:14b:c47a:24:19ff:fefb:11ea\"},\"load_balancer\":null},{\"id\":\"cip-inku6\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1s.brightbox.com/1.0/cloud_ips/cip-inku6\",\"reverse_dns\":\"cip-109-107-39-12.gb1s.brightbox.com\",\"status\":\"mapped\",\"public_ip\":\"109.107.39.12\",\"account\":{\"id\":\"acc-8gq0k\",\"resource_type\":\"account\",\"url\":\"https://api.gb1s.brightbox.com/1.0/account\",\"name\":\"Hemant Account\",\"status\":\"active\"},\"server\":{\"id\":\"srv-l3lxf\",\"resource_type\":\"server\",\"url\":\"https://api.gb1s.brightbox.com/1.0/servers/srv-l3lxf\",\"name\":\"ipv61\",\"created_at\":\"2011-09-16T11:12:48Z\",\"deleted_at\":null,\"hostname\":\"srv-l3lxf\",\"started_at\":null,\"status\":\"active\"},\"interface\":{\"id\":\"int-metlu\",\"resource_type\":\"interface\",\"url\":\"https://api.gb1s.brightbox.com/1.0/interfaces/int-metlu\",\"mac_address\":\"02:24:19:fb:25:56\",\"ipv4_address\":\"10.251.37.86\",\"ipv6_address\":\"2a02:1348:14b:c955:24:19ff:fefb:2556\"},\"load_balancer\":null},{\"id\":\"cip-61a9w\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1s.brightbox.com/1.0/cloud_ips/cip-61a9w\",\"reverse_dns\":\"cip-109-107-39-15.gb1s.brightbox.com\",\"status\":\"mapped\",\"public_ip\":\"109.107.39.15\",\"account\":{\"id\":\"acc-8gq0k\",\"resource_type\":\"account\",\"url\":\"https://api.gb1s.brightbox.com/1.0/account\",\"name\":\"Hemant Account\",\"status\":\"active\"},\"server\":{\"id\":\"srv-ddw5x\",\"resource_type\":\"server\",\"url\":\"https://api.gb1s.brightbox.com/1.0/servers/srv-ddw5x\",\"name\":\"\",\"created_at\":\"2011-09-20T11:12:58Z\",\"deleted_at\":null,\"hostname\":\"srv-ddw5x\",\"started_at\":null,\"status\":\"active\"},\"interface\":{\"id\":\"int-69l2r\",\"resource_type\":\"interface\",\"url\":\"https://api.gb1s.brightbox.com/1.0/interfaces/int-69l2r\",\"mac_address\":\"02:24:19:fb:63:5e\",\"ipv4_address\":\"10.251.99.94\",\"ipv6_address\":\"2a02:1348:14b:d8d7:24:19ff:fefb:635e\"},\"load_balancer\":null},{\"id\":\"cip-nztk5\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1s.brightbox.com/1.0/cloud_ips/cip-nztk5\",\"reverse_dns\":\"cip-109-107-46-63.gb1s.brightbox.com\",\"status\":\"unmapped\",\"public_ip\":\"109.107.46.63\",\"account\":{\"id\":\"acc-8gq0k\",\"resource_type\":\"account\",\"url\":\"https://api.gb1s.brightbox.com/1.0/account\",\"name\":\"Hemant Account\",\"status\":\"active\"},\"server\":null,\"interface\":null,\"load_balancer\":null}]"
+      content-type:
+      - application/json; charset=utf-8
+    body: ! '[{"id":"cip-6r5a4","resource_type":"cloud_ip","url":"https://api.gb1.brightbox.com/1.0/cloud_ips/cip-6r5a4","reverse_dns":"cip-109-107-39-29.gb1s.brightbox.com","status":"mapped","public_ip":"109.107.39.29","account":{"id":"acc-998rf","resource_type":"account","url":"https://api.gb1.brightbox.com/1.0/account","name":"Brighbox
+      Systems","status":"active"},"server":{"id":"srv-egjzh","resource_type":"server","url":"https://api.gb1.brightbox.com/1.0/servers/srv-egjzh","name":"test1","fqdn":"srv-egjzh.gb1s.","created_at":"2011-11-02T08:07:45Z","deleted_at":null,"hostname":"srv-egjzh","started_at":"2011-12-16T15:47:45Z","status":"active"},"interface":{"id":"int-rbob6","resource_type":"interface","url":"https://api.gb1.brightbox.com/1.0/interfaces/int-rbob6","mac_address":"02:24:19:fa:bc:ee","ipv4_address":"10.250.188.238","ipv6_address":"2a02:1348:14a:af3b:24:19ff:fefa:bcee"},"load_balancer":null}]'
     http_version: 

data/spec/fixtures/vcr_cassettes/server_show.yml

@@ -1,141 +1,182 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: POST
+    uri: https://api.gb1s.brightbox.com:443/token
+    body: ! '{"client_id":"cli-cfv8i","grant_type":"none"}'
+    headers:
+      authorization:
+      - Basic Y2xpLWNmdjhpOjMwcjE3cWJ3cWFsb2VtZw==
+      content-type:
+      - application/json
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:27:40 GMT
+      server:
+      - Apache
+      cache-control:
+      - no-store
+      content-length:
+      - '77'
+      status:
+      - '200'
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+    body: ! '{"expires_in":7200,"access_token":"f9f6a5d76a65da83199db1cbdb73482ea6327f80"}'
+    http_version: 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: GET
-    uri: https://api.gb1s.brightbox.com:443/1.0/servers/srv-7yilp
+    uri: https://api.gb1s.brightbox.com:443/1.0/servers/srv-egjzh
     body: 
-    headers: 
-      content-type: 
+    headers:
+      authorization:
+      - OAuth f9f6a5d76a65da83199db1cbdb73482ea6327f80
+      content-type:
       - application/json
-      authorization: 
-      - OAuth e717de9faa2aaeacd8b55c38def2c53e72b42f06
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: 
-    headers: 
-      etag: 
-      - "\"59c4db35962e0c395e5d3708907731a0\""
-      content-type: 
-      - application/json; charset=utf-8
-      server: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:27:41 GMT
+      server:
       - Apache
-      date: 
-      - Fri, 14 Oct 2011 13:12:55 GMT
-      x-runtime: 
-      - "39"
-      content-length: 
-      - "1779"
-      cache-control: 
+      etag:
+      - ! '"5b99e72aae961dd40f97e980875fbff9"'
+      x-runtime:
+      - '88'
+      cache-control:
       - private, max-age=0, must-revalidate
-      status: 
-      - "200"
-      vary: 
+      content-length:
+      - '1888'
+      status:
+      - '200'
+      vary:
       - Accept-Encoding
-    body: "{\"id\":\"srv-7yilp\",\"resource_type\":\"server\",\"url\":\"https://api.gb1s.brightbox.com/1.0/servers/srv-7yilp\",\"name\":\"\",\"created_at\":\"2011-08-18T03:43:30Z\",\"deleted_at\":null,\"console_token_expires\":null,\"console_url\":null,\"console_token\":null,\"started_at\":null,\"hostname\":\"srv-7yilp\",\"status\":\"active\",\"user_data\":null,\"server_type\":{\"id\":\"typ-eir7x\",\"resource_type\":\"server_type\",\"url\":\"https://api.gb1s.brightbox.com/1.0/server_types/typ-eir7x\",\"name\":\"nano\",\"cores\":2,\"handle\":\"nano\",\"disk_size\":20480,\"ram\":512,\"status\":\"available\"},\"zone\":{\"id\":\"zon-nzn7l\",\"resource_type\":\"zone\",\"url\":\"https://api.gb1s.brightbox.com/1.0/zones/zon-nzn7l\",\"handle\":\"gb1s-b\"},\"cloud_ips\":[{\"id\":\"cip-33fjw\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1s.brightbox.com/1.0/cloud_ips/cip-33fjw\",\"reverse_dns\":\"cip-109-107-39-5.gb1s.brightbox.com\",\"status\":\"mapped\",\"public_ip\":\"109.107.39.5\"}],\"account\":{\"id\":\"acc-8gq0k\",\"resource_type\":\"account\",\"url\":\"https://api.gb1s.brightbox.com/1.0/account\",\"name\":\"Hemant Account\",\"status\":\"active\"},\"snapshots\":[],\"interfaces\":[{\"id\":\"int-p6vyz\",\"resource_type\":\"interface\",\"url\":\"https://api.gb1s.brightbox.com/1.0/interfaces/int-p6vyz\",\"mac_address\":\"02:24:19:fb:11:ea\",\"ipv4_address\":\"10.251.17.234\",\"ipv6_address\":\"2a02:1348:14b:c47a:24:19ff:fefb:11ea\"}],\"server_groups\":[{\"id\":\"grp-pb7oa\",\"resource_type\":\"server_group\",\"url\":\"https://api.gb1s.brightbox.com/1.0/server_groups/grp-pb7oa\",\"name\":\"proxy\",\"default\":false,\"description\":null}],\"image\":{\"id\":\"img-ymfuq\",\"resource_type\":\"image\",\"url\":\"https://api.gb1s.brightbox.com/1.0/images/img-ymfuq\",\"name\":\"Ubuntu Lucid 10.04 server\",\"created_at\":\"2011-06-01T15:43:38Z\",\"arch\":\"i686\",\"description\":\"login: ubuntu using stored ssh key\",\"status\":\"available\",\"source\":\"lucid.img\",\"owner\":\"acc-kg71m\"}}"
+      content-type:
+      - application/json; charset=utf-8
+    body: ! '{"id":"srv-egjzh","resource_type":"server","url":"https://api.gb1.brightbox.com/1.0/servers/srv-egjzh","name":"test1","fqdn":"srv-egjzh.gb1s.","created_at":"2011-11-02T08:07:45Z","deleted_at":null,"console_token_expires":null,"console_url":null,"console_token":null,"started_at":"2011-12-16T15:47:45Z","hostname":"srv-egjzh","status":"active","user_data":null,"server_type":{"id":"typ-eir7x","resource_type":"server_type","url":"https://api.gb1.brightbox.com/1.0/server_types/typ-eir7x","name":"nano","cores":2,"handle":"nano","disk_size":20480,"ram":512,"status":"available"},"zone":{"id":"zon-uvinx","resource_type":"zone","url":"https://api.gb1.brightbox.com/1.0/zones/zon-uvinx","handle":"gb1s-b"},"cloud_ips":[{"id":"cip-6r5a4","resource_type":"cloud_ip","url":"https://api.gb1.brightbox.com/1.0/cloud_ips/cip-6r5a4","reverse_dns":"cip-109-107-39-29.gb1s.brightbox.com","status":"mapped","public_ip":"109.107.39.29"}],"account":{"id":"acc-998rf","resource_type":"account","url":"https://api.gb1.brightbox.com/1.0/account","name":"Brighbox
+      Systems","status":"active"},"snapshots":[],"interfaces":[{"id":"int-rbob6","resource_type":"interface","url":"https://api.gb1.brightbox.com/1.0/interfaces/int-rbob6","mac_address":"02:24:19:fa:bc:ee","ipv4_address":"10.250.188.238","ipv6_address":"2a02:1348:14a:af3b:24:19ff:fefa:bcee"}],"server_groups":[{"id":"grp-th4pa","resource_type":"server_group","url":"https://api.gb1.brightbox.com/1.0/server_groups/grp-th4pa","name":"load
+      balanced","created_at":"2011-11-02T13:09:29Z","default":false,"description":null}],"image":{"id":"img-ymfuq","resource_type":"image","url":"https://api.gb1.brightbox.com/1.0/images/img-ymfuq","name":"Ubuntu
+      Lucid 10.04 server","created_at":"2011-06-01T15:43:38Z","username":"ubuntu","arch":"i686","description":"login:
+      ubuntu using stored ssh key","status":"available","source":"lucid.img","owner":"acc-kg71m"}}'
     http_version: 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: GET
     uri: https://api.gb1s.brightbox.com:443/1.0/images/img-ymfuq
     body: 
-    headers: 
-      content-type: 
+    headers:
+      authorization:
+      - OAuth f9f6a5d76a65da83199db1cbdb73482ea6327f80
+      content-type:
       - application/json
-      authorization: 
-      - OAuth e717de9faa2aaeacd8b55c38def2c53e72b42f06
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: 
-    headers: 
-      etag: 
-      - "\"6e6f8f223836a3fe402757fe35982a9d\""
-      content-type: 
-      - application/json; charset=utf-8
-      server: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:27:42 GMT
+      server:
       - Apache
-      date: 
-      - Fri, 14 Oct 2011 13:12:56 GMT
-      x-runtime: 
-      - "11"
-      content-length: 
-      - "432"
-      cache-control: 
+      etag:
+      - ! '"66c3c1ee5a081759ba5daa44354de1aa"'
+      x-runtime:
+      - '24'
+      cache-control:
       - private, max-age=0, must-revalidate
-      status: 
-      - "200"
-      vary: 
+      content-length:
+      - '466'
+      status:
+      - '200'
+      vary:
       - Accept-Encoding
-    body: "{\"id\":\"img-ymfuq\",\"resource_type\":\"image\",\"url\":\"https://api.gb1s.brightbox.com/1.0/images/img-ymfuq\",\"name\":\"Ubuntu Lucid 10.04 server\",\"created_at\":\"2011-06-01T15:43:38Z\",\"public\":true,\"disk_size\":538,\"official\":true,\"arch\":\"i686\",\"compatibility_mode\":false,\"source_type\":\"upload\",\"description\":\"login: ubuntu using stored ssh key\",\"source\":\"lucid.img\",\"status\":\"available\",\"owner\":\"acc-kg71m\",\"virtual_size\":1409,\"ancestor\":null}"
+      content-type:
+      - application/json; charset=utf-8
+    body: ! '{"id":"img-ymfuq","resource_type":"image","url":"https://api.gb1.brightbox.com/1.0/images/img-ymfuq","name":"Ubuntu
+      Lucid 10.04 server","created_at":"2011-06-01T15:43:38Z","public":true,"disk_size":538,"official":true,"arch":"i686","username":"ubuntu","compatibility_mode":false,"source_type":"upload","description":"login:
+      ubuntu using stored ssh key","source":"lucid.img","status":"available","owner":"acc-kg71m","min_ram":null,"virtual_size":1409,"ancestor":null}'
     http_version: 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: GET
     uri: https://api.gb1s.brightbox.com:443/1.0/images/img-ymfuq
     body: 
-    headers: 
-      content-type: 
+    headers:
+      authorization:
+      - OAuth f9f6a5d76a65da83199db1cbdb73482ea6327f80
+      content-type:
       - application/json
-      authorization: 
-      - OAuth e717de9faa2aaeacd8b55c38def2c53e72b42f06
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: 
-    headers: 
-      etag: 
-      - "\"6e6f8f223836a3fe402757fe35982a9d\""
-      content-type: 
-      - application/json; charset=utf-8
-      server: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:27:43 GMT
+      server:
       - Apache
-      date: 
-      - Fri, 14 Oct 2011 13:12:57 GMT
-      x-runtime: 
-      - "12"
-      content-length: 
-      - "432"
-      cache-control: 
+      etag:
+      - ! '"66c3c1ee5a081759ba5daa44354de1aa"'
+      x-runtime:
+      - '26'
+      cache-control:
       - private, max-age=0, must-revalidate
-      status: 
-      - "200"
-      vary: 
+      content-length:
+      - '466'
+      status:
+      - '200'
+      vary:
       - Accept-Encoding
-    body: "{\"id\":\"img-ymfuq\",\"resource_type\":\"image\",\"url\":\"https://api.gb1s.brightbox.com/1.0/images/img-ymfuq\",\"name\":\"Ubuntu Lucid 10.04 server\",\"created_at\":\"2011-06-01T15:43:38Z\",\"public\":true,\"disk_size\":538,\"official\":true,\"arch\":\"i686\",\"compatibility_mode\":false,\"source_type\":\"upload\",\"description\":\"login: ubuntu using stored ssh key\",\"source\":\"lucid.img\",\"status\":\"available\",\"owner\":\"acc-kg71m\",\"virtual_size\":1409,\"ancestor\":null}"
+      content-type:
+      - application/json; charset=utf-8
+    body: ! '{"id":"img-ymfuq","resource_type":"image","url":"https://api.gb1.brightbox.com/1.0/images/img-ymfuq","name":"Ubuntu
+      Lucid 10.04 server","created_at":"2011-06-01T15:43:38Z","public":true,"disk_size":538,"official":true,"arch":"i686","username":"ubuntu","compatibility_mode":false,"source_type":"upload","description":"login:
+      ubuntu using stored ssh key","source":"lucid.img","status":"available","owner":"acc-kg71m","min_ram":null,"virtual_size":1409,"ancestor":null}'
     http_version: 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: GET
     uri: https://api.gb1s.brightbox.com:443/1.0/images/img-ymfuq
     body: 
-    headers: 
-      content-type: 
+    headers:
+      authorization:
+      - OAuth f9f6a5d76a65da83199db1cbdb73482ea6327f80
+      content-type:
       - application/json
-      authorization: 
-      - OAuth e717de9faa2aaeacd8b55c38def2c53e72b42f06
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: 
-    headers: 
-      etag: 
-      - "\"6e6f8f223836a3fe402757fe35982a9d\""
-      content-type: 
-      - application/json; charset=utf-8
-      server: 
+    headers:
+      date:
+      - Thu, 23 Feb 2012 11:27:44 GMT
+      server:
       - Apache
-      date: 
-      - Fri, 14 Oct 2011 13:12:57 GMT
-      x-runtime: 
-      - "12"
-      content-length: 
-      - "432"
-      cache-control: 
+      etag:
+      - ! '"66c3c1ee5a081759ba5daa44354de1aa"'
+      x-runtime:
+      - '24'
+      cache-control:
       - private, max-age=0, must-revalidate
-      status: 
-      - "200"
-      vary: 
+      content-length:
+      - '466'
+      status:
+      - '200'
+      vary:
       - Accept-Encoding
-    body: "{\"id\":\"img-ymfuq\",\"resource_type\":\"image\",\"url\":\"https://api.gb1s.brightbox.com/1.0/images/img-ymfuq\",\"name\":\"Ubuntu Lucid 10.04 server\",\"created_at\":\"2011-06-01T15:43:38Z\",\"public\":true,\"disk_size\":538,\"official\":true,\"arch\":\"i686\",\"compatibility_mode\":false,\"source_type\":\"upload\",\"description\":\"login: ubuntu using stored ssh key\",\"source\":\"lucid.img\",\"status\":\"available\",\"owner\":\"acc-kg71m\",\"virtual_size\":1409,\"ancestor\":null}"
+      content-type:
+      - application/json; charset=utf-8
+    body: ! '{"id":"img-ymfuq","resource_type":"image","url":"https://api.gb1.brightbox.com/1.0/images/img-ymfuq","name":"Ubuntu
+      Lucid 10.04 server","created_at":"2011-06-01T15:43:38Z","public":true,"disk_size":538,"official":true,"arch":"i686","username":"ubuntu","compatibility_mode":false,"source_type":"upload","description":"login:
+      ubuntu using stored ssh key","source":"lucid.img","status":"available","owner":"acc-kg71m","min_ram":null,"virtual_size":1409,"ancestor":null}'
     http_version: 

data/spec/servers_spec.rb

@@ -19,14 +19,15 @@ describe "Server" do
   describe "Server show" do
     use_vcr_cassette('server_show')
     before do
-      @servers = Brightbox::DetailedServer.find_or_call(["srv-7yilp"])
+      @servers = Brightbox::DetailedServer.find_or_call(["srv-egjzh"])
     end
     it "should show detailed attributes of a server" do
       output = capture_stdout {
         Brightbox.render_table(@servers,{:vertical => true})
       }
-      output.should match("10.251.17.234")
+      output.should match("10.250.188.238")
       output.should match(/ram: 512/)
+      output.should match(/disk: 20480/)
     end
   end
 

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ RSpec.configure do |config|
   config.mock_framework = :mocha
   config.extend VCR::RSpec::Macros
   config.include CommonHelpers
+  config.before {
+    test_config = File.join(File.dirname(__FILE__),"brightbox")
+    Brightbox::BBConfig.any_instance.stubs(:default_config_dir).returns(test_config)
+  }
 end
 
 VCR.config do |c|

metadata

@@ -1,239 +1,174 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: brightbox-cli
-version: !ruby/object:Gem::Version 
-  hash: 89
-  prerelease: false
-  segments: 
-  - 0
-  - 17
-  - 1
-  version: 0.17.1
+version: !ruby/object:Gem::Version
+  version: 0.17.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-03 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70240587891900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hirb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587891900
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70240587889940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
-        version: 0.3.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: formatador
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587889940
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &70240587904940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587904940
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: &70240587904360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70240587904360
+- !ruby/object:Gem::Dependency
   name: mime-types
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70240587903660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587903660
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &70240587902360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
-        version: 2.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587902360
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: &70240587899840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587899840
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70240587898480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70240587898480
+- !ruby/object:Gem::Dependency
   name: ruby-hmac
+  requirement: &70240587898020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587898020
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: &70240587897180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587897180
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70240587912980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587912980
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70240587912480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587912480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70240587911860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70240587911860
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70240587911160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
+  prerelease: false
+  version_requirements: *70240587911160
 description: Scripts to interact with the Brightbox cloud API
-email: 
+email:
 - john@brightbox.co.uk
-executables: 
+executables:
 - brightbox-accounts
 - brightbox-cloudips
 - brightbox-config
@@ -247,10 +182,8 @@ executables:
 - brightbox-users
 - brightbox-zones
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -2159,14 +2092,6 @@ files:
 - lib/brightbox-cli/vendor/fog/tests/openstack/requests/compute/server_tests.rb
 - lib/brightbox-cli/vendor/fog/tests/rackspace/helper.rb
 - lib/brightbox-cli/vendor/fog/tests/rackspace/load_balancer_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/access_list_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/access_lists_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/load_balancer_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/load_balancers_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/node_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/nodes_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/virtual_ip_tests.rb
-- lib/brightbox-cli/vendor/fog/tests/rackspace/models/virtual_ips_tests.rb
 - lib/brightbox-cli/vendor/fog/tests/rackspace/requests/compute/address_tests.rb
 - lib/brightbox-cli/vendor/fog/tests/rackspace/requests/compute/flavor_tests.rb
 - lib/brightbox-cli/vendor/fog/tests/rackspace/requests/compute/helper.rb
@@ -2313,41 +2238,31 @@ files:
 - spec/spec_helper.rb
 - spec/support/common_helpers.rb
 - tools/bash_completion_script
-has_rdoc: true
 homepage: http://docs.brightbox.com/cli
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: brightbox-cli
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: The Brightbox cloud management system
-test_files: 
+test_files:
 - spec/brightbox/config.example
 - spec/cloud_ips_spec.rb
 - spec/firewall_policy_spec.rb