visor-auth 0.0.2 → 0.0.3

data/bin/visor-admin

@@ -63,7 +63,6 @@ class VisorAdminCLI
 
       opts.separator ""
       opts.separator "Common options:"
-      opts.on_tail("-D", "--dry-run", "Don't persist results, just print what would it do") { options[:dry] = true }
       opts.on_tail('-v', '--verbose', "Enable verbose") { options[:verbose] = true }
       opts.on_tail("-h", "--help", "Show this help message") { puts opts; exit 0 }
       opts.on_tail('-V', '--version', "Show version") { puts "VISoR Admin CLI v#{VERSION}"; exit 0 }
@@ -80,22 +79,31 @@ class VisorAdminCLI
   def run!
     abort parser.to_s if command.nil?
     start = Time.now
-    case command
-    when 'list' then
-      list
-    when 'get' then
-      get
-    when 'add' then
-      add
-    when 'update' then
-      update
-    when 'delete' then
-      delete
-    when 'help' then
-      help
-    else
-      abort "Unknown command '#{command}'"
+    begin
+      case command
+      when 'list' then
+        list
+      when 'get' then
+        get
+      when 'add' then
+        add
+      when 'update' then
+        update
+      when 'delete' then
+        delete
+      when 'help' then
+        help
+      else
+        abort "Unknown command '#{command}'"
+      end
+    rescue NotFound => e
+      puts e.message
+    rescue Errno::ECONNREFUSED
+      abort "Failure while executing '#{command}': VISOR Auth System server not found. Is it running?"
+    rescue => e
+      abort "Failure while executing '#{command}': #{e}"
     end
+
     finish = Time.now
     printf("Done in %-0.4f seconds", finish - start) if verbose?
     exit 0
@@ -106,10 +114,6 @@ class VisorAdminCLI
     users = client.get_users(options[:query])
     puts "Found #{users.size} users..."
     print_users(users)
-  rescue NotFound => e
-    puts e.message
-  rescue => e
-    abort "Failure while executing 'list':\n#{e.message}"
   end
 
   # Retrieve an user
@@ -118,56 +122,34 @@ class VisorAdminCLI
     abort "No user access key provided as first argument, please provide it." unless access_key
     user = client.get_user(access_key)
     print_users(user)
-  rescue NotFound => e
-    puts e.message
-  rescue => e
-    abort "Failure while executing 'get':\n#{e.message}"
   end
 
   # Add a new user
   def add
-    begin
-      info = parse_info_from_args
-      user = client.post_user(info)
-      puts "Successfully added new user with access key '#{user[:access_key]}'."
-      print_users(user)
-    rescue NotFound => e
-      puts e.message
-    rescue => e
-      abort "Failure while executing 'add':\n#{e.message}"
-    end
+    info = parse_info_from_args
+    user = client.post_user(info)
+    puts "Successfully added new user with access key '#{user[:access_key]}'."
+    print_users(user)
   end
 
   # Update an user
   def update
     access_key = argv.shift
     abort "No user access key provided as first argument, please provide it." unless access_key
-    begin
-      info = parse_info_from_args
-      user = client.put_user(access_key, info)
-      puts "Successfully updated the user #{access_key}."
-      print_users(user) if verbose?
-    rescue NotFound => e
-      puts e.message
-    rescue => e
-      abort "Failure while executing 'update':\n#{e.message}"
-    end
+    info = parse_info_from_args
+    user = client.put_user(access_key, info)
+    puts "Successfully updated the user #{access_key}."
+    print_users(user) if verbose?
   end
 
   # Delete an user
   def delete
-    begin
-      argv.each do |access_key|
-        abort "No user access key provided as first argument, please provide it." unless access_key
-        user = client.delete_user(access_key)
-        puts "Successfully deleted user #{access_key}."
-        print_users(user) if verbose?
-      end
+    argv.each do |access_key|
+      abort "No user access key provided as first argument, please provide it." unless access_key
+      user = client.delete_user(access_key)
+      puts "Successfully deleted user #{access_key}."
+      print_users(user) if verbose?
     end
-  rescue NotFound => e
-    puts e.message
-  rescue => e
-    abort "Failure while executing 'delete':\n#{e.message}"
   end
 
   # Show help message for one of the above commands
@@ -185,7 +167,7 @@ You can filter results based on a query using the --query (-q) option.
 
 Examples:
   $ visor-admin list
