smartdc 0.4.0 → 1.0.1

data/lib/cli_helper.rb

@@ -1,12 +1,135 @@
-require 'pp'
-require "optparse"
+require 'thor'
+require 'thor/group'
+require 'terminal-table'
 require 'smartdc'
+require 'configure'
+include Configure
 
-def fixture(name, path='config/fixtures')
-  json = File.read(File.join(File.dirname(__FILE__), '..', path, "/#{name}.json"))
-  MultiJson.decode(json)
+def config(options={})
+  cfg = Configure.read
+
+  if !options.empty?
+    options.each do |key, value|
+      cfg[key.to_sym] = value
+    end
+  end
+
+  cfg
+end
+
+def sdc(options)
+  Smartdc.new(options)
+end
+
+def opt(argument, options={})
+  opts = {}
+  opts = opts.merge(options)
+  opts['raw'] = true if argument.include?('--raw') or argument.include?('-r')
+  opts['debug'] = true if argument.include?('--debug') or argument.include?('-d')
+  opts
+end
+
+def output(response, options={})
+  if options['raw']
+    puts response.body
+  else
+    if response.status < 300
+      if options[:table]
+        case options[:table]
+        when :h
+          puts horizontal(response.content, options)
+        when :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={})
+  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
+
+      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
+  end
+end
+
+def vertical(content, options={})
+  if content.empty?
+    nil
+  else
+    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
+  end
 end
 
-def client
-  @client ||= Smartdc.new(fixture('config', 'config'))
-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

data/lib/configure.rb

@@ -0,0 +1,73 @@
+module Configure
+  def self.read()
+    begin
+      config = {}
+      File.open(path, 'r') do |file|
+        file.each do |row|
+          row.chomp!
+          cols = row.split(/\s+=\s+/)
+          config[cols[0].to_sym] = cols[1]
+        end
+      end
+    rescue
+      config = {}
+    ensure
+      return config
+    end
+  end
+
+  def self.write(config)
+    File.open(path, 'w') do |file|
+      config.each do |key, value|
+        file.puts "#{key} = #{value}"
+      end
+    end
+  end
+
+  def self.make
+    config = self.read
+
+    puts
+    config[:hostname] ||= 'api.example.com'
+    print "Hostname (#{config[:hostname]}): "
+    stdin = STDIN.gets.chomp.to_s
+    config[:hostname] = stdin if !stdin.empty?
+
+    config[:username] ||= ENV['USER']
+    print "Username (#{config[:username]}): "
+    stdin = STDIN.gets.chomp.to_s
+    config[:username] = stdin if !stdin.empty?
+
+    config[:password] ||= ''
+    print "Password: "
+    stdin = STDIN.gets.chomp.to_s
+    config[:password] = stdin if !stdin.empty?
+
+    config[:version] ||= '~6.5 '
+    print "Version (#{config[:version]}): "
+    stdin = STDIN.gets.chomp.to_s
+    config[:version] = stdin if !stdin.empty?
+
+    puts
+    puts "New settings:"
+    puts "Hostname: #{config[:hostname]}"
+    puts "Username: #{config[:username]}"
+    puts "Password:"
+    puts "Version: #{config[:version]}"
+    puts
+
+    self.write config
+  end
+
+  private
+
+  def path
+    config = '.sdccfg'
+    file = File.join(File.dirname(__FILE__), '..', config)
+    if File.exist?(file)
+      file
+    else
+      File.join(ENV["HOME"], config)
+    end
+  end
+end

data/lib/smartdc.rb

@@ -1,9 +1,24 @@
+require 'pp'
 require 'smartdc/client'
 require 'smartdc/request'
+require 'smartdc/response'
 require 'smartdc/error'
 
 module Smartdc
   def self.new(options={})
     Smartdc::Client.new(options)
   end
-end
+
+  def self.config=(options={})
+    @cli = Smartdc::Client.new(options)
+    @config = options
+  end
+
+  def self.config
+    @config
+  end
+
+  def self.cli
+    @cli
+  end
+end

data/lib/smartdc/api/analytics.rb

@@ -1,21 +1,43 @@
-require 'smartdc/api/analytics/instrumentations'
+require 'smartdc/api/analytics/heatmap'
 
 module Smartdc
   module Api
     class Analytics
-      attr_reader :request, :id
+      attr_reader :request
 
-      def initialize(request, id=nil)
-        @request = request
-        @id = id
+      def initialize(options)
+        @request = Smartdc::Request.new(options)
       end
 
       def describe
         request.get('my/analytics')
       end
 
-      def instrumentations(_id=nil)
-        Smartdc::Api::Analytics::Instrumentations.new(request, _id)
+      def create(raw={})
+        request.post('my/analytics/instrumentations/', raw)
+      end
+
+      def read(id)
+        raise ArgumentError unless id
+        request.get('my/analytics/instrumentations/' + id.to_s)
+      end
+
+      def all(query={})
+        request.get('my/analytics/instrumentations', query)
+      end
+
+      def destroy(id)
+        request.del('my/analytics/instrumentations/' + id.to_s)
+      end
+
+      def value(id)
+        raise ArgumentError unless id
+        request.get('my/analytics/instrumentations/' + id.to_s + '/value/raw')
+      end
+
+      def heatmap(id)
+        raise ArgumentError unless id
+        Smartdc::Api::Analytics::Heatmap.new(request, id)
       end
     end
   end

data/lib/smartdc/api/analytics/heatmap.rb

@@ -0,0 +1,20 @@
+module Smartdc::Api
+  class Analytics
+    class Heatmap
+      attr_reader :request, :id
+
+      def initialize(request, id)
+        @request = request
+        @id = id
+      end
+
+      def image(query={})
+        request.get('my/analytics/instrumentations/' + @id.to_s + '/value/heatmap/image', query)
+      end
+
+      def details(query={})
+        request.get('my/analytics/instrumentations/' + @id.to_s + '/value/heatmap/details', query)
+      end  
+    end
+  end
+end

data/lib/smartdc/api/datacenters.rb

@@ -1,20 +1,19 @@
 module Smartdc
   module Api
     class Datacenters
-      attr_reader :request, :id
+      attr_reader :request
 
-      def initialize(request, id=nil)
-        @request = request
-        @id = id
+      def initialize(options)
+        @request = Smartdc::Request.new(options)
       end
 
-      def read
+      def read(id)
         raise ArgumentError unless id
         request.get('my/datacenters/' + id.to_s)
       end
 
-      def find(params={})
-        request.get('my/datacenters', params)
+      def all(query={})
+        request.get('my/datacenters', query)
       end
     end
   end

data/lib/smartdc/api/datasets.rb

@@ -1,20 +1,19 @@
 module Smartdc
   module Api
     class Datasets
-      attr_reader :request, :id
+      attr_reader :request
 
-      def initialize(request, id=nil)
-        @request = request
-        @id = id
+      def initialize(options)
+        @request = Smartdc::Request.new(options)
       end
 
-      def read
+      def read(id)
         raise ArgumentError unless id
         request.get('my/datasets/' + id.to_s)
       end
 
-      def find(params={})
-        request.get('my/datasets', params)
+      def all(query={})
+        request.get('my/datasets', query)
       end
     end
   end

data/lib/smartdc/api/keys.rb

@@ -1,29 +1,28 @@
 module Smartdc
   module Api
     class Keys
-      attr_reader :request, :id
+      attr_reader :request
 
-      def initialize(request, id=nil)
-        @request = request
-        @id = id
+      def initialize(options)
+        @request = Smartdc::Request.new(options)
       end
 
-      def create(params={})
-        request.post('my/keys/', params)
+      def create(raw={})
+        request.post('my/keys/', raw)
       end
 
-      def read
+      def read(id)
         raise ArgumentError unless id
         request.get('my/keys/' + id.to_s)
       end
 
-      def find(params={})
-        request.get('my/keys', params)
+      def all(query={})
+        request.get('my/keys', query)
       end
 
-      def delete
+      def destroy(id)
         raise ArgumentError unless id
-        request.delete('my/keys/' + id.to_s)
+        request.del('my/keys/' + id.to_s)
       end
     end
   end

data/lib/smartdc/api/machine/metadata.rb

@@ -1,29 +1,23 @@
 module Smartdc::Api
   module Machine
     class Metadata
-      attr_reader :request, :id
+      attr_reader :request
 
-      def initialize(request, id1, id)
-        @request = request
-        @id1 = id1
+      def initialize(id, options)
         @id = id
+        @request = Smartdc::Request.new(options)
       end
 
-      def create(params={})
-        request.post('my/machines/' + @id1.to_s + '/metadata/', params)
-      end
-      
-      def read
-        raise ArgumentError unless id
-        request.get('my/machines/' + @id1.to_s + '/metadata/' + id.to_s)
+      def create(raw={})
+        request.post('my/machines/' + @id.to_s + '/metadata/', raw)
       end
 
-      def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/metadata', params)
+      def read(query={})
+        request.get('my/machines/' + @id.to_s + '/metadata', query)
       end
 
-      def delete
-        request.delete('my/machines/' + @id1.to_s + '/metadata/' + id.to_s)
+      def destroy(id=nil)
+        request.del('my/machines/' + @id.to_s + '/metadata/' + id.to_s)
       end
     end
   end