smartdc 1.3.0 → 2.0.0

data/lib/smartdc/cli_helper.rb

@@ -0,0 +1,111 @@
+require 'terminal-table'
+
+module Smartdc
+  module CliHelper
+    def use_machine(id)
+      if id.nil?
+        clicfg = Smartdc::CliConfigure.new
+        sdccfg = clicfg.read
+        sdccfg[:use_machine]
+      else
+         id
+      end
+    end
+
+    def output(response, options={})
+      if options['raw']
+        puts response.body
+      else
+        if response.status < 300
+          if options[:table]
+            case options[:table]
+            when :horizontal, :h
+              puts horizontal(response.content, options)
+            when :vertical, :v
+              puts vertical(response.content, options)
+            end
+          else
+            if options[:message]
+              puts options[:message]
+            else
+              puts response.content[options[:only].to_s]
+            end
+          end
+        else
+          puts vertical(response.content)
+        end
+      end
+    end
+
+    def horizontal(content, options={})
+      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
+        end
+
+        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={})
+      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 if !content.empty?
+    end
+
+    def describe(name, content, options)
+      if options['all'] or options['output'] == name
+        options[:exclude] ||= []
+        rows = []
+
+        content[name].each do |row|
+          cols = []
+          if options[:cols] == :all
+            options[:exclude].each do |col|
+              row.delete(col.to_s)
+            end
+            cols = row.values
+          else
+            options[:cols].each do |col|
+              if col == 'key'
+                cols << row[0]
+              else
+               cols << row[1][col]
+              end
+            end
+          end
+          rows << cols
+        end
+
+        title = options['all'] ? name : nil
+        headings = options[:cols] == :all ? content[name][0].keys : options[:cols]
+        puts Terminal::Table.new :title => title, :headings => headings, :rows => rows
+        puts if options['all']
+      end
+    end
+  end
+end

data/lib/smartdc/client.rb

@@ -1,40 +1,45 @@
-require 'smartdc/api/keys'
+require 'cassette-rack'
+require 'smartdc/auth'
 require 'smartdc/api/datacenters'
-require 'smartdc/api/datasets'
+require 'smartdc/api/images'
 require 'smartdc/api/packages'
+require 'smartdc/api/keys'
 require 'smartdc/api/machines'
+require 'smartdc/api/machines/tags'
+require 'smartdc/api/machines/metadata'
+require 'smartdc/api/machines/snapshots'
 require 'smartdc/api/analytics'
+require 'smartdc/api/analytics/heatmap'
 
 module Smartdc
   class Client
-    attr_reader :options
+    include CassetteRack::Request
+    include Smartdc::Api::Datacenters
+    include Smartdc::Api::Images
+    include Smartdc::Api::Packages
+    include Smartdc::Api::Keys
+    include Smartdc::Api::Machines
+    include Smartdc::Api::Machines::Tags
+    include Smartdc::Api::Machines::Metadata
+    include Smartdc::Api::Machines::Snapshots
+    include Smartdc::Api::Analytics
+    include Smartdc::Api::Analytics::Heatmap
 
     def initialize(options={})
-      @options ||= options
-    end
-
-    def keys()
-      Smartdc::Api::Keys.new(options)
-    end
-
-    def datacenters()
-      Smartdc::Api::Datacenters.new(options)
-    end
-
-    def datasets()
-      Smartdc::Api::Datasets.new(options)
-    end
-
-    def packages()
-      Smartdc::Api::Packages.new(options)
-    end
-
-    def machines()
-    	Smartdc::Api::Machines.new(options)
-    end
-
-    def analytics()
-      Smartdc::Api::Analytics.new(options)
+      options = Smartdc.config.options.merge(options)
+      auth = Smartdc::Auth.new(options)
+      date = Time.now.gmtime.to_s
+
+      @request_options = {
+        builder: options[:middleware],
+        url: options[:url],
+        ssl: { verify: options[:ssl_verify] },
+        headers: {
+          date: date, authorization: auth.signature(date),
+          'content-type' => 'application/json', accept: 'application/json',
+          'x-api-version' => options[:version]
+        }
+      }
     end
   end
 end

data/lib/smartdc/configure.rb

