saws 0.0.1 → 0.0.2

data/lib/saws.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'fog'
 require 'trollop'
+require 'logger'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/hash/slice'
@@ -8,7 +9,6 @@ require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/string/inflections'
 
 module SAWS
   extend self
@@ -17,11 +17,23 @@ module SAWS
   autoload 'Base', 'saws/base'
   autoload 'RDS', 'saws/rds'
 
+  def logger
+    @logger ||= case CLI.options[:log_file]
+    when "STDOUT"
+      Logger.new STDOUT
+    when String
+      Logger.new CLI.options[:log_file]
+    end
+  end
+
   def connection_options
-    @connection_options ||= CLI.options.slice(:region).merge(
-      :aws_access_key_id     => CLI.options["aws-access-key-id"],
-      :aws_secret_access_key => CLI.options["aws-secret-access-key"]
-    ).symbolize_keys
+    @connection_options ||= CLI.options.slice(:region, :aws_access_key_id, :aws_secret_access_key)
+  end
+
+  def log(message)
+    logger.info message if logger
   end
 
+  # Load options
+  CLI.options
 end

data/lib/saws/base.rb

@@ -4,13 +4,13 @@ class SAWS::Base
 
     def proxy(klass = nil)
       @_proxy = klass if klass
-      @_proxy ||= "Fog::AWS::#{name.demodulize}".constantize
+      @_proxy ||= eval("Fog::AWS::#{name.split('::').last}")
     end
 
   end
 
   def initialize(options = {})
-    @proxy = self.class.proxy.new SAWS.connection_options.merge(options)
+    @proxy  = self.class.proxy.new SAWS.connection_options.merge(options)
   end
 
   def respond_to?(*a)

data/lib/saws/cli.rb

@@ -12,15 +12,16 @@ module SAWS::CLI
       file = File.readable?(path) ? File.read(path).lines.map(&:strip) : []
 
       opts = Trollop::options do
-        opt "aws-access-key-id", "AWS access key ID", :short => 'K', :type => :string
-        opt "aws-secret-access-key", "AWS secret access key", :short => 'S', :type => :string
-        opt "region", "Your AWS region", :short => 'R', :default  => "us-east-1"
-      end.with_indifferent_access
+        opt :aws_access_key_id, "AWS access key ID", :short => 'K', :type => :string
+        opt :aws_secret_access_key, "AWS secret access key", :short => 'S', :type => :string
+        opt :region, "Your AWS region", :short => 'R', :default => "us-east-1"
+        opt :log_file, "Log file path", :type => :string
+      end
 
-      opts["aws-access-key-id"]     ||= ENV['AWS_ACCESS_KEY_ID'] || file[0]
-      opts["aws-secret-access-key"] ||= ENV['AWS_SECRET_ACCESS_KEY'] || file[1]
+      opts[:aws_access_key_id]     ||= ENV['AWS_ACCESS_KEY_ID'] || file[0]
+      opts[:aws_secret_access_key] ||= ENV['AWS_SECRET_ACCESS_KEY'] || file[1]
 
-      opts.except("help").each do |key, value|
+      opts.slice(:aws_access_key_id, :aws_secret_access_key).each do |key, value|
         Trollop::die key, "cannot be blank" if value.blank?
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saws
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport