smartdc 1.0.1 → 1.1.1

data/README.md

@@ -1,16 +1,29 @@
 smartdc
 =======
 
+```
+              .
+              |
+ .-.  .--. .-.|  .-.
+: + : `--.(   | (   
+ `-'  `--' `-'`- `-'
+
+```
+
 smartdc is Joyent's [SmartDataCenter](http://www.joyent.com/software/smartdatacenter) client and SmartDataCenter Command Line Interface.  
 [Joyent CloudAPI Documentation](http://apidocs.joyent.com/sdcapidoc/cloudapi/).  
 
+
 ## Features
+
 * Response content is Hash.
 * Debug output Request and Response.
 * Output style is Table or JSON.
 * CLI is sub command style.
 
+
 ## Installation
+
 ```
 gem install smartdc
 ```
@@ -18,17 +31,38 @@ gem install smartdc
 ## Usage
 
 ### CLI
+Invoke interactive configuration.
+
 ```
 $ sdc init
-$ sdc key add key_name ~/.ssh/id_rsa.pub 
 $ sdc dataset ls
 $ sdc package ls
-$ sdc machine add -e DATASET_URN -p PACKAGE_NAME
+$ sdc machine add NAME -e DATASET_URN -p PACKAGE_NAME
 $ sdc machine ls
+```
+
+
+#### Output JSON
+JSON is set to body of response.
+
+```
 $ sdc machine ls --raw
 ```
 
+
+#### Machine use
+Set to config the Machine uuid.
+
+```
+$ sdc machine ls
+$ sdc machine get UUID
+$ sdc machine use UUID
+$ sdc machine get
+```
+
+
 ### Program
+Hash is set to content of response.
 
 ```
 require 'smartdc'
@@ -48,7 +82,9 @@ client.machines.all.content.each do |machine|
 end
 ```
 
+
 ## Tests
+
 ```
 $ rake spec
 ```
@@ -57,4 +93,5 @@ $ rake spec
 
 
 ## License 
+
 * MIT

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.1

data/bin/sdc

@@ -8,6 +8,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 module CLI
+  def self.ip(uuid)
+    res = sdc(config).machines.read(uuid)
+    if res.status == 200
+      res.content['primaryIp']
+    else
+      uuid
+    end
+  end
+
   class Base < Thor
     class_option :debug, type: :boolean, aliases: '-d', desc: 'Debug output'
     class_option :raw, type: :boolean, aliases: '-r', desc: 'Raw response body'
@@ -33,7 +42,7 @@ module CLI
 
     desc 'del [NAME]', 'Deletes an SSH key by name.'
     def del(name)
-      output sdc(config(options)).keys.destroy(name), {message: "Key #{name} deleted"}.merge(options)
+      output sdc(config(options)).keys.destroy(name), {message: "Key #{name} deleted."}.merge(options)
     end
   end
 
@@ -89,8 +98,8 @@ module CLI
       output sdc(config(opt(ARGV, options))).machines.tags(uuid).read(key), {'raw' => true}.merge(opt(ARGV, options))
     end
 
-    desc 'add [KEY] [VALUE]', 'Allows you to add additional tags, other than those set at provisioning time.'
-    def add(key, value)
+    desc 'set [KEY] [VALUE]', 'Allows you to set the tags for a given machine.'
+    def set(key, value)
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
       output sdc(config(opt(ARGV, options))).machines.tags(uuid).create({key => value}), {table: :v}.merge(opt(ARGV, options))
     end
@@ -101,28 +110,38 @@ module CLI
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
       if key.nil? 
         if options.all
-          msg = "Machine #{uuid} all tags deleted"
+          msg = "Machine #{CLI.ip(uuid)} all tags deleted."
           output sdc(config(opt(ARGV, options))).machines.tags(uuid).destroy, {message: msg}.merge(opt(ARGV, options))        
         end
       else
-        msg = "Machine #{uuid} tag #{key} deleted"
+        msg = "Machine #{CLI.ip(uuid)} tag #{key} deleted."
         output sdc(config(opt(ARGV, options))).machines.tags(uuid).destroy(key), {message: msg}.merge(opt(ARGV, options))        
       end
     end
   end
 
-  class Metadata < CLI::Base
+  class Meta < CLI::Base
     class_option :uuid, type: :string, aliases: '-u', desc: 'Machine uuid'
 
     desc 'ls', 'Returns the complete set of metadata associated with this machine.'
+    method_option :credentials, type: :boolean, aliases: '-c', desc: 'Only output the machine credentials.'
     def ls
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
-      output sdc(config(opt(ARGV, options))).machines.metadata(uuid).read, {table: :v}.merge(opt(ARGV, options))
+      res = sdc(config(opt(ARGV, options))).machines.metadata(uuid).read(options)
+      res.content = res.content['credentials'].to_json if options.credentials
+      output res, {table: :v}.merge(opt(ARGV, options))
+    end
+
+    desc 'set [KEY] [VALUE]', 'Allows you to set the metadata for a given machine.'
+    def set(key, value)
+      uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
+      output sdc(config(opt(ARGV, options))).machines.metadata(uuid).create({key => value}), {table: :v}.merge(opt(ARGV, options))
     end
 
-    desc 'add [KEY] [VALUE]', 'Allows you to update the metadata for a given machine.'
-    def add(key, value)
+    desc 'push [KEY] [FILE]', 'Push the metadata from file. (user-script or user-data)'
+    def push(key, file)
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
+      value = File.read(file)
       output sdc(config(opt(ARGV, options))).machines.metadata(uuid).create({key => value}), {table: :v}.merge(opt(ARGV, options))
     end
 
@@ -132,11 +151,11 @@ module CLI
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
       if key.nil? 
         if options.all
-          msg = "Machine #{uuid} all metadata deleted"
+          msg = "Machine #{CLI.ip(uuid)} all metadata deleted."
           output sdc(config(opt(ARGV, options))).machines.metadata(uuid).destroy, {message: msg}.merge(opt(ARGV, options))        
         end
       else
-        msg = "Machine #{uuid} metadata #{key} deleted"
+        msg = "Machine #{CLI.ip(uuid)} metadata #{key} deleted."
         output sdc(config(opt(ARGV, options))).machines.metadata(uuid).destroy(key), {message: msg}.merge(opt(ARGV, options))
       end
     end
@@ -166,14 +185,14 @@ module CLI
     desc 'del [NAME]', 'Deletes the specified snapshot of a machine.'
     def del(name)
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
-      msg = "Machine #{uuid} snapshots #{options[:name]} deleted"
+      msg = "Machine #{CLI.ip(uuid)} snapshots #{name} deleted."
       output sdc(config(opt(ARGV, options))).machines.snapshots(uuid).destroy(name), {message: msg}.merge(opt(ARGV, options))
     end
 
     desc 'start [NAME]', 'Starts a stopped machine from the referenced snapshot.'
     def start(name)
       uuid = options.uuid.nil? ? config[:use_machine] : options.uuid
-      msg = "Machine #{uuid} snapshots #{options[:key]} started"
+      msg = "Machine #{CLI.ip(uuid)} snapshots #{name} started."
       output sdc(config(opt(ARGV, options))).machines.snapshots(uuid).start(name), {message: msg}.merge(opt(ARGV, options))
     end
   end
@@ -183,7 +202,7 @@ module CLI
     method_option :type, type: :string, aliases: '-t', desc: 'virtualmachine or smartmachine'
     method_option :state, type: :string, aliases: '-s', desc: 'running or stopped'
     def ls
-      include = [:id, :name, :dataset, :state]
+      include = [:id, :dataset, :primaryIp, :state]
       output sdc(config(options)).machines.all(options), {table: :h, include: include}.merge(options)
     end
 
@@ -203,32 +222,46 @@ module CLI
     desc 'del [UUID]', 'Allows you to completely destroy a machine.'
     def del(uuid=nil)
       uuid ||= config[:use_machine]
-      output sdc(config(options)).machines.destroy(uuid), {message: "Machine #{uuid} deleted"}.merge(options)
+      output sdc(config(options)).machines.destroy(uuid), {message: "Machine #{CLI.ip(uuid)} deleted."}.merge(options)
     end
 
     desc 'stop [UUID]', 'Allows you to shut down a machine.'
+    method_option :all, type: :boolean, desc: 'All machine stop.'
     def stop(uuid=nil)
-      uuid ||= config[:use_machine]
-      output sdc(config(options)).machines.stop(uuid), {message: "Machine #{uuid} stoped"}.merge(options)
+      if options.all
+        sdc(config(options)).machines.all({state: 'running'}).content.each do |machine|
+          output sdc(config(options)).machines.stop(machine['id']), {message: "Machine #{machine['primaryIp']} stoped."}.merge(options)
+        end
+      else
+        uuid ||= config[:use_machine]
+        output sdc(config(options)).machines.stop(uuid), {message: "Machine #{CLI.ip(uuid)} stoped."}.merge(options)
+      end
     end
 
     desc 'start [UUID]', 'Allows you to boot up a machine.'
+    method_option :all, type: :boolean, desc: 'All machine start.'
     def start(uuid=nil)
-      uuid ||= config[:use_machine]
-      output sdc(config(options)).machines.start(uuid), {message: "Machine #{uuid} started"}.merge(options)
+      if options.all
+        sdc(config(options)).machines.all({state: 'stopped'}).content.each do |machine|
+          output sdc(config(options)).machines.start(machine['id']), {message: "Machine #{machine['primaryIp']} started."}.merge(options)
+        end
+      else
+        uuid ||= config[:use_machine]
+        output sdc(config(options)).machines.start(uuid), {message: "Machine #{CLI.ip(uuid)} started."}.merge(options)
+      end
     end
 
     desc 'reboot [UUID]', 'Allows you to reboot a machine.'
     def reboot(uuid=nil)
       uuid ||= config[:use_machine]
-      output sdc(config(options)).machines.reboot(uuid), {message: "Machine #{uuid} reboot"}.merge(options)
+      output sdc(config(options)).machines.reboot(uuid), {message: "Machine #{CLI.ip(uuid)} reboot."}.merge(options)
     end
 
     desc 'resize [UUID]', 'Allows you to resize a SmartMachine.'
     method_option :package, type: :string, aliases: '-p', desc: 'Use a package name returned from ListPackages'
     def resize(uuid=nil)
       uuid ||= config[:use_machine]
-      output sdc(config(options)).machines.resize(uuid, {}.merge(options)), {message: "Machine #{uuid} resize"}.merge(options)
+      output sdc(config(options)).machines.resize(uuid, {}.merge(options)), {message: "Machine #{CLI.ip(uuid)} resize."}.merge(options)
     end
 
     desc 'use [UUID]', 'Use machine.'
@@ -243,7 +276,7 @@ module CLI
     end
 
     register(Tag, 'tag', 'tag [COMMAND]', 'Machine tag')
-    register(Metadata, 'metadata', 'metadata [COMMAND]', 'Machine metadata')
+    register(Meta, 'meta', 'meta [COMMAND]', 'Machine metadata')
     register(Snapshot, 'snapshot', 'snapshot [COMMAND]', 'Machine snapshot')
   end
 
@@ -271,7 +304,7 @@ module CLI
     end
 
     desc 'get [ID]', 'Retrieves the configuration for an instrumentation.'
-    method_option :value, type: :boolean, aliases: '-v', desc: 'All metadata.'
+    method_option :value, type: :boolean, aliases: '-v', desc: 'Analytic value.'
     def get(id)
       if options[:value]
         output sdc(config(options)).analytics.value(id), {table: :v}.merge(options)
@@ -311,8 +344,31 @@ module CLI
   class Main < Thor
     desc 'init', 'Sets up an account on a datacenter for use with this CLI.'
     def init
-      Configure.make
-      puts sdc(config).datacenters.all.status == 200 ? 'Successful configuration.' : 'Failed Configuration.'
+      message = ['Successful configuration.', 'Failed Configuration.']
+      state = 0
+
+      Configure.init
+      res = sdc(config).keys.all
+      if res.status == 200
+        rsa_path = Configure.key(res.content)
+        config = Configure.read
+        if rsa_path 
+          raw = {name: config[:use_key], key: File.read(rsa_path)}
+          res = sdc(config).keys.create(raw)
+          state = 1 if res.status != 201
+          config.delete(:password)  
+        else
+          config.delete(:password)
+          res = sdc(config).keys.read(config[:use_key])
+          state = 1  if res.status != 200
+        end
+        Configure.write config
+      else
+        state = 1
+      end
+
+      msg = res.content['message'] + '.' if state == 1
+      puts "#{message[state]} #{msg}"
     end
 
     register(Key, 'key', 'key [COMMAND]', 'SSH key')

data/lib/cli_helper.rb

@@ -55,52 +55,43 @@ def output(response, options={})
 end
 
 def horizontal(content, options={})
-  if content.empty?
-    nil
-  else
-    options[:include] ||= []
-    options[:exclude] ||= []
-    rows = []
-    headings = nil
-      
-    content.each do |row|
-      options[:exclude].each do |col|
-        row.delete(col.to_s)
-      end
+  options[:include] ||= []
+  options[:exclude] ||= []
+  rows = []
+  headings = nil
+    
+  content.each do |row|
+    options[:exclude].each do |col|
+      row.delete(col.to_s)
+    end
 
-      if !options[:include].empty?
-        cols = {}
-        options[:include].each do |col|
-          cols[col.to_s] = row[col.to_s] if row.key?(col.to_s)
-        end
-        row = cols
+    if !options[:include].empty?
+      cols = {}
+      options[:include].each do |col|
+        cols[col.to_s] = row[col.to_s] if row.key?(col.to_s)
       end
-
-      rows << row.values
-      headings = row.keys if headings.nil?
+      row = cols
     end
 
-    Terminal::Table.new :headings => headings, :rows => rows
+    rows << row.values
+    headings = row.keys if headings.nil?
   end
+
+  Terminal::Table.new :headings => headings, :rows => rows if !content.empty?
 end
 
 def vertical(content, options={})
-  if content.empty?
-    nil
-  else
-    options[:exclude] ||= []
-
-    options[:exclude].each do |col|
-      content.delete(col.to_s)
-    end
+  options[:exclude] ||= []
+  options[:exclude].each do |col|
+    content.delete(col.to_s)
+  end
 
-    rows = []
-    content.to_a.each do |row|
-      rows << row
-    end
-    
-    Terminal::Table.new :headings => ['key','value'], :rows => rows
+  rows = []
+  content.to_a.each do |row|
+    rows << row
   end
+  
+  Terminal::Table.new :headings => ['key','value'], :rows => rows if !content.empty?
 end
 
 def describe(name, content, options)

data/lib/configure.rb

@@ -24,10 +24,21 @@ module Configure
     end
   end
 
-  def self.make
+  def self.init
     config = self.read
 
-    puts
+    output = <<EOS
+              .
+              |
+ .-.  .--. .-.|  .-.
+: + : `--.(   | (   
+ `-'  `--' `-'`- `-'
+      Smart Data Center Command Line Interface
+      http://apidocs.joyent.com/sdcapidoc/cloudapi/
+      
+EOS
+    puts output
+
     config[:hostname] ||= 'api.example.com'
     print "Hostname (#{config[:hostname]}): "
     stdin = STDIN.gets.chomp.to_s
@@ -59,6 +70,47 @@ module Configure
     self.write config
   end
 
+  def self.key(keys)
+    config = self.read
+    use_key = 0
+    rsa_path = nil
+
+    puts "SSH Key Settings:"
+    keys.each_with_index do |key, i|
+      puts "#{i+1}) #{key['name']}"
+    end
+
+    if !keys.empty?
+      puts "0) Add new key"
+      print "Select SSH key: "
+      stdin = STDIN.gets.chomp.to_s
+      use_key = stdin.to_i if !stdin.empty?
+    end
+
+    if use_key > 0
+      config[:use_key] = keys[use_key-1]['name']
+    else
+      config[:use_key] ||= 'id_rsa'
+      print "Key name (#{config[:use_key]}): "
+      stdin = STDIN.gets.chomp.to_s
+      config[:use_key] = stdin if !stdin.empty?        
+
+      rsa_path = File.join(ENV["HOME"], '/.ssh/id_rsa.pub')
+      print "Public key path (#{rsa_path}): "
+      stdin = STDIN.gets.chomp.to_s
+      rsa_path = stdin if !stdin.empty?
+    end
+
+    config[:rsa_path] ||= File.join(ENV["HOME"], '/.ssh/id_rsa')
+    print "Private key path (#{config[:rsa_path]}): "
+    stdin = STDIN.gets.chomp.to_s
+    config[:rsa_path] = stdin if !stdin.empty?
+    puts
+
+    self.write config
+    rsa_path
+  end
+
   private
 
   def path

data/lib/smartdc/auth.rb

@@ -0,0 +1,12 @@
+require 'openssl'
+
+module Smartdc
+  module Auth
+    def self.sign(request={}, options={})
+      rsa = OpenSSL::PKey::RSA.new File.read options[:rsa_path]
+      sha256 = OpenSSL::Digest::SHA256.new
+      raw = [rsa.sign(sha256, request[:headers][:date])].pack('m').delete("\r\n")
+      "Signature keyId=\"/#{options[:username]}/keys/#{options[:use_key]}\",algorithm=\"rsa-sha256\" #{raw}"
+    end
+  end
+end

data/lib/smartdc/request.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'faraday'
-require 'smartdc/response/raise_error'
+require 'smartdc/auth'
+#require 'smartdc/response/raise_error'
 
 module Smartdc
   class Request
@@ -25,6 +26,7 @@ module Smartdc
     end
 
     def request(method, path, query={}, raw={})
+      path = path.gsub(/^my/, @options[:username])
       res = connection.send(method) do |req|
         case method
         when :get
@@ -63,16 +65,19 @@ module Smartdc
         :url => 'https://' + @options[:hostname],
         :ssl => {:verify => false},
         :headers => {
-          'Content-Type'=>'application/json',
-          'X-Api-Version' => @options[:version]
+          :date => Time.now.gmtime.to_s,
+          'content-type'=>'application/json',
+          'x-api-version' => @options[:version]
         }
       }
 
+      options[:headers][:authorization] = Smartdc::Auth::sign(options, @options) if @options[:rsa_path] && !@options[:password]
+
       Faraday.new(options) do |builder|
-        builder.request :basic_auth, @options[:username], @options[:password]
+        builder.request :basic_auth, @options[:username], @options[:password] if @options[:password]
         # builder.use Smartdc::Response::RaiseError
         builder.adapter Faraday.default_adapter
       end
     end
   end
-end
+end

data/lib/smartdc/response.rb

@@ -1,23 +1,24 @@
 module Smartdc
   class Response
-    attr_reader :status, :headers, :body
+    attr_reader :status, :headers, :body, :content
 
     def initialize(response)
       @status = response.status
       @headers = response.headers
       @body = response.body
+      self.content = @body
     end
 
-    def content
-      case @body
+    def content=raw
+      case raw
       when nil, ''
-        nil
+        @content = nil
       when 'true'
-        true
+        @content = true
       when 'false'
-        false
+        @content = false
       else
-        JSON.parse(@body)
+        @content = JSON.parse(raw)
       end
     end
   end

data/smartdc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "smartdc"
-  s.version = "1.0.1"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ogom"]
-  s.date = "2012-12-16"
+  s.date = "2012-12-23"
   s.description = "SmartDataCenter client and SmartDataCenter Command Line Interface."
   s.email = "ogom@hotmail.co.jp"
   s.executables = ["sdc"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/smartdc/api/machine/tags.rb",
     "lib/smartdc/api/machines.rb",
     "lib/smartdc/api/packages.rb",
+    "lib/smartdc/auth.rb",
     "lib/smartdc/client.rb",
     "lib/smartdc/error.rb",
     "lib/smartdc/request.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -135,6 +135,7 @@ files:
 - lib/smartdc/api/machine/tags.rb
 - lib/smartdc/api/machines.rb
 - lib/smartdc/api/packages.rb
+- lib/smartdc/auth.rb
 - lib/smartdc/client.rb
 - lib/smartdc/error.rb
 - lib/smartdc/request.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3018539287908921547
+      hash: -4139368408175416003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: