aliyun-api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d3ac4b3cbdf248bfb914946e63c7452e677a1b
-  data.tar.gz: 0f88ba22119aa5a5a9b8aa265e36804acd4ab32c
+  metadata.gz: 1887a58979178cebc960a86c6f55725a37689746
+  data.tar.gz: f5a013e26a88226cfa4e1a8c41cb36f9f6038fe9
 SHA512:
-  metadata.gz: 4da9e60b500b9c696238cefd53cd8c01c91f007a04dba02a01f5865ac093ac4f1794c4fa90827eddc538b8c7e8ce6008d93a1a7b346ac8d7b05560efabd14a8a
-  data.tar.gz: b353b8388b9251d040ec0f3b846e925363aea0a3d8c33306ba4c7254108f0ef4eb57ab3cd3dafa88c53163f618d6c65c3b4ea709f17e92ddf278256c8036caa0
+  metadata.gz: 40bee8a5ed81ef666e5f7045263e13d425604a21807feeee117b75657b027d06a18afff69f7078660be52c37cdba42053ac947cbcececeec28a98dd0a226bb40
+  data.tar.gz: 52a9f5a0ccea503154f4ebcbb587823c9ba802cf7187d7690ae13878e4e499bea5f0c39ac6f769758195612f462232ab63c75a0611273a073a6a9d8c3c27d5c6

data/README.md

@@ -26,7 +26,20 @@ Or install it yourself as:
 require 'aliyun'
 ```
 
-然后利用自己阿里云账号下的access_key初始化ECS对象。如果没有access_key，可以通过[阿里云用户中心](https://i.aliyun.com/access_key/)申请access_key。
+### 配置aliyun的access_key
+
+1. 全局配置
+
+```
+options = {
+           :access_key_id => "xxxxxx", 
+           :access_key_secret => "yyyyyy" 
+           }
+Aliyun.config options
+ecs = Aliyun::ECS.new
+```
+
+2. 直接配置ECS客户端
 
 ```
 options = {
@@ -36,7 +49,17 @@ options = {
 ecs = Aliyun::ECS.new options
 ```
 
-这样, 你就可以根据 [阿里云弹性计算服务API参考手册](http://help.aliyun.com/view/11108189_13730407.html)初始化业务参数（除Action参数之外）为一个hash对象，并且将其作为参数传给Action方法（Action参数）。
+3. 环境变量
+
+如果环境变量里`ACCESS_KEY_ID`和`ACCESS_KEY_SECRET`初始化了密钥，那么可以直接初始化ecs：
+
+```
+ecs = Aliyun::ECS.new
+```
+
+### 调用ECS
+
+这样, 你就可以根据 [阿里云弹性计算服务API参考手册](http://help.aliyun.com/view/11108189_13730407.html)初始化业务参数（除Action参数之外）为一个hash对象，并且将其作为参数传给Action方法（Action参数）, action方法需要将阿里云手册中的Action名按ruby方式命名, 如：阿里云手册中的Action名`StartInstance`对应到这里的方法名为`start_instance`。
 
 ```
 parameters = {:parameter_name => parameter_value}
@@ -59,7 +82,7 @@ service.describe_images parameters
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/aliyun-api/fork )
+1. Fork it ( https://github.com/qjpcpu/aliyun-api/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/aliyun/ecs.rb

@@ -10,9 +10,9 @@ require 'json'
 module Aliyun
     class ECS
         def initialize(options={})
-            Aliyun.config.access_key_id ||= options[:access_key_id]
-            Aliyun.config.access_key_secret ||= options[:access_key_secret]
-            Aliyun.config.endpoint_url ||= options[:endpoint_url]
+            Aliyun[:access_key_id] = options[:access_key_id] || Aliyun[:access_key_id] || ENV['ACCESS_KEY_ID']
+            Aliyun[:access_key_secret] = options[:access_key_secret] || Aliyun[:access_key_secret] || ENV['ACCESS_KEY_SECRET']
+            Aliyun[:endpoint_url] ||= options[:endpoint_url]
         end
         
         def method_missing(method_name, *args)
@@ -25,19 +25,19 @@ module Aliyun
         def proxy_to_aliyun(method_name, params)
             params = build_request_parameters method_name, params
             begin
-                res = RestClient.get Aliyun.config.endpoint_url, {:params => params,:verify_ssl => OpenSSL::SSL::VERIFY_PEER }
+                res = RestClient.send Aliyun[:request_method].downcase, Aliyun[:endpoint_url], {:params => params,:verify_ssl => OpenSSL::SSL::VERIFY_PEER }
                 return JSON.parse res.body if res.code == 200
             rescue RestClient::Exception => rcex
-                raise AliyunError.new "response error code: #{rcex.response.code}\ndetails: #{rcex.response.body}\nrequest parameters: #{params}"
+                raise AliyunError.new "response error code: #{rcex.response.code}\ndetails: #{rcex.response.body}\nrequest parameters: #{params.reject{|k,v| k==:AccessKeyId}}"
             rescue =>e
                 raise AliyunError.new e.to_s
             end
         end
         
         def build_request_parameters(method_name, params={})
-            params = Aliyun.config.request_parameters.merge(params||{})
+            params = Aliyun[:request_parameters].merge(params||{})
             params.merge!({
-                              :AccessKeyId => Aliyun.config.access_key_id,
+                              :AccessKeyId => Aliyun[:access_key_id],
                               :Action => method_name.to_s,
                               :SignatureNonce => SecureRandom.uuid,
                               :TimeStamp => Time.now.utc.iso8601
@@ -57,8 +57,8 @@ module Aliyun
                 canonicalized_query_string << percent_encode(params[key])
             end
             length = canonicalized_query_string.length
-            string_to_sign = Aliyun.config.request_method + '&' + percent_encode('/') + '&' + percent_encode(canonicalized_query_string[1,length])
-            calculate_signature Aliyun.config.access_key_secret+"&", string_to_sign
+            string_to_sign = Aliyun[:request_method] + '&' + percent_encode('/') + '&' + percent_encode(canonicalized_query_string[1,length])
+            calculate_signature Aliyun[:access_key_secret]+"&", string_to_sign
         end
         
         def calculate_signature key, string_to_sign

data/lib/aliyun/version.rb

@@ -1,3 +1,3 @@
 module Aliyun
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

data/lib/aliyun.rb

@@ -7,7 +7,7 @@ module Aliyun
     class Config
         include Singleton
         attr_accessor :request_parameters, :access_key_id, :access_key_secret, :endpoint_url, :request_method
-        def initialize
+        def initialize()
             self.request_parameters={
                 :Format=>"JSON",
                 :Version=>"2014-05-26", 
@@ -15,10 +15,21 @@ module Aliyun
                 :SignatureVersion=>"1.0"
             }
             self.request_method = 'GET'
-            self.endpoint_url= 'https://ecs.aliyuncs.com/'
+            self.endpoint_url = 'https://ecs.aliyuncs.com/'
+            self.access_key_id = ENV['ACCESS_KEY_ID']
+            self.access_key_secret = ENV['ACCESS_KEY_SECRET']
         end
     end
-    def self.config
-        Config.instance
+    def self.[](key)
+        Config.instance.send key if Config.instance.respond_to? key
+    end
+    def self.[]=(key,value)
+        key="#{key}="
+        Config.instance.send key,value if Config.instance.respond_to? key
+    end
+    def self.config(cfg)
+        cfg.each do |k,v|
+            self[k]=v
+        end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - qjpcpu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler