conoha 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940f0b5bd5020ab62e5aa2cfe9a67e1baed25f82
-  data.tar.gz: 9c943723642d672bf2c4a34bbc8d11b4ecd74f49
+  metadata.gz: f6e33b2a50a3499c822087bdae43ec3d11d72601
+  data.tar.gz: e9a3bdfe441e42fb6a2df05deace4d0cf7c13945
 SHA512:
-  metadata.gz: 3d4d73d75a0e9bb1d6c01e3342a0b4f45bb4fae55334968d8749728e45f867db5f6ceeac20092608c9648854f2cb13ea011e272cd908e3fb6fc7c0d545d7724d
-  data.tar.gz: 6c29147df0553bf4ccc9087c2f5a751b277df0a2da3e9f2c7ebe4772da2c0df92c5e31eae1f948eceea43c7b732d5461b3dc3a35d7657920cdba4c8c14dc80b7
+  metadata.gz: 1386f8ee02eb554868aa1f7710a50299adc08d27a403da26efe356bec8420118376258397ef427ef6b38524a696d516e4159885b08909aeec984fa2671bc093f
+  data.tar.gz: de462decb4c6bbda886ce1e95301f61f0db34898973877410669e5e4595675eb9ae888efeb26d45383a1508299a3c66909de3db1676714bc2e856f5f1f9e1868

data/exe/conoha

@@ -85,6 +85,28 @@ when 'browse'
   command = "xdg-open http://#{ipaddress}#{port}"
   puts command
   system command
+when 'dump'
+  exit 1 if ARGV.size != 2
+  server_id_cache = server_id(ARGV[0])
+  puts "conoha shutdown #{server_id_cache}"
+  Conoha.shutdown server_id_cache
+  name = ARGV[1]
+  loop do
+    sleep 60
+    puts "conoha imagecreate #{server_id_cache} #{name}"
+    result = Conoha.create_image server_id_cache, name
+    break if result == 'OK'
+    puts '# Error! Retry after 60 seconds...'
+  end
+  puts '# OK!'
+  loop do
+    sleep 60
+    puts "conoha delete #{server_id_cache}"
+    result = Conoha.delete server_id_cache
+    break if result == 'OK'
+    puts '# Error! Retry after 60 seconds...'
+  end
+  puts '# OK!'
 else
   STDERR.puts 'Error'
 end

data/lib/conoha.rb

@@ -168,7 +168,6 @@ EOS
   end
 
   def self.authtoken
-    # @@authtoken || (authenticate!; @@authtoken)
     @@authtoken
   end
 
@@ -219,6 +218,6 @@ EOS
   end
 
   def self.randstr
-    ['0'..'9', 'a'..'z', 'A'..'Z'].map(&:to_a).flatten.sample(60).join
+    (1..60).map{['0'..'9','a'..'z','A'..'Z'].map(&:to_a).flatten.sample}.join
   end
 end

data/lib/conoha/config.rb

@@ -0,0 +1,29 @@
+require 'json'
+
+class Conoha
+  class Config
+    attr_reader :username, :password, :tenant_id, :public_key, :authtoken
+
+    class Error < StandardError
+    end
+
+    def load_from_yaml!(yaml_str)
+      loaded = YAML.load yaml_str
+      raise Error.new unless loaded.is_a? Hash
+    end
+
+    def load_from_json!(json_str)
+      parsed = JSON.parse json_str
+      raise Error.new unless parsed.is_a? Hash
+      @username = parsed["username"]
+      @password = parsed["password"]
+      @tenant_id = parsed["tenant_id"]
+      @public_key = parsed["public_key"]
+      @authtoken = parsed["authtoken"]
+    end
+
+    def authtoken=(authtoken)
+      @authtoken = authtoken
+    end
+  end
+end

data/lib/conoha/util.rb

@@ -18,7 +18,9 @@ end
 # @return [Net::HTTPResponse]
 # @params [String] uri_string URI string
 # @params [Hash] payload HTTP request body
-# @params [String] authtoken
+# @params [String|nil] authtoken
+#   Authtoken string or `nil`.
+#   Can pass `nil` only on authenticating with username and password.
 def https_post(uri_string, payload, authtoken)
   uri = URI.parse uri_string
   https = Net::HTTP.new(uri.host, uri.port)

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.0.10"
+  ITSELF = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - conoha.gemspec
 - exe/conoha
 - lib/conoha.rb
+- lib/conoha/config.rb
 - lib/conoha/util.rb
 - lib/conoha/version.rb
 homepage: https://github.com/kaosf/conoha