aliyun 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5b5695a2a5302a32783da37632ab0d9fdd437a
-  data.tar.gz: ce4ab67b3f779536c950852607bdbf05af36da7c
+  metadata.gz: 805a759b4575f23be67e18372e06c5c66d487ace
+  data.tar.gz: 9c14c17f044ad1f047c8bc2fa202ab3298ab5b58
 SHA512:
-  metadata.gz: d175ce40436f6e7117960dff67a801640b304f38f412a3fc4b8fd95069d363cdab1e2f572d505208448f21d666cf3b1ecd2173728f705e75ff9de3518bb89b47
-  data.tar.gz: 5eed2b104e6ee53cd2377a49c610ab881450709b484613f9ca3eb0a3a36765f0a984f1992aa8e254efa07ea15704905e7eb005109a18bfe3df622e17698eb18d
+  metadata.gz: 06eae905ebdf489de03547cef5d7636f99ab94c546822328f18c42ce43c3dfb767fde74ec43583a01185bac0abdb2b3851c6df7c704b1fc4e7ba845aa4b68124
+  data.tar.gz: 2bd6e052e61ccc33911e03a5603c62f687de84d6e9b98230d40c7ff9022d72c4fad3c8567f98c935ae1d7ebdad51d4bc9949c85e1e7cf376db989e5dfc05f7d3

data/.aliyun.yml.example

@@ -0,0 +1,2 @@
+:access_key_id: 
+:access_key_secret: 

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.aliyun.yml

data/README.md

@@ -2,6 +2,8 @@
 
 Ruby wrapper of Aliyun API for system adminstrator.
 
+[![Gem Version](https://badge.fury.io/rb/aliyun.png)](http://badge.fury.io/rb/aliyun)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,10 +28,10 @@ Example:
     options = {
       :access_key_id => "_YOUR_API_KEY_",
       :access_key_secret => "_YOUR_API_SECRET_",
-      :endpoint_url => "https://ecs.aliyuncs.com/"
+      :service => :ecs
     }
 
-    service = Aliyun::ECS::Service.new options
+    service = Aliyun::Service.new options
     parameters = {}
 
     puts service.DescribeRegions parameters

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 
+# RSpec and Test
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec
+task :test => :spec

data/aliyun.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_dependency "ruby-hmac"
 end

data/examples/describe_regions.rb

@@ -5,9 +5,9 @@ $DEBUG=false
 
 options = {:access_key_id => "xxxxxx",
            :access_key_secret => "yyyyy",
-           :endpoint_url => "https://ecs.aliyuncs.com/"}
+           :service => :ecs}
 
-service = Aliyun::ECS::Service.new options
+service = Aliyun::Service.new options
 
 parameters = {}
 

data/lib/aliyun.rb

@@ -1,3 +1,4 @@
 require "aliyun/version"
 require "aliyun/base"
-require "aliyun/ecs"
+require "aliyun/services"
+require "aliyun/common"

data/lib/aliyun/base.rb

@@ -1,18 +1,21 @@
 module Aliyun
-  ALIYUN_API_ENDPOINT='https://ecs.aliyuncs.com/'
-  SEPARATOR = "&"
-  HTTP_METHOD = "GET"
-
-  $ENDPOINT_URL = nil
-  $ACCESS_KEY_ID = nil
-  $ACCESS_KEY_SECRET = nil
-
-  DEFAULT_PARAMETERS = {
-    :Format=>"JSON",
-    :Version=>"2014-05-26",
-    :SignatureMethod=>"HMAC-SHA1",
-    :SignatureVersion=>"1.0"
-  }
+  class APIConfig
+    def self.info
+      raise "Service Name Missing!"
+    end
+    def self.endpoint
+      raise "Service Endpoint Missing!"
+    end
+    def self.default_parameters
+      raise "Service Default Parameters Missing!"
+    end
+    def self.separator
+      "&"
+    end
+    def self.http_method
+      "GET"
+    end
+  end
 
   class AliyunAPIException < RuntimeError
   end

data/lib/aliyun/common.rb

@@ -0,0 +1,124 @@
+require 'net/http'
+require 'time'
+require 'securerandom'
+require 'uri'
+require 'base64'
+require 'hmac-sha1'
+require 'json'
+
+module Aliyun
+  class Service
+    attr_accessor :access_key_id, :access_key_secret
+    attr_accessor :options
+    attr_accessor :endpoint_url
+    attr_accessor :service
+
+    def initialize(options={})
+      options[:service] ||= :ecs
+      self.service = SERVICES[options[:service].to_sym]
+      self.access_key_id = options[:access_key_id]
+      self.access_key_secret = options[:access_key_secret]
+      self.endpoint_url = options[:endpoint_url] || self.service.endpoint
+      self.options = {:AccessKeyId => self.access_key_id}
+    end
+
+    def method_missing(method, *args)
+      if $DEBUG
+        puts "Not Found Method: #{method}"
+      end
+
+      if args[0].nil?
+        raise AliyunAPIException.new "Method missing: #{method}!"
+      end
+
+      call_aliyun_with_parameter(method, args[0])
+    end
+
+    #Dispatch the request with parameter
+    private
+    def call_aliyun_with_parameter(method, params)
+      params = gen_request_parameters method, params
+      uri = URI(endpoint_url)
+
+      uri.query = URI.encode_www_form(params)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == "https")
+
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      if $DEBUG
+        puts "Request URI: #{uri.request_uri}"
+      end
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+
+      case response
+      when Net::HTTPSuccess
+        return JSON.parse(response.body)
+      else
+        raise AliyunAPIException.new "Response code: #{response.code}, message: #{response.body}"
+      end
+    end
+
+    #generate the parameters
+    def gen_request_parameters method, params
+      #add common parameters
+      params.merge! self.service.default_parameters
+
+      params.merge! self.options
+
+      params[:Action] = method.to_s
+      params[:TimeStamp] = Time.now.utc.iso8601
+      params[:SignatureNonce] = SecureRandom.uuid
+      params[:Signature] = compute_signature params
+
+      params
+    end
+
+    #compute the signature of the parameters String
+    def compute_signature params
+      if $DEBUG
+        puts "keys before sorted: #{params.keys}"
+      end
+
+      sorted_keys = params.keys.sort
+
+      if $DEBUG
+        puts "keys after sorted: #{sorted_keys}"
+      end
+
+      canonicalized_query_string = ""
+
+      canonicalized_query_string = sorted_keys.map {|key|
+        "%s=%s" % [safe_encode(key.to_s), safe_encode(params[key])]
+      }.join(self.service.separator)
+
+      length = canonicalized_query_string.length
+
+      string_to_sign = self.service.http_method + self.service.separator + safe_encode('/') + self.service.separator + safe_encode(canonicalized_query_string)
+
+      if $DEBUG
+        puts "string_to_sign is #{string_to_sign}"
+      end
+
+      signature = calculate_signature access_key_secret+"&", string_to_sign
+    end
+
+    #calculate the signature
+    def calculate_signature key, string_to_sign
+      hmac = HMAC::SHA1.new(key)
+      hmac.update(string_to_sign)
+      signature = Base64.encode64(hmac.digest).gsub("\n", '')
+      if $DEBUG
+        puts "Signature #{signature}"
+      end
+      signature
+    end
+
+    #encode the value to aliyun's requirement
+    def safe_encode value
+      value = URI.encode_www_form_component(value).gsub(/\+/,'%20').gsub(/\*/,'%2A').gsub(/%7E/,'~')
+    end
+  end
+end

data/lib/aliyun/services.rb

@@ -0,0 +1,52 @@
+module Aliyun
+  class ECSConfig < APIConfig
+    def self.info
+      "Aliyu ECS Service"
+    end
+    def self.endpoint
+      'https://ecs.aliyuncs.com/'
+    end
+    def self.default_parameters
+      {
+        :Format=>"JSON",
+        :Version=>"2014-05-26",
+        :SignatureMethod=>"HMAC-SHA1",
+        :SignatureVersion=>"1.0"
+      }
+    end
+    def self.separator
+      super
+    end
+    def self.http_method
+      super
+    end
+  end
+
+  class SLBConfig < APIConfig
+    def self.info
+      "Aliyu SLB Service"
+    end
+    def self.endpoint
+      'https://slb.aliyuncs.com/'
+    end
+    def self.default_parameters
+      {
+        :Format=>"JSON",
+        :Version=>"2014-05-15",
+        :SignatureMethod=>"HMAC-SHA1",
+        :SignatureVersion=>"1.0"
+      }
+    end
+    def self.separator
+      super
+    end
+    def self.http_method
+      super
+    end
+  end
+
+  SERVICES = {
+    :ecs => ECSConfig,
+    :slb => SLBConfig
+  }
+end

data/lib/aliyun/version.rb

@@ -1,3 +1,3 @@
 module Aliyun
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

data/spec/aliyun_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Aliyun do
+  it 'has a version number' do
+    expect(Aliyun::VERSION).not_to be nil
+  end
+
+  it 'can load options' do
+    option = load_options
+
+    expect(option).to have_key(:access_key_id)
+    expect(option).to have_key(:access_key_secret)
+  end
+
+  it 'can create aliyun ecs service' do
+    options = load_options
+    options[:service] = :ecs
+    service = Aliyun::Service.new options
+
+    expect(service).to be_instance_of(Aliyun::Service)
+    expect(service.service).to be(Aliyun::ECSConfig)
+  end
+
+  it 'can create aliyun slb service' do
+    options = load_options
+    options[:service] = :slb
+    service = Aliyun::Service.new options
+
+    expect(service).to be_instance_of(Aliyun::Service)
+    expect(service.service).to be(Aliyun::SLBConfig)
+  end
+
+  it 'can query aliyun ecs regions' do
+    options = load_options
+    options[:service] = :ecs
+    service = Aliyun::Service.new options
+    parameters = {}
+    regions = service.DescribeRegions parameters
+
+    expect(regions).to have_key("Regions")
+    expect(regions["Regions"]).to have_key("Region")
+  end
+
+  it 'can query aliyun slb regions' do
+    options = load_options
+    options[:service] = :slb
+    service = Aliyun::Service.new options
+    parameters = {}
+    regions = service.DescribeRegions parameters
+
+    expect(regions).to have_key("Regions")
+    expect(regions["Regions"]).to have_key("Region")
+  end
+
+  it "can describe aliyun slb regions" do
+    options = load_options
+    options[:service] = :slb
+    service = Aliyun::Service.new options
+    parameters = {}
+    slbs = service.DescribeLoadBalancers :RegionId => "cn-beijing"
+
+    expect(slbs).to have_key("LoadBalancers")
+    #expect(slbs["LoadBalancers"]).to have_key("LoadBalancer")
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'aliyun'
+require 'yaml'
+
+def load_options(src='.aliyun.yml')
+  YAML.load_file(src)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Liu Lantao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".aliyun.yml.example"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -69,8 +84,11 @@ files:
 - examples/describe_regions.rb
 - lib/aliyun.rb
 - lib/aliyun/base.rb
-- lib/aliyun/ecs.rb
+- lib/aliyun/common.rb
+- lib/aliyun/services.rb
 - lib/aliyun/version.rb
+- spec/aliyun_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/Lax/aliyun
 licenses:
 - MIT
@@ -95,4 +113,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper of Aliyun API for system administrator
-test_files: []
+test_files:
+- spec/aliyun_spec.rb
+- spec/spec_helper.rb

data/lib/aliyun/ecs.rb

@@ -1,123 +0,0 @@
-require 'net/http'
-require 'time'
-require 'securerandom'
-require 'uri'
-require 'base64'
-require 'hmac-sha1'
-require 'json'
-
-module Aliyun
-  module ECS
-    class Service
-      attr_accessor :access_key_id, :access_key_secret
-      attr_accessor :options
-      attr_accessor :endpoint_url
-
-      def initialize(options={})
-        self.access_key_id = options[:access_key_id] || $ACCESS_KEY_ID || ""
-        self.access_key_secret = options[:access_key_secret] || $ACCESS_KEY_SECRET || ""
-        self.endpoint_url = options[:endpoint_url] || $ENDPOINT_URL || ALIYUN_API_ENDPOINT
-        self.options = {:AccessKeyId => self.access_key_id}
-      end
-
-      def method_missing(method, *args)
-        if $DEBUG
-          puts "Not Found Method: #{method}"
-        end
-
-        if args[0].nil?
-          raise AliyunAPIException.new "Method missing: #{method}!"
-        end
-
-        call_aliyun_with_parameter(method, args[0])
-      end
-
-      #Dispatch the request with parameter
-      private
-      def call_aliyun_with_parameter(method, params)
-        params = gen_request_parameters method, params
-        uri = URI(endpoint_url)
-
-        uri.query = URI.encode_www_form(params)
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = (uri.scheme == "https")
-
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        if $DEBUG
-          puts "Request URI: #{uri.request_uri}"
-        end
-
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = http.request(request)
-
-        case response
-        when Net::HTTPSuccess
-          return JSON.parse(response.body)
-        else
-          raise AliyunAPIException.new "Response code: #{response.code}, message: #{response.body}"
-        end
-      end
-
-      #generate the parameters
-      def gen_request_parameters method, params
-        #add common parameters
-        params.merge! DEFAULT_PARAMETERS
-
-        params.merge! self.options
-
-        params[:Action] = method.to_s
-        params[:TimeStamp] = Time.now.utc.iso8601
-        params[:SignatureNonce] = SecureRandom.uuid
-        params[:Signature] = compute_signature params
-
-        params
-      end
-
-      #compute the signature of the parameters String
-      def compute_signature params
-        if $DEBUG
-          puts "keys before sorted: #{params.keys}"
-        end
-
-        sorted_keys = params.keys.sort
-
-        if $DEBUG
-          puts "keys after sorted: #{sorted_keys}"
-        end
-
-        canonicalized_query_string = ""
-
-        canonicalized_query_string = sorted_keys.map {|key|
-          "%s=%s" % [safe_encode(key.to_s), safe_encode(params[key])]
-        }.join(SEPARATOR)
-
-        length = canonicalized_query_string.length
-
-        string_to_sign = HTTP_METHOD + SEPARATOR + safe_encode('/') + SEPARATOR + safe_encode(canonicalized_query_string)
-
-        if $DEBUG
-          puts "string_to_sign is #{string_to_sign}"
-        end
-
-        signature = calculate_signature access_key_secret+"&", string_to_sign
-      end
-
-      #calculate the signature
-      def calculate_signature key, string_to_sign
-        hmac = HMAC::SHA1.new(key)
-        hmac.update(string_to_sign)
-        signature = Base64.encode64(hmac.digest).gsub("\n", '')
-        if $DEBUG
-          puts "Signature #{signature}"
-        end
-        signature
-      end
-
-      #encode the value to aliyun's requirement
-      def safe_encode value
-        value = URI.encode_www_form_component(value).gsub(/\+/,'%20').gsub(/\*/,'%2A').gsub(/%7E/,'~')
-      end
-    end
-  end
-end