ucloud_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c16ec3171741a707d8c90935f23adb7d6247980
-  data.tar.gz: 99ac80bd9fb69a049da70ece285d2df390e804b0
+  metadata.gz: b8c8c290d068269a4029f53ce70c32346a9f8f44
+  data.tar.gz: e53fb65a84f32b8754efd8bbd7e0d9cc871195fb
 SHA512:
-  metadata.gz: bc09d2598799c3c1a71ac137071c85ba1cb88ab57c71f5e3562bea21aa001c0cbca653686fe4a676cb101aa0498acc350af2d51cad56b8ce1db10db063682f9c
-  data.tar.gz: 2f25423569c1630cb6c8b4403fa8a9b3e1e0304adc098d02e09b393aa3ce6b721f773120acd1daf00ed507afc4fc57f43ddf7ffe9354615594f97ac6b4eaad1d
+  metadata.gz: e2641498f3d0e6a34a3c33c7d62f047c99bf3337a1b16ecbf16bed5bae9b42bc1547106d983558d55d5746d7d07cbba4b107cbb9b93f8c911f988991fd536c1f
+  data.tar.gz: 9f654b32ea14bba2c245df358d04d6341faabcdd8d52d7a42b8efb8c102a1430ecb18f05f4f53f044cc6c690623a8baa7a6274a261b870596fd52b989ce4b8e1

data/lib/ucloud_api.rb

@@ -1,62 +1,4 @@
-
+$:.unshift(File.dirname(__FILE__))
 require "ucloud_api/version"
-require 'base64'
-require 'openssl'
-require 'addressable/uri'
-require 'httparty'
-
-module UcloudApi
-  
-  class Client
-    include HTTParty
-    base_uri 'https://api.ucloudbiz.olleh.com/server/v1/client'
-    format :json # spechify resonse format
-    
-    # debug_output $stderr
-    
-    def initialize(apikey=nil, secretkey=nil)
-      @apikey = apikey || ENV["UCLOUDAPIKEY"]
-      @secretkey = secretkey || ENV["UCLOUDSECRET"]
-    end
-
-    def raw_cmd options={}
-      uri = Addressable::URI.new
-      hashable_opt = options.merge( {:apiKey => @apikey, :response=>"json"} )
-      uri.query_values = hashable_opt.sort
-      hmac = OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), uri.query.downcase, @secretkey)
-      signature = Base64.encode64("#{OpenSSL::HMAC.digest('sha1', @secretkey, uri.query.downcase)}")[0..-2]
-      query =  options.merge( {:response=>"json", :apiKey=>@apikey, :signature => signature } )
-      self.class.get "/api" , :query => query
-    end
-
-    def self.list_styled command, listname
-      class_eval <<"EOD"
-  def #{command}(*args, &block)
-    h = Hash[*args]
-    h[:command] = "#{command}"
-    response = raw_cmd(h)
-    list = response.parsed_response["#{command.to_s.downcase}response"]["#{listname}"]
-    yield(list) if block_given?
-    list
-  end
-EOD
-    end
-
-    list_styled "listAvailableProductTypes", "producttypes"
-    list_styled "listVirtualMachines", "virtualmachine"
-    list_styled "listTemplates", "template"
-    list_styled "listZones", "zone"
-    list_styled "listNetworks", "network"
-
-    # def method_missing m, *args, &block
-    #   h = Hash[*args]
-    #   h[:command] = m.to_s
-    #   response = raw_cmd(h)
-    #   r = response.parsed_response["#{m.to_s.downcase}response"]
-    #   yield(r) if block_given?
-    #   r
-    # end
-    
-  end
-  
-end
+require "ucloud_api/client"
+require "ucloud_api/storage"

data/lib/ucloud_api/client.rb

@@ -0,0 +1,63 @@
+
+require 'base64'
+require 'openssl'
+require 'addressable/uri'
+require 'httparty'
+
+module UcloudApi
+  
+  class Client
+    include HTTParty
+    base_uri 'https://api.ucloudbiz.olleh.com/server/v1/client'
+    format :json # specify resonse format
+    
+    # debug_output $stderr
+    
+    def initialize(apikey=nil, secretkey=nil)
+      @apikey = apikey || ENV["UCLOUDAPIKEY"]
+      @secretkey = secretkey || ENV["UCLOUDSECRET"]
+    end
+
+    def raw_cmd options={}
+      uri = Addressable::URI.new
+      hashable_opt = options.merge( {:apiKey => @apikey, :response=>"json"} )
+      uri.query_values = hashable_opt.sort
+      hmac = OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), uri.query.downcase, @secretkey)
+      signature = Base64.encode64("#{OpenSSL::HMAC.digest('sha1', @secretkey, uri.query.downcase)}")[0..-2]
+      query =  options.merge( {:response=>"json", :apiKey=>@apikey, :signature => signature } )
+      self.class.get "/api" , :query => query
+    end
+
+    def self.list_styled command, listname
+      class_eval <<"EOD"
+  def #{command}(*args, &block)
+    h = Hash[*args]
+    h[:command] = "#{command}"
+    response = raw_cmd(h)
+    list = response.parsed_response["#{command.to_s.downcase}response"]["#{listname}"]
+    yield(list) if block_given?
+    list
+  end
+EOD
+    end
+
+    list_styled "listAvailableProductTypes", "producttypes"
+    list_styled "listVirtualMachines", "virtualmachine"
+    list_styled "listVolumes", "volume"
+    list_styled "listSnapshots", "snapshot"
+    list_styled "listTemplates", "template"
+    list_styled "listZones", "zone"
+    list_styled "listNetworks", "network"
+
+    # def method_missing m, *args, &block
+    #   h = Hash[*args]
+    #   h[:command] = m.to_s
+    #   response = raw_cmd(h)
+    #   r = response.parsed_response["#{m.to_s.downcase}response"]
+    #   yield(r) if block_given?
+    #   r
+    # end
+    
+  end
+  
+end

data/lib/ucloud_api/storage.rb

@@ -0,0 +1,82 @@
+require 'uri'
+require 'httparty'
+
+module UcloudApi
+  
+  class Storage
+    include HTTParty
+    
+    format :json # specify resonse format
+    
+    # debug_output $stderr
+    
+    def initialize(user=nil, pass=nil)
+      @user = user || ENV["UCLOUD_STORAGE_USER"]
+      @pass = pass || ENV["UCLOUD_STORAGE_PASS"]
+    end
+
+    def auth
+      auth_url = 'https://api.ucloudbiz.olleh.com/storage/v1/auth'
+      response = self.class.get auth_url , :headers => { "X-Storage-User" => @user, "X-Storage-Pass"=> @pass }
+      headers = response.headers
+      @storage_url = headers["X-Storage-Url"]
+      @auth_token = headers["X-Auth-Token"]
+      response
+    end
+
+    # http://developer.ucloudbiz.olleh.com/doc/swift/Account/GET-Storage-account/
+    def get path, options = {}
+      url = File.join @storage_url,path
+      params = { format: "json" }.merge options
+      response = self.class.get url, :query => params, :headers=> {"X-Auth-Token"=> @auth_token}
+      response.parsed_response
+    end
+
+    def head path, options = {}
+      url = File.join @storage_url,path
+      params = { format: "json" }.merge options
+      self.class.head url, :query => params, :headers=> {"X-Auth-Token"=> @auth_token}
+    end
+
+
+  end
+
+
+  class StorageReseller
+    include HTTParty
+    
+    format :json # specify resonse format
+    
+    # debug_output $stderr
+    
+    def initialize(reseller_admin_user=nil, reseller_admin_pass=nil, reseller_user = nil)
+      @reseller_admin = reseller_admin_user || ENV["UCLOUD_STORAGE_RESELLER_ADMIN"]
+      @reseller_admin_pass = reseller_admin_pass || ENV["UCLOUD_STORAGE_RESELLER_ADMIN_PASS"]
+      @reseller_user = reseller_user || ENV["UCLOUD_STORAGE_RESELLER_USER"]
+    end
+  
+    def auth
+      auth_url = 'https://api.ucloudbiz.olleh.com/storage/v1/auth'
+      headers = {
+        "X-Storage-User" => "#@reseller_user:#@reseller_admin",
+        "X-Storage-Pass"=> @reseller_admin_pass }
+      response = self.class.get auth_url , :headers => headers
+      headers = response.headers
+      @storage_url = headers["X-Storage-Url"]
+      @auth_token = headers["X-Auth-Token"]
+      response
+    end
+    
+    def add_user user, pass
+      auth_url = File.join "https://ssproxy.ucloudbiz.olleh.com", "/auth/v2/#@reseller_user/#{user}"
+      #auth_url = "https://api.ucloudbiz.olleh.com/v2/#@reseller_user/#{user}"
+      headers = {
+        "X-Auth-Admin-User" => @reseller_admin,
+        "X-Auth-Admin-Key" => @reseller_admin_pass,
+        "X-Auth-User-Key" => pass }      
+      self.class.put auth_url, :headers => headers
+    end
+      
+  end
+  
+end

data/lib/ucloud_api/version.rb

@@ -1,3 +1,3 @@
 module UcloudApi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucloud_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - BJ Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,8 @@ files:
 - README.md
 - Rakefile
 - lib/ucloud_api.rb
+- lib/ucloud_api/client.rb
+- lib/ucloud_api/storage.rb
 - lib/ucloud_api/version.rb
 - ucloud_api.gemspec
 homepage: https://github.com/burnsssun/ucloud_api