conoha 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86401af3bb5aaeb5e9b71e3ae19eb3a6a33d4344
-  data.tar.gz: 2756ef14e55555aef3a094562c694f4758a5c832
+  metadata.gz: 3ab3ff94a231bbb1a106e9be65d7b409742c7032
+  data.tar.gz: c24d9fddfbc25952b0032dc2d747edd51a6fc1eb
 SHA512:
-  metadata.gz: a3d53106aa8dcf543e98ab26769ed7a9d6d18a1739d843b3abdf72c87964d20d5c6cb360590faee601b5613df284b517dee12536b1349a3fea229a522eba38fd
-  data.tar.gz: eeebdee5db059fb9e77e0cc52450a138ad52cddd2377c17ca1148001ec3a1dda32cddedc3a55a0bbab288b3048f8102ac114adffcc04fc36b542cf6fe0d6fe8b
+  metadata.gz: 5d1d48a1c8ebdb485454b41eb9fd54b0e21adc3fa6c67dbf219def62ce836311f56d07b0e0e8339408e5b2d89adcd9b870a2fd4e7ace1afd21f5963a42a7e258
+  data.tar.gz: f7638572a90b3fe49882fd97b3148cddf37e80ef5543e1aec23baa0346dbc30b9832c51db6abe79704bad769bbb8eda7c5768722cbd3d41c843f9f092a9b62b5

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.7
   - 2.2.3
   - 2.3.0
+  - 2.3.1
 before_install: gem install bundler -v 1.11.2

data/Guardfile

@@ -1,15 +1,7 @@
 # vim: ft=ruby
 
-# @param [String] m1 e.g. 'foo/bar/a' when the matched string is 'lib/foo/bar/a.rb'
-# @return [String] e.g. 'test/foo/bar/test_a.rb' when m1 is 'foo/bar/a'
-def lib2test(m1)
-  "test/#{File.dirname m1}/test_#{File.basename m1}.rb"
-end
-
 guard :minitest do
-  watch('test/test_helper.rb') { 'test' }
-  watch('test/test_conoha.rb')
-  watch('lib/conoha.rb') { 'test/test_conoha.rb' }
-  watch(%r{^test/.+\/test_.+\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| lib2test m[1] }
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
 end

data/LICENSE.txt

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

data/README.md

@@ -73,6 +73,9 @@ conoha shutdown 01234567-89ab-cdef-0123-456789abcdef
 # Boot VPS
 conoha boot 01234567-89ab-cdef-0123-456789abcdef
 
+# Rebuild (Re-install the OS)
+conoha rebuild 01234567-89ab-cdef-0123-456789abcdef ubuntu
+
 # Delte VPS
 conoha delete 01234567-89ab-cdef-0123-456789abcdef
 
@@ -170,6 +173,4 @@ conoharant destroy
 
 ## License
 
-[MIT](http://opensource.org/licenses/MIT)
-
-Copyright (C) 2015-2016 ka
+[MIT](LICENSE.txt)

data/exe/conoha

@@ -57,6 +57,9 @@ when 'create'
     STDERR.puts e.to_s
     exit 1
   end
+when 'rebuild'
+  exit 1 if ARGV.size != 2
+  puts Conoha.rebuild *ARGV
 when 'delete'
   exit 1 if ARGV.size != 1
   puts Conoha.delete server_id(ARGV.first)

data/lib/conoha.rb

@@ -44,16 +44,26 @@ class Conoha
         imageRef: image_ref_from_os(os),
         flavorRef: flavor_ref(ram),
         key_name: public_key,
-        security_groups: [
-          {name: 'default'},
-          {name: 'gncs-ipv4-all'}
-        ]
+        security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
       }
     }
     res = https_post uri, payload, authtoken
     JSON.parse(res.body)["server"]["id"]
   end
 
+  def self.rebuild(server_id, os)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    payload = {
+      rebuild: {
+        imageRef: image_ref_from_os(os),
+        adminPass: randstr,
+        key_name: public_key
+      }
+    }
+    res = https_post uri, payload, authtoken
+    res.code == '202' ? 'OK' : 'Error'
+  end
+
   def self.delete(server_id)
     uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
     res = https_delete uri, authtoken
@@ -113,10 +123,7 @@ class Conoha
         imageRef: image_ref,
         flavorRef: flavor_ref(ram),
         key_name: public_key,
-        security_groups: [
-          {name: 'default'},
-          {name: 'gncs-ipv4-all'}
-        ]
+        security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
       }
     }
     res = https_post uri, payload, authtoken

data/lib/conoha/util.rb

@@ -63,7 +63,7 @@ end
 
 # @return [String] UUID of image
 # @params [String] os OS name
-# @raise [StandardError] When the OS name isn't be contained.
+# @raise [StandardError] When the OS name isn't contained.
 def image_ref_from_os(os)
   dictionary = {
     'ubuntu'   => '793be3e1-3c33-4ab3-9779-f4098ea90eb5', # Ubuntu 14.04 amd64
@@ -73,6 +73,36 @@ def image_ref_from_os(os)
     'centos72' => 'e141fc06-632e-42a9-9c2d-eec9201427ec', # CentOS 7.2
     'arch'     => 'f5e5b475-ebec-4973-99c7-bc8add5d16c4', # Arch
   }
+  if dictionary.keys.include? os
+    dictionary[os]
+  else
+    raise StandardError.new <<EOS
+"#{os}" doesn't exist.
+Select os name from the following list:
+
+#{dictionary.keys.join("\n")}
+EOS
+  end
+end
+
+# @return [String] Image name tag
+# @params [String] os OS name
+# @raise [StandardError] When the OS name isn't included in the dictionary.
+def image_tag_dictionary(os)
+  dictionary = {
+    'ubuntu'   => 'vmi-ubuntu-14.04-amd64', # Ubuntu 14.04 amd64
+    'debian'   => 'vmi-debian-8-amd64', # Debian 8 amd64
+    'fedora23' => 'vmi-fedora-23-amd64', # Fedora 23 amd64
+    'centos67' => 'vmi-centos-6.7-amd64', # CentOS 6.7
+    'centos72' => 'vmi-centos-7.2-amd64', # CentOS 7.2
+    'arch'     => 'vmi-arch-amd64', # Arch
+  }
+
+  # 'opensuse' => 'vmi-opensuse-42.1-amd64' # openSUSE
+  # 'openbsd'  => 'vmi-openbsd-5.8-amd64', # OpenBSD
+  # 'netbsd'   => 'vmi-netbsd-7.0-amd64', # NetBSD
+  # 'freebsd'  => 'vmi-freebsd-10.1-x86_64', # FreeBSD
+
   if dictionary.keys.include? os
     dictionary[os]
   else

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.7.1"
+  ITSELF = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,4 +144,3 @@ signing_key:
 specification_version: 4
 summary: ConoHa VPS CLI Tool
 test_files: []
-has_rdoc: