conoha 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a8df63a110b42396a551befb8348eac2d3e3e3
-  data.tar.gz: fbbf1c900781ac7d25da9f12f0fcecd3c77f61b0
+  metadata.gz: bb6f56840fc4fb7f5c8bb07246ece0d140535a1c
+  data.tar.gz: d8f1388a6e1123a4832f5a12197c36963b712be5
 SHA512:
-  metadata.gz: 50e4d0516082bd978370a6876c348dd672498ced9e66ac5d828fddabad320121753546b8777c74a2cd2e08f824a273c474579e2e58ff17ed79892568df41cefc
-  data.tar.gz: 408c1eafa34e81b63ade6f71596763a6798e59917f3ed01c64ee053255f333d01a09157abf423a70ef54da8e0f62a80df6e0df49c11bac837128a11cc18cd0a9
+  metadata.gz: 2c8153d4f39099c5fdf778991e976712e9b06c7d1f5f02d6d3d409703f3ba2e84a1cf96ae18e21fb545ea028a5641e34cdf67645003ad33de00ca7367241d9c6
+  data.tar.gz: adee960756406fe4ed14585b32b33cfb55b56e59f4a85f385f72125760e2afd688fb216f4dcc99ad99e7b5efa50f9725e4436bc92ff2e6743434a4a2e9987d77

data/.travis.yml

@@ -1,8 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.3.1
-  - 2.3.2
   - 2.3.3
   - 2.4.0
-before_install: gem install bundler -v 1.13.6
+before_install: gem install bundler -v 1.13.7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016 ka
+Copyright (c) 2015-2017 ka
 
 MIT License
 

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/conoha.svg)](http://badge.fury.io/rb/conoha)
 [![Dependency Status](https://gemnasium.com/kaosf/conoha.svg)](https://gemnasium.com/kaosf/conoha)
 [![Build Status](https://travis-ci.org/kaosf/conoha.svg)](https://travis-ci.org/kaosf/conoha)
+[![Coverage Status](https://coveralls.io/repos/github/kaosf/conoha/badge.svg?branch=master)](https://coveralls.io/github/kaosf/conoha?branch=master)
 [![Code Climate](https://codeclimate.com/github/kaosf/conoha/badges/gpa.svg)](https://codeclimate.com/github/kaosf/conoha)
 
 CLI tool for management ConoHa VPS.
@@ -134,12 +135,6 @@ conoha nametag 01234567-89ab-cdef-0123-456789abcdef
 
 ## Test
 
-```sh
-ruby test/run_test.rb
-```
-
-or
-
 ```sh
 rake
 ```

data/conoha.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.3"
-  spec.add_development_dependency "test-unit", "~> 3.1"
-  spec.add_development_dependency "test-unit-notify", "~> 1.0"
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "test-unit", "~> 3.2"
+  spec.add_development_dependency "test-unit-rr", "~> 1.0"
+  spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "guard", "~> 2.13"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
 end

data/lib/conoha.rb

@@ -2,6 +2,7 @@ require 'conoha/version'
 require 'conoha/util'
 require 'json'
 
+# :nocov:
 class Conoha
   def self.init!
     load_config!
@@ -13,15 +14,7 @@ class Conoha
 
   def self.authenticate!
     uri = "https://identity.#{region}.conoha.io/v2.0/tokens"
-    payload = {
-        auth: {
-          passwordCredentials: {
-            username: @@username,
-            password: @@password
-          },
-          tenantId: @@tenant_id
-        }
-      }
+    payload = payload_for_authentication @@username, @@password, @@tenant_id
     res = https_post uri, payload, nil
     if res.code == '401'
       raise StandardError.new 'Authentication failure'
@@ -38,25 +31,14 @@ class Conoha
       raise StandardError.new "User \"#{user_id}\" doesn't exist."
     end
 
-    payload = {
-        auth: {
-          passwordCredentials: {
-            username: credential['username'],
-            password: credential['password']
-          },
-          tenantId: credential['tenant_id']
-        }
-      }
+    payload = payload_for_authentication credential['username'], credential['password'], credential['tenant_id']
     res = https_post uri, payload, nil
     if res.code == '401'
       raise StandardError.new 'Authentication failure'
     end
 
-    @@username = credential['username']
-    @@password = credential['password']
-    @@tenant_id = credential['tenant_id']
-    @@public_key = credential['public_key']
-    @@authtoken = JSON.parse(res.body)["access"]["token"]["id"]
+    auth_token = JSON.parse(res.body)["access"]["token"]["id"]
+    set_class_variables_from_credential! credential, auth_token
     save_config!
   end
 
@@ -100,15 +82,7 @@ class Conoha
   def self.create(os, ram, name_tag = nil)
     image_ref = image_ref_from_image_tag(image_tag_dictionary(os))
     uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
-    payload = {
-      server: {
-        adminPass: randstr,
-        imageRef: image_ref,
-        flavorRef: flavor_ref(ram),
-        key_name: public_key,
-        security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
-      }
-    }
+    payload = payload_for_create_vps image_ref, ram, public_key
     if name_tag
       payload[:server].merge!({metadata: {instance_name_tag: name_tag}})
     end
@@ -191,15 +165,7 @@ class Conoha
 
   def self.create_from_image(image_ref, ram)
     uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
-    payload = {
-      server: {
-        adminPass: randstr,
-        imageRef: image_ref,
-        flavorRef: flavor_ref(ram),
-        key_name: public_key,
-        security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
-      }
-    }
+    payload = payload_for_create_vps image_ref, ram, public_key
     res = https_post uri, payload, authtoken
     JSON.parse(res.body)["server"]["id"]
   end
@@ -253,6 +219,14 @@ EOS
     end
   end
 
+  def self.set_class_variables_from_credential! credential, auth_token
+    @@username = credential['username']
+    @@password = credential['password']
+    @@tenant_id = credential['tenant_id']
+    @@public_key = credential['public_key']
+    @@authtoken = authtoken
+  end
+
   def self.save_config!
     s = JSON.generate({
       username: @@username,
@@ -287,7 +261,7 @@ EOS
     if image = images.find { |e| e[0] == image_tag }
       image[1]
     else
-      raise StandardError.new "Tag \"#{tag}\" doesn't exist in image list."
+      raise StandardError.new "Tag \"#{image_tag}\" doesn't exist in image list."
     end
   end
 
@@ -317,4 +291,31 @@ EOS
   def self.randstr
     (1..60).map{['0'..'9','a'..'z','A'..'Z'].map(&:to_a).flatten.sample}.join
   end
+
+  def self.payload_for_authentication username, password, tenant_id
+    {
+      auth: {
+        passwordCredentials: {
+          username: username,
+          password: password
+        },
+        tenantId: tenant_id
+      }
+    }
+  end
+
+  # @param [String] image_ref
+  # @param [String] ram
+  # @param [String] public_key
+  def self.payload_for_create_vps image_ref, ram, public_key
+    {
+      server: {
+        adminPass: randstr,
+        imageRef: image_ref,
+        flavorRef: flavor_ref(ram),
+        key_name: public_key,
+        security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
+      }
+    }
+  end
 end

data/lib/conoha/config.rb

@@ -2,9 +2,28 @@ require 'json'
 
 class Conoha
   class Config
-    attr_reader :username, :password, :tenant_id, :public_key, :authtoken
+    attr_reader :username, :password, :tenant_id, :public_key, :authtoken, :accounts
 
-    class Error < StandardError
+    class Error < StandardError; end
+
+    class Account
+      attr_reader :username, :password, :tenant_id, :public_key
+
+      def initialize(h)
+        @username   = h['username']
+        @password   = h['password']
+        @tenant_id  = h['tenant_id']
+        @public_key = h['public_key']
+      end
+
+      def to_hash
+        {
+          'username'   => @username,
+          'password'   => @password,
+          'tenant_id'  => @tenant_id,
+          'public_key' => @public_key,
+        }
+      end
     end
 
     def load_from_yaml!(yaml_str)
@@ -20,6 +39,7 @@ class Conoha
       @tenant_id = parsed["tenant_id"]
       @public_key = parsed["public_key"]
       @authtoken = parsed["authtoken"]
+      @accounts = parsed["accounts"]&.map { |e| Account.new e }
     end
 
     def authtoken=(authtoken)

data/lib/conoha/util.rb

@@ -78,7 +78,7 @@ def image_tag_dictionary(os)
     'openbsd'  => 'vmi-openbsd-6.0-amd64', # OpenBSD
     'netbsd'   => 'vmi-netbsd-7.0-amd64', # NetBSD
     'freebsd'  => 'vmi-freebsd-10.3-x86_64', # FreeBSD
-    'docker'   => 'vmi-docker-1.12-ubuntu-16.04', # Docker on Ubuntu 16.04
+    'docker'   => 'vmi-docker-17.03-ubuntu-16.04-unified', # Docker on Ubuntu 16.04
 
     # 20GB storage for 512MB RAM
     'ubuntu-20gb'   => 'vmi-ubuntu-16.04-amd64-20gb',
@@ -93,7 +93,7 @@ def image_tag_dictionary(os)
     'openbsd-20gb'  => 'vmi-openbsd-6.0-amd64-20gb',
     'netbsd-20gb'   => 'vmi-netbsd-7.0-amd64-20gb',
     'freebsd-20gb'  => 'vmi-freebsd-10.3-amd64-20gb',
-    'docker-20gb'   => 'vmi-docker-1.12-ubuntu-16.04-20gb',
+    'docker-20gb'   => 'vmi-docker-17.03-ubuntu-16.04-unified-20gb',
   }
 
   if dictionary.keys.include? os

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.9.7"
+  ITSELF = "0.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,44 +16,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ConoHa VPS CLI Tool