conoha 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e74e785f4bb9c620e31f0eaa64dc2ce4aed8755
-  data.tar.gz: d72ed86c473189df9841b9570e462d04ab9fd9fd
+  metadata.gz: f41ee42c0f0098bf3b05802d35a6707d717d45a1
+  data.tar.gz: e68e7f4b8ce9b6cd90f01702a3d3d1c3eec12ac6
 SHA512:
-  metadata.gz: 41567c6082d53fdc1e8f13313acdc409462043bed0b7e04c9237481a622b8f414f87dc9213c973cd86ae85296b8c870525763847c620456863839096cb033cdd
-  data.tar.gz: 41582098947f4f5a39c9b80e9d36eb2fbb574fb8cf07c49bef020d532a32fa31714ee886d20898df57ac40f99bb5691870d7847b4c0a401f54b2bcc19700b30a
+  metadata.gz: d8280fe6a8af21f48ea8056e6fcd4ec8815d599a98ee9fa85f457cecce55259fae779e082cd92bda6dabde1e9581615eef6e622b010cbb3ae191909c6aba0f15
+  data.tar.gz: 77049d6f8806c7ebc8147bcb48dbada534119d18fd7056cdb43b13117c48cd6a0f4e67cd4a4b98de4381df421cca40ad165cd5a9461db794b0bcefb8e8fa93d1

data/README.md

@@ -143,6 +143,7 @@ tagprefix: tagnameprefixasyoulike
 conoharant ssh
 conoharant ssh root
 conoharant mosh
+conoharant sftp
 conoharant dump
 conoharant restore
 conoharant clean

data/exe/conoharant

@@ -108,6 +108,14 @@ when 'restore'
   ram = config['ram']
   puts "conoha restore #{image_id} #{ram}"
   server_id = Conoha.create_from_image image_id, ram
+  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
@@ -131,6 +139,12 @@ when 'browse'
   command = "xdg-open http://#{ipaddress}#{port}"
   puts command
   system command
+when 'sftp'
+  server_id = status['id']
+  ipaddress = ipv4(Conoha.ip_address_of(server_id))
+  command = "sftp #{ipaddress}"
+  puts command
+  system command
 else
   STDERR.puts 'Invalid argument.'
   exit 1

data/lib/conoha.rb

@@ -63,6 +63,12 @@ class Conoha
     JSON.parse(res.body)["server"]["addresses"].values[0].map{ |e| e["addr"] }
   end
 
+  def self.status_of(server_id)
+    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    res = https_get uri, authtoken
+    JSON.parse(res.body)["server"]["status"]
+  end
+
   def self.boot(server_id)
     uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
     res = https_post uri, {"os-start": nil}, authtoken

data/lib/conoha/version.rb

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

metadata

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