conoha 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b25597425256fb33e5593b5a5de9b8f7e4c583b
-  data.tar.gz: 195996c565758806f4d3a9eeab225d45515a5094
+  metadata.gz: 5d106d33ee7ffc508d7b8ff0bafd93fed38f81d4
+  data.tar.gz: 769fcb65ce90be7b0bf87dee78fd6586f862b0d8
 SHA512:
-  metadata.gz: b332a0acb0ac8c9c45667588f2273384d7f14132ffca1d672f90aee39d7427c6c45d6e1032e2ce44b874cdf3f029b197022673310bec3611c065d4f8dc16eafd
-  data.tar.gz: c6037d5f9ed0b08e3251a84803d7703a31495a5b2394686b4bddfdc53844ad9a32bcda2603aeff2eb7e36b731165023b93be9376840f197552e3e73099ba27ce
+  metadata.gz: 980120acc774cb59ced07ee731c031c7d7034288f4fbe27c8a8cb4a384f8910964d6880278b36a1f817891b5ee1334fcd54b029a7ade87b97b6e63fc7b5fca3d
+  data.tar.gz: 35d8922b6b2a66520db2e34e7dd797c34691c351d661b8cdde774e7b16ac13e3daa0882b0c6a41c24f7b45b666e22a361893c61389646c07e1327240a7337931

data/README.md

@@ -127,7 +127,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/kaosf/
 - [x] delete image
 - [ ] public keys
 - [x] make as a gem
-- [ ] remove `curl` command from authenticate
+- [x] remove `curl` command from authenticate
 - [ ] help message
 - [ ] subcommand help messages
 

data/lib/conoha.rb

@@ -10,24 +10,12 @@ 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'
-    #payload = {
-    #  auth: {
-    #    passwordCredentials: {
-    #      username: $USERNAME,
-    #      password: $PASSWORD
-    #    },
-    #    tenant_id: $TENANT_ID
-    #  }
-    #}.to_json
-    #req.body = payload
-    #res = https.request(req)
-
-    req_json = JSON.generate({
+    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'
+    payload = {
       auth: {
         passwordCredentials: {
           username: @@username,
@@ -35,18 +23,10 @@ class Conoha
         },
         tenantId: @@tenant_id
       }
-    })
-    command = <<EOS
-curl -X POST -H "Accept: application/json" \
-  -d '#{req_json}' \
-  https://identity.tyo1.conoha.io/v2.0/tokens 2> /dev/null
-EOS
-    result = `#{command}`
-
-    #token = JSON.parse(res.body)["access"]["token"]["id"]
-    token = JSON.parse(result)["access"]["token"]["id"]
-
-    @@authtoken = token
+    }.to_json
+    req.body = payload
+    res = https.request(req)
+    @@authtoken = JSON.parse(res.body)["access"]["token"]["id"]
     save_config!
   end
 

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.0.7"
+  ITSELF = "0.0.8"
 end

metadata

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