conoha 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95877d4435f34c4d78ca9d4382dd8ec52c49feb6
-  data.tar.gz: 840162fa998780e54041dd10e59772c8afa604e3
+  metadata.gz: 940f0b5bd5020ab62e5aa2cfe9a67e1baed25f82
+  data.tar.gz: 9c943723642d672bf2c4a34bbc8d11b4ecd74f49
 SHA512:
-  metadata.gz: 0482293873d148b329bd621d6c1482b5abf88ca9bbed26519f50503fda27cac46b6e5dfb7076e00774d69171cec09099b8a947e13244bd42e67587df19b78b43
-  data.tar.gz: 66f015bc630b17d1becaea701b62798a452ec4b7e8995bdb18ddb7ec38fb3cb57db37bff68ef4cae20a4a9b33902ae70c9617200e94c55955813cad5f51f6287
+  metadata.gz: 3d4d73d75a0e9bb1d6c01e3342a0b4f45bb4fae55334968d8749728e45f867db5f6ceeac20092608c9648854f2cb13ea011e272cd908e3fb6fc7c0d545d7724d
+  data.tar.gz: 6c29147df0553bf4ccc9087c2f5a751b277df0a2da3e9f2c7ebe4772da2c0df92c5e31eae1f948eceea43c7b732d5461b3dc3a35d7657920cdba4c8c14dc80b7

data/lib/conoha.rb

@@ -1,7 +1,5 @@
-require "conoha/version"
-
-require 'net/https'
-require 'uri'
+require 'conoha/version'
+require 'conoha/util'
 require 'json'
 
 class Conoha
@@ -10,35 +8,24 @@ class Conoha
   end
 
   def self.authenticate!
-    uri = URI.parse 'https://identity.tyo1.conoha.io/v2.0/tokens'
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
+    uri = 'https://identity.tyo1.conoha.io/v2.0/tokens'
     payload = {
-      auth: {
-        passwordCredentials: {
-          username: @@username,
-          password: @@password
-        },
-        tenantId: @@tenant_id
+        auth: {
+          passwordCredentials: {
+            username: @@username,
+            password: @@password
+          },
+          tenantId: @@tenant_id
+        }
       }
-    }.to_json
-    req.body = payload
-    res = https.request(req)
+    res = https_post uri, payload, nil
     @@authtoken = JSON.parse(res.body)["access"]["token"]["id"]
     save_config!
   end
 
   def self.servers
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Get.new(uri.path)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
+    res = https_get uri, authtoken
     JSON.parse(res.body)["servers"]
   end
 
@@ -47,13 +34,7 @@ class Conoha
   end
 
   def self.create(os, ram)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
     payload = {
       server: {
         adminPass: randstr,
@@ -65,107 +46,55 @@ class Conoha
           {name: 'gncs-ipv4-all'}
         ]
       }
-    }.to_json
-    req.body = payload
-    res = https.request(req)
+    }
+    res = https_post uri, payload, authtoken
     JSON.parse(res.body)["server"]["id"]
   end
 
   def self.delete(server_id)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Delete.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    res = https_delete uri, authtoken
     res.code == '204' ? 'OK' : 'Error'
   end
 
   def self.ip_address_of(server_id)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Get.new(uri.path)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    res = https_get uri, authtoken
     JSON.parse(res.body)["server"]["addresses"].values[0].map{ |e| e["addr"] }
   end
 
   def self.boot(server_id)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    req.body = {"os-start": nil}.to_json
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    res = https_post uri, {"os-start": nil}, authtoken
     res.code == '202' ? 'OK' : 'Error'
   end
 
   def self.shutdown(server_id)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    req.body = {"os-stop": nil}.to_json
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    res = https_post uri, {"os-stop": nil}, authtoken
     res.code == '202' ? 'OK' : 'Error'
   end
 
   def self.images
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/images"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Get.new(uri.path)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/images"
+    res = https_get uri, authtoken
     JSON.parse(res.body)["images"].map { |e| [e["name"], e["id"]] }
   end
 
   def self.create_image(server_id, name)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    req.body = {"createImage": {"name": name}}.to_json
-    res = https.request(req)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    res = https_post uri, {"createImage": {"name": name}}, authtoken
     res.code == '202' ? 'OK' : 'Error'
   end
 
   def self.delete_image(image_ref)
-    uri = URI.parse "https://image-service.tyo1.conoha.io/v2/images/#{image_ref}"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Delete.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
-    res = https.request(req)
+    uri = "https://image-service.tyo1.conoha.io/v2/images/#{image_ref}"
+    res = https_delete uri, authtoken
     res.code == '204' ? 'OK' : 'Error'
   end
 
   def self.create_from_image(image_ref, ram)
-    uri = URI.parse "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(uri.request_uri)
-    req['Content-Type'] = 'application/json'
-    req['Accept'] = 'application/json'
-    req['X-Auth-Token'] = authtoken
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
     payload = {
       server: {
         adminPass: randstr,
@@ -177,9 +106,8 @@ class Conoha
           {name: 'gncs-ipv4-all'}
         ]
       }
-    }.to_json
-    req.body = payload
-    res = https.request(req)
+    }
+    res = https_post uri, payload, authtoken
     JSON.parse(res.body)["server"]["id"]
   end
 

data/lib/conoha/util.rb

@@ -1,3 +1,50 @@
+require 'net/https'
+require 'uri'
+
+# @return [Net::HTTPResponse]
+# @params [String] uri_string URI string
+# @params [String] authtoken
+def https_get(uri_string, authtoken)
+  uri = URI.parse uri_string
+  https = Net::HTTP.new(uri.host, uri.port)
+  https.use_ssl = true
+  req = Net::HTTP::Get.new(uri.path)
+  req['Content-Type'] = 'application/json'
+  req['Accept'] = 'application/json'
+  req['X-Auth-Token'] = authtoken
+  https.request(req)
+end
+
+# @return [Net::HTTPResponse]
+# @params [String] uri_string URI string
+# @params [Hash] payload HTTP request body
+# @params [String] authtoken
+def https_post(uri_string, payload, authtoken)
+  uri = URI.parse uri_string
+  https = Net::HTTP.new(uri.host, uri.port)
+  https.use_ssl = true
+  req = Net::HTTP::Post.new(uri.request_uri)
+  req['Content-Type'] = 'application/json'
+  req['Accept'] = 'application/json'
+  req['X-Auth-Token'] = authtoken
+  req.body = payload.to_json
+  https.request(req)
+end
+
+# @return [Net::HTTPResponse]
+# @params [String] uri_string URI string
+# @params [String] authtoken
+def https_delete(uri_string, authtoken)
+  uri = URI.parse uri_string
+  https = Net::HTTP.new(uri.host, uri.port)
+  https.use_ssl = true
+  req = Net::HTTP::Delete.new(uri.request_uri)
+  req['Content-Type'] = 'application/json'
+  req['Accept'] = 'application/json'
+  req['X-Auth-Token'] = authtoken
+  https.request(req)
+end
+
 # @params [Array<String>]
 #   The return value of `ip_address_of` method. It is either
 #

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.0.9"
+  ITSELF = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler