conoha 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41ee42c0f0098bf3b05802d35a6707d717d45a1
-  data.tar.gz: e68e7f4b8ce9b6cd90f01702a3d3d1c3eec12ac6
+  metadata.gz: 2bba341ad5843b6533ad8eb71b9c422b24ab79f3
+  data.tar.gz: 343c61e0b27f778a2a338078562cf15ea579ba8d
 SHA512:
-  metadata.gz: d8280fe6a8af21f48ea8056e6fcd4ec8815d599a98ee9fa85f457cecce55259fae779e082cd92bda6dabde1e9581615eef6e622b010cbb3ae191909c6aba0f15
-  data.tar.gz: 77049d6f8806c7ebc8147bcb48dbada534119d18fd7056cdb43b13117c48cd6a0f4e67cd4a4b98de4381df421cca40ad165cd5a9461db794b0bcefb8e8fa93d1
+  metadata.gz: 19a0f02a6debe27af3537a56b03dd2efe5ae6259f7e8e5c4cbf4346e447382fd45c133d038f0a5538200717848679821aea5f11cdf3e1a5a2ed95bfd9ef843ad
+  data.tar.gz: 2d2873c4271e5c3633e65153909b3b50c82a046711a07618f2ccc552cf2e0ad6395e58be85671cf9b8da70f841b6e8f2a4d48e83c83a8c1259d34252c5fb8055

data/exe/conoha

@@ -42,7 +42,12 @@ when 'ipaddress'
   exit 1 if ARGV.size != 1
   pp Conoha.ip_address_of server_id(ARGV.first)
 when 'create'
-  pp Conoha.create *ARGV
+  begin
+    pp Conoha.create *ARGV
+  rescue => e
+    STDERR.puts e.to_s
+    exit 1
+  end
 when 'delete'
   exit 1 if ARGV.size != 1
   puts Conoha.delete server_id(ARGV.first)

data/exe/conoharant

@@ -30,6 +30,7 @@ def dump_conoharant_status(status)
 end
 
 require 'conoha'
+require 'conoha/version'
 Conoha.init!
 begin
   Conoha.vps_list
@@ -48,6 +49,27 @@ puts "Authentication OK."
 
 arg = ARGV.first
 case arg
+when 'version', '--version', '-v'
+  puts ConohaVersion::ITSELF
+when 'up'
+  begin
+    server_id = Conoha.create config['os'], config['ram']
+  rescue => e
+    STDERR.puts e.to_s
+    exit 1
+  end
+  puts server_id
+  loop do
+    sleep 10
+    result = Conoha.status_of server_id
+    break if result == "ACTIVE"
+    puts "# Current status is \"#{result}\", not \"ACTIVE\"."
+    puts "# Re-check after 10 seconds..."
+  end
+  puts "# OK!"
+  status['status'] = 'running'
+  status['id'] = server_id
+  dump_conoharant_status status
 when 'ssh', 'mosh'
   connection = arg # 'ssh' or 'mosh'
   if status['status'] != 'running'

data/lib/conoha.rb

@@ -181,26 +181,6 @@ EOS
     @@public_key
   end
 
-  def self.image_ref_from_os(os)
-    dictionary = {
-      'ubuntu'   => '4952b4e5-67bb-4f84-991f-9f3f1647d63d', # Ubuntu 14.04 amd64
-      'centos66' => '14961158-a69c-4af1-b375-b9a72982837d', # CentOS 6.6
-      'centos67' => '91944101-df61-4c41-b7c5-76cebfc48318', # CentOS 6.7
-      'centos71' => 'edc9457e-e4a8-4974-8217-c254d215b460', # CentOS 7.1
-      'arch'     => 'fe22a9e4-8ba1-4ea3-90ce-d59d5e5b35b9', # Arch
-    }
-    if dictionary.keys.include? os
-      dictionary[os]
-    else
-STDERR.print <<EOS
-select os name from the following list:
-
-#{dictionary.keys.map { |e| "  #{e}" }.join("\n")}
-EOS
-      exit 1
-    end
-  end
-
   def self.flavor_ref(ram)
     dictionary = {
       'g-1gb'  => '7eea7469-0d85-4f82-8050-6ae742394681',

data/lib/conoha/util.rb

@@ -60,3 +60,25 @@ end
 def ipv4(ip_address)
   ip_address.select { |e| e =~ /\d+\.\d+\.\d+\.\d+/ }.first
 end
+
+# @return [String] UUID of image
+# @params [String] os OS name
+# @raise [StandardError] When the OS name isn't be contained.
+def image_ref_from_os(os)
+  dictionary = {
+    'ubuntu'   => '4952b4e5-67bb-4f84-991f-9f3f1647d63d', # Ubuntu 14.04 amd64
+    'centos66' => '14961158-a69c-4af1-b375-b9a72982837d', # CentOS 6.6
+    'centos67' => '91944101-df61-4c41-b7c5-76cebfc48318', # CentOS 6.7
+    'centos71' => 'edc9457e-e4a8-4974-8217-c254d215b460', # CentOS 7.1
+    'arch'     => 'fe22a9e4-8ba1-4ea3-90ce-d59d5e5b35b9', # Arch
+  }
+  if dictionary.keys.include? os
+    dictionary[os]
+  else
+    raise StandardError.new <<EOS
+Select os name from the following list:
+
+#{dictionary.keys.join("\n")}
+EOS
+  end
+end

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.2.2"
+  ITSELF = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler