smartdc 1.3.0 → 2.0.0

data/config.ru

@@ -0,0 +1,2 @@
+require 'cassette-rack'
+run CassetteRack::Engine

data/lib/smartdc.rb

@@ -1,24 +1,32 @@
 require 'smartdc/version'
+require 'smartdc/configure'
+require 'smartdc/default'
 require 'smartdc/client'
-require 'smartdc/request'
-require 'smartdc/response'
-require 'smartdc/error'
 
 module Smartdc
-  def self.new(options={})
-    Smartdc::Client.new(options)
-  end
+  class << self
+    def configure
+      yield Smartdc::Configure
+    end
 
-  def self.config=(options={})
-    @cli = Smartdc::Client.new(options)
-    @config = options
-  end
+    def config
+      Smartdc::Configure
+    end
 
-  def self.config
-    @config
-  end
+    def client(options={})
+      @client = nil unless options.empty?
+      @client ||= Smartdc::Client.new(options)
+    end
 
-  def self.cli
-    @cli
+    def root
+      @root ||= File.expand_path('..', File.dirname(__FILE__))
+    end
+
+    def method_missing(method, *args, &block)
+      return super unless client.respond_to?(method)
+      client.send(method, *args, &block)
+    end
   end
 end
+
+Smartdc::Configure.setup

data/lib/smartdc/api/analytics.rb

@@ -1,44 +1,27 @@
-require 'smartdc/api/analytics/heatmap'
-
-module Smartdc
-  module Api
-    class Analytics
-      attr_reader :request
-
-      def initialize(options)
-        @request = Smartdc::Request.new(options)
-      end
-
-      def describe
-        request.get('my/analytics')
-      end
-
-      def create(raw={})
-        request.post('my/analytics/instrumentations/', raw)
-      end
+module Smartdc::Api
+  module Analytics
+    def analytics(params={})
+      get 'my/analytics/instrumentations', params
+    end
 
-      def read(id)
-        raise ArgumentError unless id
-        request.get('my/analytics/instrumentations/' + id.to_s)
-      end
+    def create_analytic(body={})
+      post 'my/analytics/instrumentations', body
+    end
 
-      def all(query={})
-        request.get('my/analytics/instrumentations', query)
-      end
+    def analytic(id)
+      get 'my/analytics/instrumentations/' + id.to_s
+    end
 
-      def destroy(id)
-        request.del('my/analytics/instrumentations/' + id.to_s)
-      end
+    def destroy_analytic(id)
+      delete '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 value_analytic(id)
+      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
+    def describe_analytics(params={})
+      get 'my/analytics', params
     end
   end
 end

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

@@ -1,20 +1,11 @@
 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
+  module Analytics::Heatmap
+    def analytic_image(analytic_id, params={})
+      get 'my/analytics/instrumentations/' + analytic_id.to_s + '/value/heatmap/image', params
+    end
 
-      def details(query={})
-        request.get('my/analytics/instrumentations/' + @id.to_s + '/value/heatmap/details', query)
-      end  
+    def analytic_details(analytic_id, params={})
+      get 'my/analytics/instrumentations/' + analytic_id.to_s + '/value/heatmap/details', params
     end
   end
 end

data/lib/smartdc/api/datacenters.rb

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

data/lib/smartdc/api/images.rb

@@ -0,0 +1,11 @@
+module Smartdc::Api
+  module Images
+    def images(params={})
+      get 'my/images', params
+    end
+
+    def image(id)
+      get 'my/images/' + id.to_s
+    end
+  end
+end

data/lib/smartdc/api/keys.rb

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

data/lib/smartdc/api/machines.rb

@@ -1,70 +1,36 @@
-require 'smartdc/api/machine/tags'
-require 'smartdc/api/machine/metadata'
-require 'smartdc/api/machine/snapshots'
-
-module Smartdc
-  module Api
-    class Machines
-      attr_reader :request
-
-      def initialize(options)
-        @options = options
-        @request = Smartdc::Request.new(options)
-      end
-
-      def create(raw={})
-        request.post('my/machines/', raw)
-      end
-      
-      def read(id)
-        raise ArgumentError unless id
-        request.get('my/machines/' + id.to_s)
-      end
+module Smartdc::Api
+  module Machines
+    def machines(params={})
+      get 'my/machines', params
+    end
 
-      def all(query={})
-        request.get('my/machines', query)
-      end
+    def create_machine(body={})
+      post 'my/machines', body
+    end
 
-      def destroy(id)
-        raise ArgumentError unless id
-        request.del('my/machines/' + id.to_s)
-      end
+    def machine(id)
+      get 'my/machines/' + id.to_s
+    end
 
-      def stop(id)
-        raise ArgumentError unless id
-        request.post('my/machines/' + id.to_s, {'action'=>'stop'})
-      end
+    def destroy_machine(id)
+      delete 'my/machines/' + id.to_s
+    end
 
-      def start(id)
-        raise ArgumentError unless id
-        request.post('my/machines/' + id.to_s, {'action'=>'start'})
-      end
+    def stop_machine(id)
+      post 'my/machines/' + id.to_s, {action: :stop}
+    end
 
-      def reboot(id)
-        raise ArgumentError unless id 
-        request.post('my/machines/' + id.to_s, {'action'=>'reboot'})
-      end
+    def start_machine(id)
+      post 'my/machines/' + id.to_s, {action: :start}
+    end
 
-      def resize(id, query={})
-        raise ArgumentError unless id
-        query['action'] = 'resize'
-        request.post('my/machines/' + id.to_s, query)
-      end
+    def reboot_machine(id)
+      post 'my/machines/' + id.to_s, {action: :reboot}
+    end
 
-      def tags(id)
-        raise ArgumentError unless id
-        Smartdc::Api::Machine::Tags.new(id, @options)
-      end
-      
-      def metadata(id)
-        raise ArgumentError unless id
-        Smartdc::Api::Machine::Metadata.new(id, @options)
-      end
-      
-      def snapshots(id)
-        raise ArgumentError unless id
-        Smartdc::Api::Machine::Snapshots.new(id, @options)
-      end
+    def resize_machine(id, params={})
+      params[:action] = 'resize'
+      post 'my/machines/' + id.to_s, params
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module Smartdc::Api
+  module Machines::Metadata
+    def machine_metadata(machine_id, params={})
+      get 'my/machines/' + machine_id.to_s + '/metadata', params
+    end
+
+    def update_machine_metadata(machine_id, body={})
+      post 'my/machines/' + machine_id.to_s + '/metadata', body
+    end
+
+    def destroy_machine_metadata(machine_id, key)
+      delete 'my/machines/' + machine_id.to_s + '/metadata/' + key.to_s
+    end
+  end
+end

data/lib/smartdc/api/machines/snapshots.rb

@@ -0,0 +1,23 @@
+module Smartdc::Api
+  module Machines::Snapshots
+    def machine_snapshots(machine_id, params={})
+      get 'my/machines/' + machine_id.to_s + '/snapshots', params
+    end
+
+    def create_machine_snapshot(machine_id, body={})
+      post 'my/machines/' + machine_id.to_s + '/snapshots', body
+    end
+
+    def machine_snapshot(machine_id, name)
+      get 'my/machines/' + machine_id.to_s + '/snapshots/' + name.to_s
+    end
+
+    def destroy_machine_snapshot(machine_id, name)
+      delete 'my/machines/' + machine_id.to_s + '/snapshots/' + name.to_s
+    end
+
+    def start_machine_snapshot(machine_id, name)
+      post 'my/machines/' + machine_id.to_s + '/snapshots/' + name.to_s, {}
+    end
+  end
+end

data/lib/smartdc/api/machines/tags.rb

@@ -0,0 +1,19 @@
+module Smartdc::Api
+  module Machines::Tags
+    def machine_tags(machine_id, params={})
+      get 'my/machines/' + machine_id.to_s + '/tags', params
+    end
+
+    def create_machine_tag(machine_id, body={})
+      post 'my/machines/' + machine_id.to_s + '/tags', body
+    end
+
+    def machine_tag(machine_id, key)
+      get 'my/machines/' + machine_id.to_s + '/tags/' + key.to_s
+    end
+
+    def destroy_machine_tag(machine_id, key)
+      delete 'my/machines/' + machine_id.to_s + '/tags/' + key.to_s
+    end
+  end
+end

data/lib/smartdc/api/packages.rb

@@ -1,21 +1,11 @@
-module Smartdc
-  module Api
-    class Packages
-      attr_reader :request
-
-      def initialize(options)
-        @request = Smartdc::Request.new(options)
-      end
-
-      def read(id)
-        raise ArgumentError unless id
-        request.get('my/packages/' + id.to_s)
-      end
+module Smartdc::Api
+  module Packages
+    def packages(params={})
+      get 'my/packages', params
+    end
 
-      def all(query={})
-        request.get('my/packages', query)
-      end
+    def package(id)
+      get 'my/packages/' + id.to_s
     end
   end
 end
-

data/lib/smartdc/auth.rb

@@ -1,12 +1,46 @@
 require 'openssl'
 
 module Smartdc
-  module Auth
-    def self.sign(request={}, options={})
-      rsa = OpenSSL::PKey::RSA.new File.read options[:rsa_path]
+  class Auth
+    attr_reader :username, :rsa_path, :use_key
+
+    def initialize(options={})
+      @username = options[:username]
+      @rsa_path = options[:rsa_path]
+      @use_key = options[:use_key]
+    end
+
+    def find_key_file
+      path = File.expand_path(self.rsa_path)
+      if File.directory?(path)
+        Dir[File.join(path, '*')].each do |path|
+          return path if File.file?(path) and self.use_key == self.fingerprint(path)
+        end
+        return ''
+      else
+        return path
+      end
+    end
+
+    def read_key_file(path)
+      OpenSSL::PKey::RSA.new(File.read(File.expand_path(path)), '')
+    end
+
+    def signature(data)
+      rsa = read_key_file(self.find_key_file)
       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}"
+      str = [rsa.sign(sha256, data)].pack('m').delete("\r\n")
+      "Signature keyId=\"/#{self.username}/keys/#{self.use_key}\",algorithm=\"rsa-sha256\" #{str}"
+    rescue
+      ''
+    end
+
+    def fingerprint(path)
+      rsa = read_key_file(path)
+      str = [7].pack('N') + 'ssh-rsa' + rsa.public_key.e.to_s(0) + rsa.public_key.n.to_s(0)
+      OpenSSL::Digest::MD5.hexdigest(str).scan(/../).join(':')
+    rescue
+      ''
     end
   end
 end