smartdc 0.4.0 → 1.0.1

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

@@ -1,34 +1,34 @@
 module Smartdc::Api
   module Machine
     class Snapshots
-      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 + '/snapshots/', params)
+      def create(raw={})
+        request.post('my/machines/' + @id.to_s + '/snapshots/', raw)
       end
-      
-      def start
+
+      def read(id)
         raise ArgumentError unless id
-        request.post('my/machines/' + @id1.to_s + '/snapshots/' + id.to_s)
+        request.get('my/machines/' + @id.to_s + '/snapshots/' + id.to_s)
       end
 
-      def read
-        raise ArgumentError unless id
-        request.get('my/machines/' + @id1.to_s + '/snapshots/' + id.to_s)
+      def all(query={})
+        request.get('my/machines/' + @id.to_s + '/snapshots', query)
       end
 
-      def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/snapshots', params)
+      def destroy(id)
+        raise ArgumentError unless id
+        request.del('my/machines/' + @id.to_s + '/snapshots/' + id.to_s)
       end
 
-      def delete
-        request.delete('my/machines/' + @id1.to_s + '/snapshots/' + id.to_s)
+      def start(id)
+        raise ArgumentError unless id
+        request.post('my/machines/' + @id.to_s + '/snapshots/' + id.to_s)
       end
     end
   end

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

@@ -1,29 +1,28 @@
 module Smartdc::Api
   module Machine
     class Tags
-      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 + '/tags/', params)
+      def create(raw={})
+        request.post('my/machines/' + @id.to_s + '/tags/', raw)
       end
       
-      def read
+      def read(id)
         raise ArgumentError unless id
-        request.get('my/machines/' + @id1.to_s + '/tags/' + id.to_s)
+        request.get('my/machines/' + @id.to_s + '/tags/' + id.to_s)
       end
 
-      def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/tags', params)
+      def all(query={})
+        request.get('my/machines/' + @id.to_s + '/tags', query)
       end
 
-      def delete
-        request.delete('my/machines/' + @id1.to_s + '/tags/' + id.to_s)
+      def destroy(id=nil)
+        request.del('my/machines/' + @id.to_s + '/tags/' + id.to_s)
       end
     end
   end

data/lib/smartdc/api/machines.rb

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

data/lib/smartdc/api/packages.rb

@@ -1,21 +1,20 @@
 module Smartdc
   module Api
     class Packages
-      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/packages/' + id.to_s)
       end
 
-      def find(params={})
-        request.get('my/packages', params)
+      def all(query={})
+        request.get('my/packages', query)
       end
     end
   end
-end
+end

data/lib/smartdc/client.rb

@@ -7,38 +7,34 @@ require 'smartdc/api/analytics'
 
 module Smartdc
   class Client
-    attr_reader :request
+    attr_reader :options
 
     def initialize(options={})
-      @request ||= Smartdc::Request.new(options)
+      @options ||= options
     end
 
-    def format=(format)
-      @request.format = format
+    def keys()
+      Smartdc::Api::Keys.new(options)
     end
 
-    def keys(id=nil)
-      Smartdc::Api::Keys.new(request, id)
+    def datacenters()
+      Smartdc::Api::Datacenters.new(options)
     end
 
-    def datacenters(id=nil)
-      Smartdc::Api::Datacenters.new(request, id)
+    def datasets()
+      Smartdc::Api::Datasets.new(options)
     end
 
-    def datasets(id=nil)
-      Smartdc::Api::Datasets.new(request, id)
+    def packages()
+      Smartdc::Api::Packages.new(options)
     end
 
-    def packages(id=nil)
-      Smartdc::Api::Packages.new(request, id)
+    def machines()
+    	Smartdc::Api::Machines.new(options)
     end
 
-    def machines(id=nil)
-    	Smartdc::Api::Machines.new(request, id)
-    end
-
-    def analytics(id=nil)
-      Smartdc::Api::Analytics.new(request, id)
+    def analytics()
+      Smartdc::Api::Analytics.new(options)
     end
   end
 end