-  $ visor-admin list --query email=foo@bar.com]
+  $ visor-admin list --query 'access_key=foo&email=foo@bar.com']
     when :get
       puts %q[Usage: visor-admin get <ACCESS KEY> [options]
 

data/lib/auth/cli.rb

@@ -61,34 +61,31 @@ module Visor
           opts.on("-c", "--config FILE", "Load a custom configuration file") do |file|
             options[:config] = File.expand_path(file)
           end
-          opts.on("-o", "--host HOST", "listen on HOST (default: #{DEFAULT_HOST})") do |host|
+          opts.on("-a", "--address HOST", "Bind to HOST address (default: #{DEFAULT_HOST})") do |host|
             options[:host] = host.to_s
           end
-          opts.on("-p", "--port PORT", "use PORT (default: #{DEFAULT_PORT})") do |port|
+          opts.on("-p", "--port PORT", "Bind to PORT number (default: #{DEFAULT_PORT})") do |port|
             options[:port] = port.to_i
           end
-          opts.on("-x", "--no-proxy", "ignore proxy settings if any") do
-            options[:no_proxy] = true
-          end
-          opts.on("-e", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: #{DEFAULT_ENV})") do |env|
+          opts.on("-e", "--env ENV", "Set execution environment (default: #{DEFAULT_ENV})") do |env|
             options[:environment] = env.to_sym
           end
-          opts.on("-F", "--foreground", "don't daemonize, run in the foreground") do
+          opts.on("-f", "--foreground", "Do not daemonize, run in foreground") do
             options[:foreground] = true
           end
 
           opts.separator ""
           opts.separator "Common options:"
 
-          opts.on_tail("-d", "--debug", "Set debugging on (with foreground only)") do
+          opts.on_tail("-d", "--debug", "Enable debugging") do
             options[:debug] = true
           end
-          opts.on_tail("-h", "--help", "Show this message") do
+          opts.on_tail("-h", "--help", "Show this help message") do
             puts opts
             exit
           end
           opts.on_tail('-v', '--version', "Show version") do
-            puts "VISoR Auth Server v#{Visor::Auth::VERSION}"
+            puts "visor-auth #{Visor::Auth::VERSION}"
             exit
           end
         end

data/lib/auth/client.rb

@@ -74,7 +74,7 @@ module Visor
 
       # Generate a valid URI query string from key/value pairs of the given hash.
       #
-      # @param opts [Hash] The hash with the key/value pairs to generate query from.
+      # @param h [Hash] The hash with the key/value pairs to generate query from.
       #
       # @return [String] The generated query in the form of "?k=v&k1=v1".
       #

data/lib/auth/server.rb

@@ -5,7 +5,7 @@ require 'uri'
 module Visor
   module Auth
 
-    # The VISoR Auth Server class. This class supports all users and groups management
+    # The VISoR Auth System (VAS) server class. This class supports all users management
     # operations through the REST API implemented along the following routes.
     #
     class Server < Sinatra::Base
@@ -18,12 +18,20 @@ module Visor
         backend_map = {'mongodb' => Visor::Auth::Backends::MongoDB,
                        'mysql'   => Visor::Auth::Backends::MySQL}
 
-        #TODO: catch error when Config does not found a key (like :visor_auth) in config file:
-        # /Users/joaodrp/workspace/visor/common/lib/common/config.rb:65:in `load_config': undefined method `merge' for nil:NilClass (NoMethodError)
-        conf = Visor::Common::Config.load_config(:visor_auth)
-        log  = Visor::Common::Config.build_logger(:visor_auth)
+        begin
+          conf = Visor::Common::Config.load_config(:visor_auth)
+          log  = Visor::Common::Config.build_logger(:visor_auth)
+        rescue => e
+          STDERR.puts "ERROR starting visor-auth: (config file) 'visor_auth' section not found"
+          exit! 1
+        end
 
-        DB = backend_map[conf[:backend].split(':').first].connect uri: conf[:backend]
+        begin
+          DB = backend_map[conf[:backend].split(':').first].connect uri: conf[:backend]
+        rescue => e
+          STDERR.puts "ERROR starting visor-auth: (#{conf[:backend].split(':').first}) #{e}"
+          exit! 1
+        end
 
         disable :show_exceptions, :logging #, :protection
         use Rack::CommonLogger, log

data/lib/auth/version.rb

@@ -1,5 +1,5 @@
 module Visor
   module Auth
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visor-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec