arcus 0.0.3 → 0.0.4

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+desc "Run tests"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')

data/arcus.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Arcus::VERSION
 
+  gem.add_dependency "i18n"
   gem.add_dependency "active_support"
   gem.add_dependency "nori"
   gem.add_dependency "nokogiri"
   gem.add_dependency "cmdparse"
+  gem.add_dependency "rspec"
 end

data/bin/arcus

@@ -29,7 +29,7 @@ error = case
             "Default response must me set in either #{rc_file} or as a environmental variable (ARCUS_DEFAULT_RESPONSE)"
           when $settings["api_key"] && !$settings["api_secret"]
             "API Secret must be set when using an API Key"
-          when $settings["api_secret"] && !settings["api_key"]
+          when $settings["api_secret"] && !$settings["api_key"]
             "API Key must be set when using an API Secret"
         end
 

data/lib/arcus.rb

@@ -1,10 +1,2 @@
 require "arcus/version"
 require "arcus/api"
-
-
-
-
-
-
-
-

data/lib/arcus/api.rb

@@ -5,6 +5,9 @@ require 'active_support/core_ext/hash/reverse_merge'
 require 'nori'
 require 'nokogiri'
 require 'digest/md5'
+require 'base64'
+require 'cgi'
+require 'openssl'
 require 'logger'
 require 'json'
 require 'arcus/helpers'
@@ -46,15 +49,43 @@ module Arcus
     end
 
     class Request
-      attr_accessor :command_name, :params, :api_uri, :callbacks
+      attr_accessor :command_name, :params, :api_uri, :callbacks, :api_key, :api_secret
 
-      def initialize(command_name, params, api_uri, callbacks)
+      def initialize(command_name, params, callbacks)
         @command_name = command_name
         @params = params
-        @api_uri = api_uri
+        @api_uri = Api.settings.api_uri
+        @api_key = Api.settings.api_key
+        @api_secret = Api.settings.api_secret
         @callbacks = callbacks
       end
 
+      def generate_signature(params, api_secret)
+        sorted_params = params.map { |k, v| [k, CGI.escape(v.to_s).gsub('+', '%20').downcase] }.sort_by { |key, value| key.to_s }
+        data = parameterize(sorted_params, false).downcase
+        hash = OpenSSL::HMAC.digest('sha1', api_secret, data)
+        Base64.encode64(hash).chomp
+      end
+
+      def parameterize(params, escape=true)
+        params = params.collect do |k, v|
+          if escape
+            "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
+          else
+            "#{k}=#{v}"
+          end
+        end
+        params.join('&')
+      end
+
+      def generate_params_str(params, api_key = nil, api_secret = nil)
+        if api_key && api_secret
+          params[:apiKey] = @api_key
+          params[:signature] = generate_signature(params, api_secret)
+        end
+        parameterize(params)
+      end
+
       def fetch(response_type = :object)
         @params[:response] =
             case response_type
@@ -65,8 +96,14 @@ module Arcus
             end
         http = Net::HTTP.new(@api_uri.host, @api_uri.port)
         http.read_timeout = 5
-        http.open_timeout = 1
-        req_url = @api_uri.path + "?" + URI.encode_www_form(params.merge({:command => @command_name}))
+        http.open_timeout = 5
+
+        if @api_uri.scheme == "https"
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        params = @params.merge({:command => @command_name})
+        req_url = @api_uri.path + "?" + generate_params_str(params, @api_key, @api_secret)
         Arcus.log.debug { "Sending: #{req_url}" } if Api.settings.verbose
         response = begin
           http.get(req_url)
@@ -249,16 +286,18 @@ module Arcus
 
               def prepare(params = {}, callbacks = {})
                 params[:response] ||= Api.settings.default_response
-                Request.new(self.name, params, Api.settings.api_uri, callbacks)
+                Request.new(self.name, params, callbacks)
               end
             end
             target_clazz.actions << action_clazz
 
-            target_clazz.define_singleton_method(action.to_sym) do |params = {}, callbacks = {}|
-              action_clazz.new.prepare(params, callbacks)
-            end
-            target_clazz.define_singleton_method("#{action}!".to_sym) do |params = {}, callbacks = {}|
-              action_clazz.new.prepare(params, callbacks)
+            target_clazz.instance_eval do
+              define_method(action.to_sym) do |params = {}, callbacks = {}|
+                  action_clazz.new.prepare(params, callbacks)
+              end
+              define_method("#{action}!".to_sym) do |params = {}, callbacks = {}|
+                  action_clazz.new.prepare(params, callbacks)
+              end
             end
           end
         end

data/lib/arcus/cli.rb

@@ -103,7 +103,7 @@ module Arcus
               begin
                 response_type = optional_params[:response] || Api.settings.default_response
                 if a.sync
-                  result = a.prepare(required_params.merge(optional_params)).fetch
+                  result = a.new.prepare(required_params.merge(optional_params)).fetch
                   job_id = result["#{a.name.downcase}response"]["jobid"]
                   job_finished = false
                   until job_finished

data/lib/arcus/version.rb

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

data/spec/arcus_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'rspec/core'
+
+Arcus::Api.configure do |c|
+   c.api_uri = "http://icloud-staging-api.logicworks.net:8096/client/api"
+   c.default_response = "json"
+end
+
+include Arcus::Api
+
+describe Domain do
+  pending "Domain test"
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'arcus/api'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arcus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: API and client CLI tool for cloudstack
 email:
 - atistler@gmail.com
@@ -98,8 +130,9 @@ files:
 - lib/arcus/commands.xml
 - lib/arcus/helpers.rb
 - lib/arcus/version.rb
+- spec/arcus_spec.rb
+- spec/spec_helper.rb
 - test.rb
-- test/test_arcus.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -125,4 +158,5 @@ signing_key:
 specification_version: 3
 summary: API and client CLI tool for cloudstack
 test_files:
-- test/test_arcus.rb
+- spec/arcus_spec.rb
+- spec/spec_helper.rb

data/test/test_arcus.rb

@@ -1,19 +0,0 @@
-require 'test/unit'
-require 'hola'
-
-class HolaTest < Test::Unit::TestCase
-  def test_english_hello
-    assert_equal "hello world",
-      Hola.hi("english")
-  end
-
-  def test_any_hello
-    assert_equal "hello world",
-      Hola.hi("ruby")
-  end
-
-  def test_spanish_hello
-    assert_equal "hola mundo",
-      Hola.hi("spanish")
-  end
-end