smartdc 0.3.0 → 0.4.0

data/bin/sdc-setup

@@ -35,29 +35,33 @@ if config[:password].size == 0
   exit 1
 end
 
+config[:format] = 'json'
+
 Pathname.new(File.dirname(CONFIG)).mkpath unless File.exist?(File.dirname(CONFIG))
 File.open(CONFIG, 'w') do |file|
   file.write MultiJson.encode(config)
 end
 
 begin
+  client.format = 'mash'
   datacenters = client.datacenters.find
   if client.datacenters.find.first[1] == config[:url]
     puts 'Successful configuration.'
 
+    client.format = 'json'
     Pathname.new(File.dirname(DATASETS)).mkpath unless File.exist?(File.dirname(DATASETS))
     File.open(DATASETS, 'w') do |file|
-      file.write MultiJson.encode(client.datasets.find)
+      file.write client.datasets.find
     end
 
     Pathname.new(File.dirname(PACKAGES)).mkpath unless File.exist?(File.dirname(PACKAGES))
     File.open(PACKAGES, 'w') do |file|
-      file.write MultiJson.encode(client.packages.find)
+      file.write client.packages.find
     end
   else
     puts 'Failed Configuration.'
   end
 rescue => e
-  puts e
+  puts e.inspect
   puts 'Failed Setup.'
 end

data/bin/sdc-startmachine

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.machines(ARGV[0]).start
+  client.machines(ARGV[0]).start
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"
 end

data/bin/sdc-startmachinefromsnapshot

@@ -21,8 +21,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
-  puts client.machines(ARGV[0]).snapshots(options[:name]).start 
+  client.machines(ARGV[0]).snapshots(options[:name]).start 
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"
 end

data/bin/sdc-stopmachine

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.machines(ARGV[0]).stop
+  client.machines(ARGV[0]).stop
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"
 end

data/lib/smartdc.rb

@@ -1,5 +1,6 @@
 require 'smartdc/client'
 require 'smartdc/request'
+require 'smartdc/error'
 
 module Smartdc
   def self.new(options={})

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

@@ -18,12 +18,11 @@ module Smartdc::Api
       end
 
       def find(params={})
-        request.get('my/analytics/instrumentations/', params)
+        request.get('my/analytics/instrumentations', params)
       end
 
       def delete
         request.delete('my/analytics/instrumentations/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
 
       def value

data/lib/smartdc/api/keys.rb

@@ -24,7 +24,6 @@ module Smartdc
       def delete
         raise ArgumentError unless id
         request.delete('my/keys/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
     end
   end

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

@@ -19,12 +19,11 @@ module Smartdc::Api
       end
 
       def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/metadata/', params)
+        request.get('my/machines/' + @id1.to_s + '/metadata', params)
       end
 
       def delete
         request.delete('my/machines/' + @id1.to_s + '/metadata/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
     end
   end

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

@@ -16,7 +16,6 @@ module Smartdc::Api
       def start
         raise ArgumentError unless id
         request.post('my/machines/' + @id1.to_s + '/snapshots/' + id.to_s)
-        request.response.status == 202 ? true : false
       end
 
       def read
@@ -25,12 +24,11 @@ module Smartdc::Api
       end
 
       def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/snapshots/', params)
+        request.get('my/machines/' + @id1.to_s + '/snapshots', params)
       end
 
       def delete
         request.delete('my/machines/' + @id1.to_s + '/snapshots/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
     end
   end

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

@@ -19,12 +19,11 @@ module Smartdc::Api
       end
 
       def find(params={})
-        request.get('my/machines/' + @id1.to_s + '/tags/', params)
+        request.get('my/machines/' + @id1.to_s + '/tags', params)
       end
 
       def delete
         request.delete('my/machines/' + @id1.to_s + '/tags/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
     end
   end

data/lib/smartdc/api/machines.rb

@@ -28,32 +28,27 @@ module Smartdc
       def delete
         raise ArgumentError unless id
         request.delete('my/machines/' + id.to_s)
-        request.response.status == 204 ? true : false
       end
 
       def stop
         raise ArgumentError unless id
         request.post('my/machines/' + id.to_s, {'action'=>'stop'})
-        request.response.status == 202 ? true : false
       end
 
       def start
         raise ArgumentError unless id
         request.post('my/machines/' + id.to_s, {'action'=>'start'})
-        request.response.status == 202 ? true : false
       end
 
       def reboot
         raise ArgumentError unless id 
         request.post('my/machines/' + id.to_s, {'action'=>'reboot'})
-        request.response.status == 202 ? true : false
       end
 
       def resize(params={})
         raise ArgumentError unless id
         params[:action] = 'resize'
         request.post('my/machines/' + id.to_s, params)
-        request.response.status == 202 ? true : false
       end
 
       def tags(_id=nil)

data/lib/smartdc/client.rb

@@ -13,6 +13,10 @@ module Smartdc
       @request ||= Smartdc::Request.new(options)
     end
 
+    def format=(format)
+      @request.format = format
+    end
+
     def keys(id=nil)
       Smartdc::Api::Keys.new(request, id)
     end

data/lib/smartdc/error.rb

@@ -0,0 +1,35 @@
+module Smartdc
+  class Error < StandardError
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+      begin
+        body = JSON.parse(response[:body])
+        if body['error_message']
+          super(body['error_message'])
+        else
+          super(response[:body])
+        end
+      rescue
+        super(response[:body])
+      end
+    end
+
+    def response_status
+      response[:status]
+    end
+  end
+
+  class Error::BadRequest < Smartdc::Error; end
+  class Error::Unauthorized < Smartdc::Error; end
+  class Error::Forbidden < Smartdc::Error; end
+  class Error::NotFound < Smartdc::Error; end
+  class Error::MethodNotAllowed < Smartdc::Error; end
+  class Error::NotAcceptable < Smartdc::Error; end
+  class Error::Conflict < Smartdc::Error; end
+  class Error::InternalServerError < Smartdc::Error; end
+  class Error::NotImplemented < Smartdc::Error; end
+  class Error::BadGateway < Smartdc::Error; end
+  class Error::ServiceUnavailable < Smartdc::Error; end
+end

data/lib/smartdc/request.rb

@@ -1,19 +1,21 @@
 require 'hashie/mash'
 require 'multi_json'
 require 'faraday'
-require 'faraday/response/mashify'
-require 'faraday/response/parse_json'
+require 'smartdc/response/mashify'
+require 'smartdc/response/parse_json'
+require 'smartdc/response/raise_error'
 
 module Smartdc
   class Request
-    attr_reader :url, :version, :response, :username, :password
-    attr_accessor :return_variable
+    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']
     end
 
     def get(path, params={})
@@ -34,7 +36,7 @@ module Smartdc
 
   private
     def request(method, path, params={})
-      @response = connection.send(method) do |request|
+      response = connection.send(method) do |request|
         case method
         when :get
           request.url path, params
@@ -46,11 +48,11 @@ module Smartdc
           request.headers = {'content-length'=>'0'}  
         end
       end
-      @response.body
+      response.body
     end
 
     def connection
-      case return_variable
+      case format
       when 'mash', nil
         middleware = 3
       when 'hash'
@@ -72,14 +74,15 @@ module Smartdc
 
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::JSON
-        builder.use Faraday::Response::Mashify   if middleware > 2
-        builder.use Faraday::Response::ParseJson if middleware > 1
+        builder.use Smartdc::Response::Mashify   if middleware > 2
+        builder.use Smartdc::Response::ParseJson if middleware > 1
+        builder.use Smartdc::Response::RaiseError
         builder.adapter Faraday.default_adapter
       end
     end
 
     def basic_auth(username, password)
-      'Basic ' + Base64.encode64("#{username}:#{password}").gsub!("\n", '')
+      'Basic ' + ["#{username}:#{password}"].pack('m').delete("\r\n")
     end
   end
 end

data/lib/smartdc/response/mashify.rb

@@ -0,0 +1,29 @@
+require 'faraday'
+
+module Smartdc
+  module Response
+    class Mashify < Faraday::Response::Middleware
+      class << self
+        attr_accessor :mash_class
+      end
+
+      dependency do
+        require 'hashie/mash'
+        self.mash_class = ::Hashie::Mash
+      end
+      
+      def parse(body)
+        case body
+        when Hash
+          self.class.mash_class.new(body)
+        when Array
+          body.map { |item| item.is_a?(Hash) ? self.class.mash_class.new(item) : item }
+        else
+          body
+        end
+      rescue
+        body
+      end
+    end
+  end
+end

data/lib/smartdc/response/parse_json.rb

@@ -0,0 +1,26 @@
+require 'faraday'
+
+module Smartdc
+  module Response
+    class ParseJson < Faraday::Response::Middleware
+      dependency do
+        require 'multi_json'
+      end
+
+      def parse(body)
+        case body
+        when ''
+          nil
+        when 'true'
+          true
+        when 'false'
+          false
+        else
+          ::MultiJson.decode(body)
+        end
+      rescue
+        body
+      end
+    end
+  end
+end

data/lib/smartdc/response/raise_error.rb

@@ -0,0 +1,38 @@
+require 'faraday'
+
+module Smartdc
+  module Response
+    class RaiseError < Faraday::Response::Middleware
+      def on_complete(env)
+        case env[:status]
+        when 400
+          raise Smartdc::Error::BadRequest, response_values(env)
+        when 401
+          raise Smartdc::Error::Unauthorized, response_values(env)
+        when 403
+          raise Smartdc::Error::Forbidden, response_values(env)
+        when 404
+          raise Smartdc::Error::NotFound, response_values(env)
+        when 405
+          raise Smartdc::Error::MethodNotAllowed, response_values(env)
+        when 406
+          raise Smartdc::Error::NotAcceptable, response_values(env)
+        when 409
+          raise Smartdc::Error::Conflict, response_values(env)
+        when 500
+          raise Smartdc::Error::InternalServerError, response_values(env)
+        when 501 
+          raise Smartdc::Error::NotImplemented, response_values(env)
+        when 502
+          raise Smartdc::Error::BadGateway, response_values(env)
+        when 503
+          raise Smartdc::Error::ServiceUnavailable, response_values(env)
+        end
+      end
+
+      def response_values(env)
+        {:status => env[:status], :headers => env[:response_headers], :body => env[:body]}
+      end
+    end
+  end
+end

data/smartdc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "smartdc"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ogom"]
-  s.date = "2011-12-03"
+  s.date = "2012-03-08"
   s.description = "smartdc is SmartDataCenter Public API."
   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"]
@@ -63,8 +63,6 @@ Gem::Specification.new do |s|
     "config/fixtures/key.json",
     "config/fixtures/tag.json",
     "lib/cli_helper.rb",
-    "lib/faraday/response/mashify.rb",
-    "lib/faraday/response/parse_json.rb",
     "lib/smartdc.rb",
     "lib/smartdc/api/analytics.rb",
     "lib/smartdc/api/analytics/instrumentations.rb",
@@ -77,7 +75,11 @@ Gem::Specification.new do |s|
     "lib/smartdc/api/machines.rb",
     "lib/smartdc/api/packages.rb",
     "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/raise_error.rb",
     "smartdc.gemspec",
     "spec/smartdc/api/analytics_spec.rb",
     "spec/smartdc/api/datacenters_spec.rb",
@@ -96,42 +98,42 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ogom/ruby-smartdc"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "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.5"])
+      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.0.3"])
-      s.add_runtime_dependency(%q<multipart-post>, ["~> 1.1.3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.7.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.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 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"])
     else
-      s.add_dependency(%q<faraday>, ["~> 0.7.5"])
+      s.add_dependency(%q<faraday>, ["~> 0.7.6"])
       s.add_dependency(%q<hashie>, ["~> 1.2.0"])
-      s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_dependency(%q<multipart-post>, ["~> 1.1.3"])
-      s.add_dependency(%q<rspec>, ["~> 2.7.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.6.4"])
-      s.add_dependency(%q<rcov>, [">= 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"])
     end
   else
-    s.add_dependency(%q<faraday>, ["~> 0.7.5"])
+    s.add_dependency(%q<faraday>, ["~> 0.7.6"])
     s.add_dependency(%q<hashie>, ["~> 1.2.0"])
-    s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-    s.add_dependency(%q<multipart-post>, ["~> 1.1.3"])
-    s.add_dependency(%q<rspec>, ["~> 2.7.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.6.4"])
-    s.add_dependency(%q<rcov>, [">= 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"])
   end
 end