data/lib/smartdc/request.rb

@@ -1,88 +1,78 @@
-require 'hashie/mash'
-require 'multi_json'
+require 'json'
 require 'faraday'
-require 'smartdc/response/mashify'
-require 'smartdc/response/parse_json'
 require 'smartdc/response/raise_error'
 
 module Smartdc
   class Request
-    attr_reader :url, :version, :username, :password
-    attr_accessor :format
-
     def initialize(options)
-      @url = options['url']
-      @version = options['version']
-      @username = options['username']
-      @password = options['password']
-      @format = options['format']
+      @options = options
     end
 
-    def get(path, params={})
-      request(:get, path, params)
+    def get(path, query={})
+      request(:get, path, query, {})
     end
 
-    def post(path, params={})
-      request(:post, path, params)
+    def post(path, raw={})
+      request(:post, path, {}, raw)
     end
 
-    def put(path, params={})
-      request(:put, path, params)
+    def put(path, raw={})
+      request(:put, path, {}, raw)
     end
 
-    def delete(path, params={})
-      request(:delete, path, params)
+    def del(path, query={})
+      request(:delete, path, query, {})
     end
 
-  private
-    def request(method, path, params={})
-      response = connection.send(method) do |request|
+    def request(method, path, query={}, raw={})
+      res = connection.send(method) do |req|
         case method
         when :get
-          request.url path, params
+          req.url path, query
         when :post, :put
-          request.path = path
-          request.body = MultiJson.encode(params) unless params.empty?
+          req.path = path
+          req.body = raw.to_json unless raw.empty?
         when :delete
-          request.url path
-          request.headers = {'content-length'=>'0'}  
+          req.url path
+        end
+
+        if @options[:debug]
+          print 'Request: '
+          puts "method: #{req.method.to_s}"
+          puts "path: #{req.path}"
+          puts "params: #{req.params}"
+          puts "headers: #{req.headers}"
+          puts "body: #{req.body}"
         end
       end
-      response.body
-    end
 
-    def connection
-      case format
-      when 'mash', nil
-        middleware = 3
-      when 'hash'
-        middleware = 2
-      when 'json'
-        middleware = 1
-      else
-        middleware = 0
+      if @options[:debug]
+        print 'Response: '
+        puts "status: #{res.status}"
+        puts "headers: #{res.headers}"
+        puts "body: #{res.body}"
       end
 
+      Smartdc::Response.new(res)
+    end
+
+  private
+
+    def connection
       options = {
-        :url => url,
+        :url => 'https://' + @options[:hostname],
         :ssl => {:verify => false},
         :headers => {
-          'authorization' => basic_auth(username, password),
-          'X-Api-Version' => version
+          'Content-Type'=>'application/json',
+          'X-Api-Version' => @options[:version]
         }
       }
 
       Faraday.new(options) do |builder|
-        builder.use Faraday::Request::JSON
-        builder.use Smartdc::Response::Mashify   if middleware > 2
-        builder.use Smartdc::Response::ParseJson if middleware > 1
-        builder.use Smartdc::Response::RaiseError
+        builder.request :basic_auth, @options[:username], @options[:password]
+        # builder.use Smartdc::Response::RaiseError
         builder.adapter Faraday.default_adapter
       end
     end
-
-    def basic_auth(username, password)
-      'Basic ' + ["#{username}:#{password}"].pack('m').delete("\r\n")
-    end
   end
 end

data/lib/smartdc/response.rb

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

data/lib/smartdc/response/raise_error.rb

@@ -1,7 +1,7 @@
 require 'faraday'
 
 module Smartdc
-  module Response
+  class Response
     class RaiseError < Faraday::Response::Middleware
       def on_complete(env)
         case env[:status]

data/smartdc.gemspec

@@ -5,67 +5,30 @@
 
 Gem::Specification.new do |s|
   s.name = "smartdc"
-  s.version = "0.4.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ogom"]
-  s.date = "2012-03-08"
-  s.description = "smartdc is SmartDataCenter Public API."
+  s.date = "2012-12-16"
+  s.description = "SmartDataCenter client and SmartDataCenter Command Line Interface."
   s.email = "ogom@hotmail.co.jp"
