arcus 0.0.2 → 0.0.3

data/bin/arcus

@@ -1,29 +1,37 @@
 #!/usr/bin/env ruby
 
 require 'arcus/cli'
+require 'uri'
 require 'yaml'
 
+RC_FILE = "#{Dir.home}/.arcusrc"
 
-rc_file = "#{Dir.home}/.arcusrc"
 $settings = {}
-if (File.exists? rc_file)
-  $settings = YAML.load_file(rc_file)
+if (File.exists? RC_FILE)
+  $settings = YAML.load_file(RC_FILE)
 end
 
 def process_env(setting, key)
-  if ENV.has_key?(key) && ! ENV[key].empty?
+  if ENV.has_key?(key) && !ENV[key].empty?
     $settings[setting] = ENV[key]
   end
 end
 
 process_env("api_uri", "ARCUS_API_URI")
 process_env("default_response", "ARCUS_DEFAULT_RESPONSE")
-
-error = if ! $settings.has_key? "api_uri"
-  "API URI must me set in either #{rc_file} or as a environmental variable (ARCUS_API_URI)"
-elsif ! $settings.has_key? "default_response"
-  "Default response must me set in either #{rc_file} or as a environmental variable (ARCUS_DEFAULT_RESPONSE)"
-end
+process_env("api_key", "ARCUS_API_KEY")
+process_env("api_secret", "ARCUS_API_SECRET")
+
+error = case
+          when !$settings.has_key?("api_uri")
+            "API URI must me set in either #{rc_file} or as a environmental variable (ARCUS_API_URI)"
+          when !$settings.has_key?("default_response")
+            "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"]
+            "API Key must be set when using an API Secret"
+        end
 
 if error
   puts error
@@ -32,7 +40,9 @@ end
 
 arcus = Arcus::Cli.new(
     :api_uri => URI($settings["api_uri"]),
-    :default_response => $settings["default_response"]
+    :default_response => $settings["default_response"],
+    :api_key => $settings["api_key"],
+    :api_secret => $settings["api_secret"]
 )
 
 arcus.run

data/lib/arcus/api.rb

@@ -20,23 +20,25 @@ module Arcus
   module Api
 
     @@targets = []
-    @@verbose = false
-    @@default_response = "json"
 
-    def self.verbose=(val)
-      @@verbose = val
-    end
+    class Settings
+      attr_accessor :api_uri, :api_xml, :api_key, :api_secret, :default_response, :verbose
 
-    def self.verbose
-      @@verbose
+      def initialize
+        @api_xml = File.dirname(__FILE__) + "/commands.xml"
+        @default_response = "json"
+        @verbose = false;
+      end
     end
 
-    def self.default_response=(val)
-      @@default_response = val
+    @@settings = Settings.new
+
+    def self.settings
+      @@settings
     end
 
-    def self.default_response
-      @@default_response
+    def self.settings=(val)
+      @@settings = val
     end
 
     def self.targets
@@ -64,8 +66,8 @@ module Arcus
         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}))
-        Arcus.log.debug { "Sending: #{req_url}" } if Api.verbose == true
+        req_url = @api_uri.path + "?" + URI.encode_www_form(params.merge({:command => @command_name}))
+        Arcus.log.debug { "Sending: #{req_url}" } if Api.settings.verbose
         response = begin
           http.get(req_url)
         rescue Timeout::Error => e
@@ -77,7 +79,7 @@ module Arcus
           e.api_uri = @api_uri
           raise e
         end
-        Arcus.log.debug { "Received: #{response.body}" } if Api.verbose == true
+        Arcus.log.debug { "Received: #{response.body}" } if Api.settings.verbose
         response.instance_eval do
           class << self
             attr_accessor :response_type
@@ -121,6 +123,15 @@ module Arcus
       end
     end
 
+    class Scope
+      attr_accessor :options
+
+      def initialize(options = {})
+        @options = options;
+      end
+    end
+
+
     def self.parse_action(name)
       action, target = name.split(/([A-Z].*)/, 2)
       target = "User" if %w(login logout).include?(action)
@@ -128,7 +139,7 @@ module Arcus
       [action, target]
     end
 
-    def self.load_config(api_xml)
+    def self.load_config_file(api_xml)
       contents = File.read(api_xml).to_s
       md5 = Digest::MD5.hexdigest(contents)
       api_xml_basename = File.basename(api_xml)
@@ -148,20 +159,25 @@ module Arcus
       config
     end
 
-    def self.configure(options = {})
+    def scoped(options = {})
+      yield Scope.new(options = {})
+    end
+
+    def self.configure
       Arcus.log = Logger.new(STDOUT)
       Arcus.log.level = Logger::DEBUG
       Arcus.log.formatter = proc do |severity, datetime, progname, msg|
         "#{severity} - #{datetime}: #{msg}\n"
       end
-      api_xml = options[:api_xml] || (raise ArgumentError, "api_xml file: commands.xml file location required")
-      api_uri = options[:api_uri] || (raise ArgumentError, "api_uri: URI of API required")
-      @@default_response = options[:default_response] if options[:default_response]
-      to_name = lambda { |a| a["name"].to_sym }
 
-      config = self.load_config(api_xml)
+      yield(self.settings)
+
+      self.settings.api_xml || (raise ArgumentError, "api_xml file: commands.xml file location required")
+      self.settings.api_uri || (raise ArgumentError, "api_uri: URI of API required")
 
-      config["commands"]["command"].each do |c|
+      api_config = self.load_config_file(self.settings.api_xml)
+
+      api_config["commands"]["command"].each do |c|
         command_name = c["name"]
         command_desc = c["description"]
         command_async = c["isAsync"] == "true" ? true : false
@@ -182,9 +198,6 @@ module Arcus
         required_args = all_args.select { |a| a["required"] == "true" }
         optional_args = all_args.select { |a| a["required"] == "false" }
 
-        all_names = all_args.map(&to_name)
-        required_names = required_args.map(&to_name)
-
         def self.class_exists?(class_name)
           c = self.const_get(class_name)
           return c.is_a?(Class)
@@ -204,30 +217,30 @@ module Arcus
 
         if !self.class_exists?(target)
           target_clazz = self.create_class(target, Target) do
-            cattr_accessor :actions, :opts
-            self.actions = self.opts = []
+            cattr_accessor :actions
+            self.actions = []
           end
           @@targets << target_clazz
+
         else
           target_clazz = self.get_class(target)
         end
 
-
         target_clazz.class_eval do
+
           if !class_exists?(action.capitalize)
             action_clazz = create_class(action.capitalize, Action) do
-              cattr_accessor :opts
-              self.opts = []
-            end
-            target_clazz.actions << action_clazz
-          else
-            action_clazz = get_class(action.capitalize)
-          end
-          action_clazz.class_eval do
-            class << self
-              attr_accessor :name, :description, :is_async,
-                            :required_args, :optional_args,
-                            :action_name, :api_uri, :sync
+              cattr_accessor :name, :description, :is_async,
+                             :required_args, :optional_args,
+                             :action_name, :sync
+
+              self.name = command_name
+              self.description = command_desc
+              self.action_name = action
+              self.required_args = required_args
+              self.optional_args = optional_args
+              self.is_async = command_async
+              self.sync = false
 
               def prepare!(params = {}, callbacks = {})
                 check_args(params, all_names, required_names)
@@ -235,30 +248,21 @@ module Arcus
               end
 
               def prepare(params = {}, callbacks = {})
-                params[:response] ||= Api.default_response
-                Request.new(self.name, params, self.api_uri, callbacks)
+                params[:response] ||= Api.settings.default_response
+                Request.new(self.name, params, Api.settings.api_uri, callbacks)
               end
             end
-          end
-          action_clazz.name = command_name
-          action_clazz.description = command_desc
-          action_clazz.action_name = action
-          action_clazz.required_args = required_args
-          action_clazz.optional_args = optional_args
-          action_clazz.api_uri = api_uri
-          action_clazz.is_async = command_async
-          action_clazz.sync = false
-
-
-          define_method(action.to_sym) do |params = {}, callbacks = {}|
-            action_clazz.prepare(params, callbacks)
-          end
-          define_method("#{action}!".to_sym) do |params = {}, callbacks = {}|
-            action_clazz.prepare(params, callbacks)
-          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)
+            end
+          end
         end
       end
     end
   end
-end
+end

data/lib/arcus/cli.rb

@@ -8,8 +8,12 @@ module Arcus
     include Api
 
     def initialize(options = {})
-      options[:api_xml] = File.dirname(__FILE__) + "/commands.xml"
-      Api.configure(options)
+      Api.configure do |c|
+        c.api_uri = options[:api_uri] if options[:api_uri]
+        c.api_key = options[:api_key] if options[:api_key]
+        c.api_secret = options[:api_secret] if options[:api_secret]
+        c.default_response = options[:default_response] if options[:default_response]
+      end
     end
 
     def word_wrap(text, *args)
@@ -51,7 +55,7 @@ module Arcus
       cmd.program_version = [0, 0, 1]
       cmd.options = CmdParse::OptionParserWrapper.new do |opt|
         opt.separator "Global options:"
-        opt.on("--verbose", "Be verbose when outputting info") { Arcus::Api.verbose = true }
+        opt.on("--verbose", "Be verbose when outputting info") { Arcus::Api.settings.verbose = true }
       end
       cmd.add_command(CmdParse::HelpCommand.new)
       cmd.add_command(CmdParse::VersionCommand.new)
@@ -97,7 +101,7 @@ module Arcus
             missing_params = a.required_args.map { |n| n["name"].to_sym } - required_params.keys
             if (missing_params.empty?)
               begin
-                response_type = optional_params[:response] || Api.default_response
+                response_type = optional_params[:response] || Api.settings.default_response
                 if a.sync
                   result = a.prepare(required_params.merge(optional_params)).fetch
                   job_id = result["#{a.name.downcase}response"]["jobid"]
@@ -111,7 +115,7 @@ module Arcus
                   end
                   puts AsyncJobResult.new.query({:jobid => job_id}).fetch(response_type.to_sym)
                 else
-                  puts a.prepare(required_params.merge(optional_params)).fetch(response_type.to_sym)
+                  puts a.new.prepare(required_params.merge(optional_params)).fetch(response_type.to_sym)
                 end
               rescue Timeout::Error => e
                 puts "Timeout connecting to #{e.api_uri}"

data/lib/arcus/version.rb

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

data/test.rb

@@ -0,0 +1,7 @@
+class Test
+  attr_accessor :hello
+end
+
+t = Test.new
+t.hello = "HELLO"
+p t

data/test/test_arcus.rb

@@ -0,0 +1,19 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arcus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -98,6 +98,8 @@ files:
 - lib/arcus/commands.xml
 - lib/arcus/helpers.rb
 - lib/arcus/version.rb
+- test.rb
+- test/test_arcus.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -122,4 +124,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: API and client CLI tool for cloudstack
-test_files: []
+test_files:
+- test/test_arcus.rb