aliyun-api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1887a58979178cebc960a86c6f55725a37689746
-  data.tar.gz: f5a013e26a88226cfa4e1a8c41cb36f9f6038fe9
+  metadata.gz: 4514ca60a9c639dd8499f2d8858693d2b1abba55
+  data.tar.gz: 4778b715ab3ef2debd86e371d929eb16a411f075
 SHA512:
-  metadata.gz: 40bee8a5ed81ef666e5f7045263e13d425604a21807feeee117b75657b027d06a18afff69f7078660be52c37cdba42053ac947cbcececeec28a98dd0a226bb40
-  data.tar.gz: 52a9f5a0ccea503154f4ebcbb587823c9ba802cf7187d7690ae13878e4e499bea5f0c39ac6f769758195612f462232ab63c75a0611273a073a6a9d8c3c27d5c6
+  metadata.gz: 6a13a2ef97dec25fc91f3e5f0e641c7b19d6c6d43145b9b6449644b88a3f1fad765ac2fdcbb58ddd51476c402349d766c64d40fb52a946a0b96eeb74c8079565
+  data.tar.gz: 12352fbcc6734cf959b737204e84c4166563b39d9dc1e817bf85f59adada4ba8a32ac395e0d6759e3a1880d21c3e64520e928ad26cd65a56a85d7ecdbd5bf860

data/README.md

@@ -28,7 +28,7 @@ require 'aliyun'
 
 ### 配置aliyun的access_key
 
-1. 全局配置
+#### 1. 全局配置
 
 ```
 options = {
@@ -39,7 +39,7 @@ Aliyun.config options
 ecs = Aliyun::ECS.new
 ```
 
-2. 直接配置ECS客户端
+#### 2. 直接配置ECS客户端
 
 ```
 options = {
@@ -49,9 +49,9 @@ options = {
 ecs = Aliyun::ECS.new options
 ```
 
-3. 环境变量
+#### 3. 环境变量
 
-如果环境变量里`ACCESS_KEY_ID`和`ACCESS_KEY_SECRET`初始化了密钥，那么可以直接初始化ecs：
+如果环境变量里`ALIYUN_ACCESS_KEY_ID`和`ALIYUN_ACCESS_KEY_SECRET`初始化了密钥，那么可以直接初始化ecs：
 
 ```
 ecs = Aliyun::ECS.new
@@ -61,15 +61,12 @@ ecs = Aliyun::ECS.new
 
 这样, 你就可以根据 [阿里云弹性计算服务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}
-ecs.action parameters
-```
-
 (1) 例如查询可用地域列表，其Action参数为DescribeRegions，而没有其他参数，代码如下
 
 ```
 ecs.describe_regions {}
+# 输出如下：
+{"Regions"=>{"Region"=>[{"LocalName"=>"深圳", "RegionId"=>"cn-shenzhen"}, {"LocalName"=>"青岛", "RegionId"=>"cn-qingdao"}, {"LocalName"=>"北京", "RegionId"=>"cn-beijing"}, {"LocalName"=>"香港", "RegionId"=>"cn-hongkong"}, {"LocalName"=>"杭州", "RegionId"=>"cn-hangzhou"}]}, "RequestId"=>"abcdefg"}
 ```
 
 (2) 再比如查询可用镜像，代码如下

data/lib/aliyun.rb

@@ -16,8 +16,8 @@ module Aliyun
             }
             self.request_method = 'GET'
             self.endpoint_url = 'https://ecs.aliyuncs.com/'
-            self.access_key_id = ENV['ACCESS_KEY_ID']
-            self.access_key_secret = ENV['ACCESS_KEY_SECRET']
+            self.access_key_id = ENV['ALIYUN_ACCESS_KEY_ID']
+            self.access_key_secret = ENV['ALIYUN_ACCESS_KEY_SECRET']
         end
     end
     def self.[](key)

data/lib/aliyun/ecs.rb

@@ -10,8 +10,8 @@ require 'json'
 module Aliyun
     class ECS
         def initialize(options={})
-            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[:access_key_id] = options[:access_key_id] || Aliyun[:access_key_id] || ENV['ALIYUN_ACCESS_KEY_ID']
+            Aliyun[:access_key_secret] = options[:access_key_secret] || Aliyun[:access_key_secret] || ENV['ALIYUN_ACCESS_KEY_SECRET']
             Aliyun[:endpoint_url] ||= options[:endpoint_url]
         end
         

data/lib/aliyun/version.rb

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

metadata

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