-  s.executables = ["sdc-addmachinemetadata", "sdc-addmachinetag", "sdc-createinstrumentation", "sdc-createkey", "sdc-createmachine", "sdc-createmachinesnapshot", "sdc-deleteinstrumentation", "sdc-deletekey", "sdc-deletemachine", "sdc-deletemachinemetadata", "sdc-deletemachinesnapshot", "sdc-deletemachinetag", "sdc-describeanalytics", "sdc-getdatacenter", "sdc-getdataset", "sdc-getinstrumentation", "sdc-getkey", "sdc-getmachine", "sdc-getmachinemetadata", "sdc-getmachinesnapshot", "sdc-getmachinetag", "sdc-getpackage", "sdc-listdatacenters", "sdc-listdatasets", "sdc-listinstrumentations", "sdc-listkeys", "sdc-listmachines", "sdc-listmachinesnapshots", "sdc-listmachinetags", "sdc-listpackages", "sdc-rebootmachine", "sdc-resizemachine", "sdc-setup", "sdc-startmachine", "sdc-startmachinefromsnapshot", "sdc-stopmachine"]
+  s.executables = ["sdc"]
   s.extra_rdoc_files = [
-    "LICENSE.md",
     "README.md"
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
-    "LICENSE.md",
     "README.md",
+    "Rakefile",
     "VERSION",
-    "bin/sdc-addmachinemetadata",
-    "bin/sdc-addmachinetag",
-    "bin/sdc-createinstrumentation",
-    "bin/sdc-createkey",
-    "bin/sdc-createmachine",
-    "bin/sdc-createmachinesnapshot",
-    "bin/sdc-deleteinstrumentation",
-    "bin/sdc-deletekey",
-    "bin/sdc-deletemachine",
-    "bin/sdc-deletemachinemetadata",
-    "bin/sdc-deletemachinesnapshot",
-    "bin/sdc-deletemachinetag",
-    "bin/sdc-describeanalytics",
-    "bin/sdc-getdatacenter",
-    "bin/sdc-getdataset",
-    "bin/sdc-getinstrumentation",
-    "bin/sdc-getkey",
-    "bin/sdc-getmachine",
-    "bin/sdc-getmachinemetadata",
-    "bin/sdc-getmachinesnapshot",
-    "bin/sdc-getmachinetag",
-    "bin/sdc-getpackage",
-    "bin/sdc-listdatacenters",
-    "bin/sdc-listdatasets",
-    "bin/sdc-listinstrumentations",
-    "bin/sdc-listkeys",
-    "bin/sdc-listmachines",
-    "bin/sdc-listmachinesnapshots",
-    "bin/sdc-listmachinetags",
-    "bin/sdc-listpackages",
-    "bin/sdc-rebootmachine",
-    "bin/sdc-resizemachine",
-    "bin/sdc-setup",
-    "bin/sdc-startmachine",
-    "bin/sdc-startmachinefromsnapshot",
-    "bin/sdc-stopmachine",
-    "config/fixtures/instrumentation.json",
-    "config/fixtures/key.json",
-    "config/fixtures/tag.json",
+    "bin/sdc",
     "lib/cli_helper.rb",
+    "lib/configure.rb",
     "lib/smartdc.rb",
     "lib/smartdc/api/analytics.rb",
-    "lib/smartdc/api/analytics/instrumentations.rb",
+    "lib/smartdc/api/analytics/heatmap.rb",
     "lib/smartdc/api/datacenters.rb",
     "lib/smartdc/api/datasets.rb",
     "lib/smartdc/api/keys.rb",
@@ -77,64 +40,62 @@ Gem::Specification.new do |s|
     "lib/smartdc/client.rb",
     "lib/smartdc/error.rb",
     "lib/smartdc/request.rb",
-    "lib/smartdc/response/mashify.rb",
-    "lib/smartdc/response/parse_json.rb",
+    "lib/smartdc/response.rb",
     "lib/smartdc/response/raise_error.rb",
     "smartdc.gemspec",
-    "spec/smartdc/api/analytics_spec.rb",
-    "spec/smartdc/api/datacenters_spec.rb",
-    "spec/smartdc/api/datasets_spec.rb",
-    "spec/smartdc/api/keys_spec.rb",
-    "spec/smartdc/api/machine/metadata_spec.rb",
-    "spec/smartdc/api/machine/snapshots_spec.rb",
-    "spec/smartdc/api/machine/tags_spec.rb",
-    "spec/smartdc/api/machines_spec.rb",
-    "spec/smartdc/api/packages_spec.rb",
-    "spec/smartdc/client_spec.rb",
-    "spec/smartdc/request_spec.rb",
-    "spec/smartdc_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/fixtures/analytics.json",
+    "spec/fixtures/datacenter.json",
+    "spec/fixtures/datacenters.json",
+    "spec/fixtures/datasets.json",
+    "spec/fixtures/keys.json",
+    "spec/fixtures/machines.json",
+    "spec/fixtures/packages.json",
+    "spec/fixtures/snapshots.json",
+    "spec/fixtures/tag.json",
+    "spec/spec_helper.rb",
+    "spec/unit/smartdc/api/analytics_spec.rb",
+    "spec/unit/smartdc/api/datacenters_spec.rb",
+    "spec/unit/smartdc/api/datasets_spec.rb",
+    "spec/unit/smartdc/api/keys_spec.rb",
+    "spec/unit/smartdc/api/machine/metadata_spec.rb",
+    "spec/unit/smartdc/api/machine/snapshots_spec.rb",
+    "spec/unit/smartdc/api/machine/tags_spec.rb",
+    "spec/unit/smartdc/api/machines_spec.rb",
+    "spec/unit/smartdc/api/packages_spec.rb",
+    "spec/unit/smartdc/client_spec.rb",
+    "spec/unit/smartdc_spec.rb"
   ]
   s.homepage = "http://github.com/ogom/ruby-smartdc"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "SmartDataCenter CloudApi client by ruby."
+  s.rubygems_version = "1.8.23"
+  s.summary = "Joyent SmartDataCenter CloudApi client by ruby."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.7.6"])
-      s.add_runtime_dependency(%q<hashie>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<multipart-post>, ["~> 1.1.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rcov>, ["~> 0.9.11"])
-      s.add_development_dependency(%q<uuid>, ["~> 2.3.4"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.8"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.16"])
+      s.add_runtime_dependency(%q<terminal-table>, ["~> 1.4"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12"])
     else
-      s.add_dependency(%q<faraday>, ["~> 0.7.6"])
-      s.add_dependency(%q<hashie>, ["~> 1.2.0"])
-      s.add_dependency(%q<multi_json>, ["~> 1.1.0"])
-      s.add_dependency(%q<multipart-post>, ["~> 1.1.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rcov>, ["~> 0.9.11"])
-      s.add_dependency(%q<uuid>, ["~> 2.3.4"])
+      s.add_dependency(%q<faraday>, ["~> 0.8"])
+      s.add_dependency(%q<thor>, ["~> 0.16"])
+      s.add_dependency(%q<terminal-table>, ["~> 1.4"])
+      s.add_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.12"])
     end
   else
-    s.add_dependency(%q<faraday>, ["~> 0.7.6"])
-    s.add_dependency(%q<hashie>, ["~> 1.2.0"])
-    s.add_dependency(%q<multi_json>, ["~> 1.1.0"])
-    s.add_dependency(%q<multipart-post>, ["~> 1.1.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rcov>, ["~> 0.9.11"])
-    s.add_dependency(%q<uuid>, ["~> 2.3.4"])
+    s.add_dependency(%q<faraday>, ["~> 0.8"])
+    s.add_dependency(%q<thor>, ["~> 0.16"])
+    s.add_dependency(%q<terminal-table>, ["~> 1.4"])
+    s.add_dependency(%q<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.12"])
   end
 end