conoha 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3bff62b16038c252d30ce45c736c1061c1719d
-  data.tar.gz: 727b5598db464f6df0087808eeaf68b19fe0914b
+  metadata.gz: 31ec5261016745ae27ce4804e4935aa00c00e299
+  data.tar.gz: d255da18a9a141611113e9e83753e15682da58a6
 SHA512:
-  metadata.gz: 4f5a6784681c0674acea5195059ef3fa4efee3baca61df7919c145f701b19d2e63b4efea9fd702521cbcc0fa09352ffaca7c8cefc98749dc3f0f48f5924a273e
-  data.tar.gz: 639d502c22ee9d090f66a0dfb68f252752ec06cd3dedcf9c12ec2c3491d089ae2daa8e58739ec43b317273b434e0a9c6043c96401a6635f569f4a4dcee2d10d3
+  metadata.gz: fb9540ec00d4c6e0936949c6e228b3876255aff6539a9512d2e0451f7aeb7beaf41f3d8956e5501477441f93408c662f88c081f35edcf1948bd812127b16b5dc
+  data.tar.gz: 9a3e44b50304c391b69eae9d99ed3f33d7e997ab818888dab00844c04cb1816514013f5ea8472dd9503c30d0d87c501109c2a7c37cbc812c0d5a2147f2dbd9e0

data/README.md

@@ -84,6 +84,18 @@ conoha imagedelete fedcba98-7654-3210-fedc-ba9876543210
 
 # Create a VPS from a saved image
 conoha createfromimage fedcba98-7654-3210-fedc-ba9876543210 g-1gb
+
+# SSH
+conoha ssh 01234567-89ab-cdef-0123-456789abcdef root     # ssh root@ipaddress
+conoha ssh 01234567-89ab-cdef-0123-456789abcdef yourname # ssh yourname@ipaddress
+conoha ssh 01234567-89ab-cdef-0123-456789abcdef          # ssh ipaddress
+
+# Mosh
+conoha mosh 01234567-89ab-cdef-0123-456789abcdef root # mosh root@ipaddress
+
+# Launch Web browser
+conoha browse 01234567-89ab-cdef-0123-456789abcdef      # xdg-open http://ipaddress
+conoha browse 01234567-89ab-cdef-0123-456789abcdef 3000 # xdg-open http://ipaddress:3000
 ```
 
 ## Development
@@ -115,6 +127,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/kaosf/
 - [x] delete image
 - [ ] public keys
 - [x] make as a gem
+- [ ] remove `curl` command from authenticate
+- [ ] help message
+- [ ] subcommand help messages
 
 ### Code
 

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = Dir["test/**/test_*.rb"]
+  t.verbose = true
+end
+
+task default: :test

data/exe/conoha

@@ -2,6 +2,7 @@
 # vim: filetype=ruby
 
 require 'conoha'
+require 'conoha/util'
 require 'pp'
 
 subcommand = ARGV.shift
@@ -53,20 +54,20 @@ when 'createfromimage'
   puts Conoha.create_from_image image_ref, ram
 when 'ssh'
   exit 1 if ARGV.size < 1 || 2 < ARGV.size
-  ipaddress = Conoha.ip_address_of(server_id(ARGV.first))[1]
+  ipaddress = ipv4(Conoha.ip_address_of(server_id(ARGV.first)))
   user = ARGV[1].nil? ? '' : "#{ARGV[1]}@"
   command = "ssh -oStrictHostKeyChecking=no #{user}#{ipaddress}"
   puts command
   system command
 when 'mosh'
   exit 1 if ARGV.size != 1
-  ipaddress = Conoha.ip_address_of(server_id(ARGV.first))[1]
+  ipaddress = ipv4(Conoha.ip_address_of(server_id(ARGV.first)))
   command = "mosh #{ipaddress}"
   puts command
   system command
 when 'browse'
   exit 1 if ARGV.size < 1 || 2 < ARGV.size
-  ipaddress = Conoha.ip_address_of(server_id(ARGV.first))[1]
+  ipaddress = ipv4(Conoha.ip_address_of(server_id(ARGV.first)))
   port = ARGV[1].nil? ? '' : ":#{ARGV[1]}"
   command = "xdg-open http://#{ipaddress}#{port}"
   puts command

data/lib/conoha/util.rb

@@ -0,0 +1,13 @@
+# @params [Array<String>]
+#   The return value of `ip_address_of` method. It is either
+#
+#       ["111.111.111.111", "1111:1111:1111:1111:1111:1111:1111:1111"]
+#
+#   or
+#
+#       ["1111:1111:1111:1111:1111:1111:1111:1111", "111.111.111.111"]
+#
+# @return [String] IPv4 address (e.g. "111.111.111.111")
+def ipv4(ip_address)
+  ip_address.select { |e| e =~ /\d+\.\d+\.\d+\.\d+/ }.first
+end

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.0.3"
+  ITSELF = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - conoha.gemspec
 - exe/conoha
 - lib/conoha.rb
+- lib/conoha/util.rb
 - lib/conoha/version.rb
 homepage: https://github.com/kaosf/conoha
 licenses: