conoha 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db68d93da75070b139bc50e3bad0c5cdbc797858
-  data.tar.gz: 6434e3250a3905c0294b611af874748d923d0cd4
+SHA256:
+  metadata.gz: 839eeeeaa6d817fca7e8522f7aef1c2ef93fc759cf2bf195d059720e655e9548
+  data.tar.gz: e717b7aec46f17a71d2a1edc76e3eaf01307930233ccefb9389402560cb3ee09
 SHA512:
-  metadata.gz: ecf861e9f3799087c8f1a6b8a89a2356cf7d4e8ebcedbc4e022895c74d544b1208da9f762fa7b8ecec496f49363109dcb7bbf1b46a4bbb88a74b41c8cf8b2a52
-  data.tar.gz: 927d7413a91e54020585667fe316f00e8a33e80ebb06cd7b35b69902a288d6ecc24497ee011f9edc6ba089e8f35ed866f6e1a0824fa1d0755837bf91541ee5ad
+  metadata.gz: a167e3593d07fc4b5fb3a0da035ff6722a9e828ec544d725b39de1eb9f5c741667c2f14151b17239ce76a41305797711c1cfc527011beaafcb8845f6e208e065
+  data.tar.gz: a2c2430cc7c1000cc776cdb1d8e58406a7c1d53307b4f02db4a48086c63797a9bef5bcff41d017f8c57bb76e1a5e616eff7bc021484fa4bb930e64397e3d32aa

data/README.md

@@ -109,6 +109,20 @@ conoha createfromimage fedcba98-7654-3210-fedc-ba9876543210 g-1gb
 conoha createfromimage ubuntu-backup g-1gb
 # You can remove the last argument (default value is "g-1gb")
 conoha createfromimage fedcba98-7654-3210-fedc-ba9876543210
+# You can specify the user_data.
+# More information:
+#   https://www.conoha.jp/guide/startupscript.php
+#   https://www.conoha.jp/docs/compute-create_vm.html
+# "g-1gb" (or any other RAM specification) is required now, because
+# "--user-data" and "BASE64_STRING" are detected by their argument position
+# (4th and 5th), sorry for my poor implementation...
+conoha createfromimage fedcba98-7654-3210-fedc-ba9876543210 g-1gb --user-data BASE64_STRING
+# You can get BASE64_STRING from like a following command e.g.
+cat <<EOF | base64 -w
+#!/bin/bash
+
+apt-get -y install nginx
+EOF
 
 # SSH
 conoha ssh 01234567-89ab-cdef-0123-456789abcdef root     # ssh root@ipaddress

data/exe/conoha

@@ -109,7 +109,8 @@ when 'createfromimage', 'restore'
   exit 1 if ARGV.size < 1
   image_ref = image_ref_or_name ARGV[0]
   ram = ARGV[1] || 'g-1gb'
-  puts Conoha.create_from_image image_ref, ram
+  user_data = (ARGV[2] == '--user-data' ? ARGV[3] : nil)
+  puts Conoha.create_from_image image_ref, ram, user_data: user_data
 when 'ssh'
   exit 1 if ARGV.size < 1 || 2 < ARGV.size
   ipaddress = ipv4(Conoha.ip_address_of(server_id(ARGV.first)))

data/lib/conoha.rb

@@ -76,13 +76,14 @@ class Conoha
   # @param [String] os
   # @param [String] ram
   # @param [String] name_tag (default: nil)
+  # @option [String] user_data
   # @raise [StandardError]
   #   when "os" doesn't exist in image_tag_dictionary
   #   when "image_tag" doesn't exist in images
-  def self.create(os, ram, name_tag = nil)
+  def self.create(os, ram, name_tag = nil, user_data: nil)
     image_ref = image_ref_from_image_tag(image_tag_dictionary(os))
     uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
-    payload = payload_for_create_vps image_ref, ram, public_key
+    payload = payload_for_create_vps image_ref, ram, public_key, user_data: user_data
     if name_tag
       payload[:server].merge!({metadata: {instance_name_tag: name_tag}})
     end
@@ -163,9 +164,9 @@ class Conoha
     res.code == '204' ? 'OK' : 'Error'
   end
 
-  def self.create_from_image(image_ref, ram)
+  def self.create_from_image(image_ref, ram, user_data: nil)
     uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
-    payload = payload_for_create_vps image_ref, ram, public_key
+    payload = payload_for_create_vps image_ref, ram, public_key, user_data: user_data
     res = https_post uri, payload, authtoken
     JSON.parse(res.body)["server"]["id"]
   end
@@ -307,15 +308,19 @@ EOS
   # @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'}],
+  # @option [String] user_data
+  def self.payload_for_create_vps image_ref, ram, public_key, user_data: nil
+    ret =
+      {
+        server: {
+          adminPass: randstr,
+          imageRef: image_ref,
+          flavorRef: flavor_ref(ram),
+          key_name: public_key,
+          security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
+        }
       }
-    }
+    ret[:server].merge!({ user_data: user_data }) if user_data
+    ret
   end
 end

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.10.0"
+  ITSELF = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ConoHa VPS CLI Tool