@@ -0,0 +1,30 @@
+module Smartdc
+  module Configure
+    class << self
+      def attributes
+        @attributes ||= %i[
+          url version ssl_verify middleware
+          username use_key rsa_path
+        ]
+      end
+
+      def setup
+        attributes.each do |attribute|
+          if Smartdc::Default.respond_to?(attribute)
+            instance_variable_set(:"@#{attribute}", Smartdc::Default.send(attribute))
+          end
+        end
+      end
+
+      def options
+        Hash[
+          Smartdc::Configure.attributes.map do |attribute|
+            [attribute, instance_variable_get(:"@#{attribute}")]
+          end
+        ]
+      end
+
+      attr_accessor *Smartdc::Configure.attributes
+    end
+  end
+end

data/lib/smartdc/default.rb

@@ -0,0 +1,35 @@
+require 'faraday'
+
+module Smartdc
+  module Default
+    URL        = 'https://us-east-1.api.joyentcloud.com'.freeze
+    VERSION    = '~7.0'.freeze
+    SSL_VERIFY = true.freeze
+    RSA_PATH   = '~/.ssh'.freeze
+    MIDDLEWARE = Faraday::RackBuilder.new do |builder|
+      builder.adapter Faraday.default_adapter
+    end
+
+    class << self
+      def url
+        URL
+      end
+
+      def version
+        VERSION
+      end
+
+      def ssl_verify
+        SSL_VERIFY
+      end
+
+      def rsa_path
+        RSA_PATH
+      end
+
+      def middleware
+        MIDDLEWARE
+      end
+    end
+  end
+end

data/lib/smartdc/version.rb

@@ -1,3 +1,3 @@
 module Smartdc
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'.freeze
 end

data/smartdc.gemspec

@@ -1,23 +1,27 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'smartdc/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = "smartdc"
-  gem.version       = Smartdc::VERSION
-  gem.authors       = ["ogom"]
-  gem.email         = ["ogom@hotmail.co.jp"]
-  gem.description   = %q{SmartDataCenter client and SmartDataCenter Command Line Interface.}
-  gem.summary       = %q{Joyent SmartDataCenter CloudApi client by ruby.}
-  gem.homepage      = "http://github.com/ogom/ruby-smartdc"
+Gem::Specification.new do |spec|
+  spec.name          = "smartdc"
+  spec.version       = Smartdc::VERSION
+  spec.authors       = ["ogom"]
+  spec.email         = ["ogom@hotmail.co.jp"]
+  spec.summary       = %q{Joyent CloudAPI client by Ruby.}
+  spec.description   = %q{Joyent CloudAPI client and command line interface.}
+  spec.homepage      = "http://github.com/ogom/ruby-smartdc"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_runtime_dependency(%q<faraday>, ["~> 0.8"])
-  gem.add_runtime_dependency(%q<thor>, ["~> 0.18"])
-  gem.add_runtime_dependency(%q<terminal-table>, ["~> 1.4"])
+  spec.add_dependency 'cassette-rack'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'terminal-table'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 end

data/spec/cassettes/analytics/create.yml

@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://us-east-1.api.joyentcloud.com/my/analytics/instrumentations
+    body:
+      encoding: UTF-8
+      string: '{"module":"syscall","stat":"syscalls"}'
+    headers:
+      Date: ''
+      Authorization: ''
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Api-Version:
+      - "~7.0"
+      User-Agent:
+      - Faraday v0.9.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Api-Version:
+      - 7.2.0
+      Server:
+      - Joyent SmartDataCenter 7.2.0
+      Request-Id: ''
+      Content-Type:
+      - application/json
+      Access-Control-Expose-Headers:
+      - Api-Version, Request-Id, Response-Time
+      Strict-Transport-Security:
+      - max-age=6570000
+      Date: ''
+      X-Request-Id: ''
+      Location:
+      - "/<USERNAME>/analytics/instrumentations/256"
+      Content-Md5:
+      - vcSXwZ1T0mBEzB5VAzOrFg==
+      Access-Control-Allow-Origin:
+      - "*"
+      Response-Time: ''
+      X-Response-Time: ''
+      Connection:
+      - Keep-Alive
+      Access-Control-Allow-Headers:
+      - Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, Api-Version,
+        Response-Time
+      Access-Control-Allow-Methods:
+      - GET, HEAD, POST
+      Api-Version:
+      - 7.2.0
+      Content-Length:
+      - '382'
+    body:
+      encoding: UTF-8
+      string: '{"module":"syscall","stat":"syscalls","predicate":{},"decomposition":[],"value-dimension":1,"value-arity":"scalar","enabled":true,"retention-time":600,"idle-max":3600,"transformations":{},"nsources":0,"granularity":1,"persist-data":false,"crtime":1424000674378,"value-scope":"interval","id":"256","uris":[{"uri":"/<USERNAME>/analytics/instrumentations/256/value/raw","name":"value_raw"}]}'
+    http_version: 
+  recorded_at: Sun, 15 Feb 2015 11:44:36 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/analytics/describe.yml

@@ -0,0 +1,123 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://us-east-1.api.joyentcloud.com/my/analytics
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Date: ''
+      Authorization: ''
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Api-Version:
+      - "~7.0"
+      User-Agent:
+      - Faraday v0.9.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Api-Version:
+      - 7.2.0
+      Server:
+      - Joyent SmartDataCenter 7.2.0
+      Request-Id: ''
+      Content-Type:
+      - application/json
+      Access-Control-Expose-Headers:
+      - Api-Version, Request-Id, Response-Time
+      Strict-Transport-Security:
+      - max-age=6570000
+      Date: ''
+      X-Request-Id: ''
+      Content-Md5:
+      - XITArtu6vj84zHPuBiuzNQ==
+      Access-Control-Allow-Origin:
+      - "*"
+      Response-Time: ''
+      X-Response-Time: ''
+      Connection:
+      - Keep-Alive
+      Access-Control-Allow-Headers:
+      - Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, Api-Version,
+        Response-Time
+      Access-Control-Allow-Methods:
+      - GET, HEAD
+      Api-Version:
+      - 7.2.0
+      Content-Length:
+      - '11086'
+    body:
+      encoding: UTF-8
+      string: '{"modules":{"apache":{"label":"Apache"},"cpu":{"label":"CPU"},"ldapjs":{"label":"ldapjs"},"memory":{"label":"Memory"},"mysql":{"label":"MySQL"},"syscall":{"label":"System
+        calls"},"fs":{"label":"Filesystem"},"node":{"label":"Node.js 0.4.x"},"nic":{"label":"Network
+        interface"},"vm":{"label":"Virtual Machine"},"tcp":{"label":"TCP"},"zfs":{"label":"ZFS"},"unix":{"label":"OS"}},"fields":{"zonename":{"label":"zone
+        name","type":"string"},"pid":{"label":"process identifier","type":"string"},"execname":{"label":"application
+        name","type":"string"},"psargs":{"label":"process arguments","type":"string"},"ppid":{"label":"parent
+        process identifier","type":"string"},"pexecname":{"label":"parent application
+        name","type":"string"},"ppsargs":{"label":"parent process arguments","type":"string"},"raddr":{"label":"remote
+        IP address","type":"string"},"rport":{"label":"remote TCP port","type":"string"},"http_method":{"label":"method","type":"string"},"http_url":{"label":"URL","type":"string"},"http_path":{"label":"URL
+        path","type":"string"},"latency":{"label":"latency","type":"time"},"subsecond":{"label":"subsecond
+        offset","type":"subsecond"},"leavereason":{"label":"reason leaving CPU","type":"string"},"runtime":{"label":"time
+        on CPU","type":"time"},"cpumode":{"label":"CPU mode","type":"string"},"optype":{"label":"operation
+        type","type":"string"},"ldapbinddn":{"label":"bind DN","type":"string"},"ldaprequestdn":{"label":"request
+        DN","type":"string"},"status":{"label":"status","type":"string"},"ldapfilter":{"label":"search
+        filter","type":"string"},"ldapscope":{"label":"search scope","type":"string"},"user":{"label":"client
+        username","type":"string"},"client":{"label":"client hostname","type":"string"},"command":{"label":"command","type":"string"},"cputime":{"label":"CPU
+        time","type":"time"},"querysubstr":{"label":"query substring","type":"string"},"database":{"label":"database
+        name","type":"string"},"parsed":{"label":"parsed","type":"string"},"statement":{"label":"statement
+        type","type":"string"},"rowsmatched":{"label":"rows matched","type":"number"},"rowschanged":{"label":"rows
+        changed","type":"number"},"table":{"label":"table name","type":"string"},"syscall":{"label":"syscall","type":"string"},"fstype":{"label":"filesystem
+        type","type":"string"},"size":{"label":"size","type":"size"},"offset":{"label":"offset","type":"size"},"gctype":{"label":"GC
+        type","type":"string"},"http_origin":{"label":"reported origin IP","type":"string"},"buffered":{"label":"bytes
+        buffered on socket","type":"size"},"direction":{"label":"sent/received","type":"string"},"vmmmuctx":{"label":"VM
+        MMU context","type":"string"},"errno":{"label":"error code","type":"string"},"zdataset":{"label":"ZFS
+        dataset","type":"string"},"walltime":{"label":"process runtime","type":"time"},"rss":{"label":"resident
+        set size","type":"size"},"contract":{"label":"contract identifier","type":"string"},"pmodel":{"label":"process
+        model","type":"string"},"nthreads":{"label":"number of threads","type":"number"}},"types":{"string":{"name":"string","arity":"discrete","unit":""},"time":{"arity":"numeric","unit":"seconds","abbr":"s","base":10,"power":-9,"name":"time"},"subsecond":{"arity":"numeric","unit":"seconds","abbr":"s","base":10,"power":-3,"name":"subsecond"},"size":{"arity":"numeric","unit":"bytes","abbr":"B","base":2,"name":"size"},"number":{"arity":"numeric","name":"number","unit":""}},"metrics":[{"module":"apache","stat":"httpd_ops","label":"HTTP
+        requests","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","raddr","rport","http_method","http_url","http_path","latency"],"unit":"requests"},{"module":"cpu","stat":"thread_samples","label":"thread
+        samples","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","subsecond"],"unit":"samples"},{"module":"cpu","stat":"thread_executions","label":"thread
+        executions","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","leavereason","runtime","subsecond"],"unit":"operations"},{"module":"cpu","stat":"usage","label":"aggregated
+        CPU usage","interval":"point","fields":["zonename","cpumode"],"unit":"percent
+        of 1 CPU"},{"module":"cpu","stat":"waittime","label":"aggregated wait time","interval":"interval","fields":["zonename"],"type":"time"},{"module":"ldapjs","stat":"connections","label":"connections","interval":"interval","fields":["zonename","pid","execname","psargs","raddr"],"unit":"connections"},{"module":"ldapjs","stat":"ops","label":"all
+        operations","interval":"interval","fields":["zonename","pid","execname","psargs","raddr","optype","ldapbinddn","ldaprequestdn","status","latency"],"unit":"operations"},{"module":"ldapjs","stat":"search_ops","label":"search
+        operations","interval":"interval","fields":["zonename","pid","execname","psargs","raddr","ldapbinddn","ldaprequestdn","status","ldapfilter","ldapscope","latency"],"unit":"operations"},{"module":"memory","stat":"rss","label":"resident
+        set size","interval":"point","fields":["zonename"],"type":"size"},{"module":"memory","stat":"rss_limit","label":"maximum
+        resident set size","interval":"point","fields":["zonename"],"type":"size"},{"module":"memory","stat":"swap","label":"virtual
+        memory reserved","interval":"point","fields":["zonename"],"type":"size"},{"module":"memory","stat":"swap_limit","label":"maximum
+        virtual memory reserved","interval":"point","fields":["zonename"],"type":"size"},{"module":"memory","stat":"reclaimed_bytes","label":"excess
+        memory reclaimed","interval":"interval","fields":["zonename"],"type":"size"},{"module":"memory","stat":"pageins","label":"pages
+        paged in","interval":"interval","fields":["zonename"],"unit":"pages"},{"module":"mysql","stat":"connections","label":"connections","interval":"interval","fields":["zonename","pid","execname","psargs","user","client","latency"],"unit":"connections"},{"module":"mysql","stat":"commands","label":"commands","interval":"interval","fields":["zonename","pid","execname","psargs","command","user","client","status","latency","cputime"],"unit":"commands"},{"module":"mysql","stat":"queries","label":"queries","interval":"interval","fields":["zonename","pid","execname","psargs","querysubstr","database","user","client","parsed","status","latency","cputime"],"unit":"queries"},{"module":"mysql","stat":"statements","label":"statements","interval":"interval","fields":["zonename","pid","execname","psargs","statement","status","rowsmatched","rowschanged","latency","cputime"],"unit":"statements"},{"module":"mysql","stat":"filesort","label":"filesort","interval":"interval","fields":["zonename","pid","execname","psargs","database","table","latency","cputime"],"unit":"filesorts"},{"module":"syscall","stat":"syscalls","label":"system
+        calls","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","syscall","subsecond","latency","cputime"],"unit":"syscalls"},{"module":"fs","stat":"logical_ops","label":"logical
+        filesystem operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","fstype","optype","latency"],"unit":"operations"},{"module":"fs","stat":"logical_rwops","label":"logical
+        read/write operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","fstype","optype","size","offset","latency"],"unit":"operations"},{"module":"fs","stat":"logical_rwbytes","label":"logical
+        bytes read/written","interval":"interval","fields":["zonename","optype"],"type":"size"},{"module":"node","stat":"gc_ops","label":"garbage
+        collection operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","gctype","latency"],"unit":"operations"},{"module":"node","stat":"httpc_ops","label":"HTTP
+        client operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","raddr","rport","http_method","http_url","http_path","latency"],"unit":"operations"},{"module":"node","stat":"httpd_ops","label":"HTTP
+        server operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","http_origin","raddr","rport","http_method","http_url","http_path","latency"],"unit":"operations"},{"module":"node","stat":"socket_ops","label":"socket
+        operations","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","optype","raddr","rport","size","buffered"],"unit":"operations"},{"module":"nic","stat":"vnic_bytes","label":"VNIC
+        bytes sent and received","interval":"interval","fields":["zonename","direction"],"type":"size"},{"module":"nic","stat":"vnic_packets","label":"VNIC
+        packets sent and received","interval":"interval","fields":["zonename","direction"],"unit":"packets"},{"module":"vm","stat":"thread_samples","label":"thread
+        samples","interval":"interval","fields":["zonename","subsecond","vmmmuctx"],"unit":"samples"},{"module":"vm","stat":"physio_ops","label":"disk
+        I/O operations","interval":"interval","fields":["zonename","optype","latency","size","offset","errno"],"unit":"operations"},{"module":"vm","stat":"physio_bytes","label":"disk
+        bytes read and written","interval":"interval","fields":["zonename","optype"],"type":"size"},{"module":"tcp","stat":"accepts","label":"accepts","interval":"interval","fields":["zonename","pid","execname","psargs","ppid","pexecname","ppsargs","rport","raddr"],"unit":"accepts"},{"module":"zfs","stat":"arc_ops","label":"ARC
+        operations","interval":"interval","fields":["zonename","execname","psargs","pid","pexecname","ppsargs","ppid","optype"],"unit":"operations"},{"module":"zfs","stat":"dataset_unused_quota","label":"unused
+        quota","interval":"point","fields":["zdataset"],"type":"size"},{"module":"zfs","stat":"dataset_used","label":"used
+        space","interval":"point","fields":["zdataset"],"type":"size"},{"module":"zfs","stat":"dataset_quota","label":"quota
+        size","interval":"point","fields":["zdataset"],"type":"size"},{"module":"unix","stat":"proc_execs","label":"process
+        execs","interval":"interval","fields":["zonename","execname","subsecond","psargs","ppid","ppsargs","pexecname","pid"],"unit":"processes"},{"module":"unix","stat":"proc_forks","label":"process
+        forks","interval":"interval","fields":["zonename","execname","subsecond","psargs","ppid","pid"],"unit":"processes"},{"module":"unix","stat":"proc_exits","label":"process
+        exits","interval":"interval","fields":["zonename","execname","subsecond","psargs","ppsargs","pexecname","ppid","pid","walltime"],"unit":"processes"},{"module":"unix","stat":"thr_creates","label":"thread
+        creations","interval":"interval","fields":["zonename","execname","subsecond","psargs","ppsargs","pexecname","ppid","pid"],"unit":"threads"},{"module":"unix","stat":"processes","label":"processes","interval":"interval","fields":["zonename","execname","pid","ppid","rss","contract","psargs","pmodel","nthreads"],"unit":"processes"}],"transformations":{"geolocate":{"label":"geolocate
+        IP addresses","fields":["raddr"]},"reversedns":{"label":"reverse dns IP addresses
+        lookup","fields":["raddr"]}}}'
+    http_version: 
+  recorded_at: Sun, 15 Feb 2015 11:37:46 GMT
+recorded_with: VCR 2.9.3