com.proofpoint.galaxy.cli 0.5 → 0.6

data/bin/galaxy

@@ -1,3 +1,6 @@
 #!/usr/bin/env ruby
 
-require "galaxy"
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+require 'galaxy'
+
+Galaxy::CLI.execute(ARGV)

data/lib/galaxy.rb

@@ -1,323 +1,328 @@
+#!/usr/bin/env ruby
 require 'optparse'
 require 'httpclient'
 require 'json'
+require 'galaxy/version'
 
-GALAXY_VERSION = "0.1"
-
-exit_codes = {
-    :success => 0,
-    :no_slots => 1,
-    :unsupported => 3,
-    :invalid_usage => 64
-}
-
-#
-# Slot Information
-#
-class Slot
-  attr_reader :id, :name, :host, :ip, :url, :binary, :config, :status
-
-  def initialize(id, name, url, binary, config, status)
-    @id = id
-    @name = name
-    @url = url
-    @binary = binary
-    @config = config
-    @status = status
-    uri = URI.parse(url)
-    @host = uri.host
-    @ip = IPSocket::getaddress(host)
-  end
-
-  def print_col
-    puts "#{id}\t#{host}\t#{name}\t#{status}\t#{binary}\t#{config}"
-  end
-end
-
-def strip(string)
-  space = /(\s+)/.match(string)[1]
-  string.gsub(/^#{space}/, '')
-end
-
-class CommandError < RuntimeError
-  attr_reader :code
-  attr_reader :message
-
-  def initialize(code, message)
-    @code = code
-    @message = message
-  end
-end
-
+module Galaxy
+  GALAXY_VERSION = "0.1"
 
-#
-# Commands
-#
-
-def show(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to show.")
-  end
-  coordinator_request(filter, options, :get)
-end
-
-def assign(filter, options, args)
-  if args.size != 2 then
-    raise CommandError.new(:invalid_usage, "You must specify a binary and config to assign.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for assign.")
-  end
-  if args[0].start_with? '@'
-    config = args[0]
-    binary = args[1]
-  else
-    binary = args[0]
-    config = args[1]
-
-  end
-  assignment = {
-      :binary => binary,
-      :config => config
+  EXIT_CODES = {
+      :success => 0,
+      :no_slots => 1,
+      :unsupported => 3,
+      :invalid_usage => 64
   }
-  coordinator_request(filter, options, :put, 'assignment', assignment, true)
-end
-
-def clear(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to clear.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for clear.")
-  end
-  coordinator_request(filter, options, :delete, 'assignment')
-end
-
-def start(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to start.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for start.")
-  end
-  coordinator_request(filter, options, :put, 'lifecycle', 'running')
-end
-
-def stop(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to stop.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for stop.")
-  end
-  coordinator_request(filter, options, :put, 'lifecycle', 'stopped')
-end
-
-def restart(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to restart.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for restart.")
-  end
-  coordinator_request(filter, options, :put, 'lifecycle', 'restarting')
-end
-
-def ssh(filter, options, args)
-  if !args.empty? then
-    raise CommandError.new(:invalid_usage, "You can not pass arguments to ssh.")
-  end
-  if filter.empty? then
-    raise CommandError.new(:invalid_usage, "You must specify a filter when for ssh.")
-  end
-  slots = show(filter, options, args)
-  if slots.empty?
-    return []
-  end
-
-  slot = slots.first
-  command = ENV['GALAXY_SSH_COMMAND'] || "ssh"
-  Kernel.system "#{command} #{slot.host}"
-  []
-end
-
-def coordinator_request(filter, options, method, sub_path = nil, value = nil, is_json = false)
-  # build the uri
-  uri = options[:coordinator_url]
-  uri += '/' unless uri.end_with? '/'
-  uri += 'v1/slot/'
-  uri += sub_path unless sub_path.nil?
-
-  # create filter query
-  query = filter.map { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v)}" }.join('&')
-
-  # encode body as json if necessary
-  body = value
-  headers = {}
-  if is_json
-    body = value.to_json
-    headers['Content-Type'] = 'application/json'
-  end
 
-  # log request in as a valid curl command if in debug mode
-  if options[:debug]
-    if value then
-      puts "curl -H 'Content-Type: application/json' -X#{method.to_s.upcase} '#{uri}?#{query}' -d '"
-      puts body
-      puts "'"
-    else
-      puts "curl -X#{method.to_s.upcase} '#{uri}?#{query}'"
+  #
+  # Slot Information
+  #
+  class Slot
+    attr_reader :uuid, :host, :ip, :url, :binary, :config, :status
+
+    def initialize(uuid, url, binary, config, status)
+      @uuid = uuid
+      @url = url
+      @binary = binary
+      @config = config
+      @status = status
+      uri = URI.parse(url)
+      @host = uri.host
+      @ip = IPSocket::getaddress(host)
     end
-  end
-
-  # execute request
-  response = HTTPClient.new.request(method, uri, query, body, headers).body
-
-  # parse response as json
-  slots_json = JSON.parse(response)
-
-  # log response if in debug mode
-  if options[:debug]
-    puts slots_json
-  end
-
-  # convert parsed json into slot objects
-  slots = slots_json.map do |slot_json|
-    Slot.new(slot_json['id'], slot_json['name'], slot_json['self'], slot_json['binary'], slot_json['config'], slot_json['status'])
-  end
-
-  # verify response
-  if slots.empty? then
-    raise CommandError.new(:no_slots, "No slots match the provided filters.")
-  end
-
-  slots
-end
 
-#
-#  Parse Command Line
-#
-commands = [:show, :assign, :clear, :start, :stop, :restart, :ssh]
-options = {
-    :coordinator_url => ENV['GALAXY_COORDINATOR'] || 'http://localhost:64000'
-}
-filter = {}
-
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [options] <command>"
-
-  opts.separator ''
-  opts.separator 'Options:'
-
-  opts.on('-h', '--help', 'Display this screen') do
-    puts opts
-    exit exit_codes[:success]
+    def print_col
+      puts "#{uuid}\t#{host}\t#{status}\t#{binary}\t#{config}"
+    end
   end
 
-  opts.on("-v", "--version", "Display the Galaxy version number and exit") do
-    puts "Galaxy version #{GALAXY_VERSION}"
-    exit exit_codes[:success]
-  end
+  class CommandError < RuntimeError
+    attr_reader :code
+    attr_reader :message
 
-  opts.on("--coordinator COORDINATOR", "Galaxy coordinator host (overrides GALAXY_COORDINATOR)") do |v|
-    options[:coordinator_url] = v
+    def initialize(code, message)
+      @code = code
+      @message = message
+    end
   end
 
-  opts.on('--debug', 'Enable debug messages') do
-    options[:debug] = true
-  end
+  class Commands
+    def self.show(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to show.")
+      end
+      coordinator_request(filter, options, :get)
+    end
 
-  opts.separator ''
-  opts.separator 'Filters:'
+    def self.assign(filter, options, args)
+      if args.size != 2 then
+        raise CommandError.new(:invalid_usage, "You must specify a binary and config to assign.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for assign.")
+
+      end
+      if args[0].start_with? '@'
+        config = args[0]
+        binary = args[1]
+      else
+        binary = args[0]
+        config = args[1]
+
+      end
+      assignment = {
+          :binary => binary,
+          :config => config
+      }
+      coordinator_request(filter, options, :put, 'assignment', assignment, true)
+    end
 
-  opts.on("-b", "--binary BINARY", "Select slots with a given binary") do |arg|
-    filter[:binary] = arg
-  end
+    def self.clear(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to clear.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for clear.")
+      end
+      coordinator_request(filter, options, :delete, 'assignment')
+    end
 
-  opts.on("-c", "--config CONFIG", "Select slots with given configuration") do |arg|
-    filter[:config] = arg
-  end
+    def self.start(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to start.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for start.")
+      end
+      coordinator_request(filter, options, :put, 'lifecycle', 'running')
+    end
 
-  opts.on("-i", "--host HOST", "Select slots on the given hostname") do |arg|
-    filter[:host] = arg
-  end
+    def self.stop(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to stop.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for stop.")
+      end
+      coordinator_request(filter, options, :put, 'lifecycle', 'stopped')
+    end
 
-  opts.on("-I", "--ip IP", "Select slots at the given IP address") do |arg|
-    filter[:ip] = arg
-  end
+    def self.restart(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to restart.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for restart.")
+      end
+      coordinator_request(filter, options, :put, 'lifecycle', 'restarting')
+    end
 
-  opts.on("-n", "--name SLOT_NAME", "Select slots with given slot name") do |arg|
-    filter[:name] = arg
-  end
+    def self.ssh(filter, options, args)
+      if !args.empty? then
+        raise CommandError.new(:invalid_usage, "You can not pass arguments to ssh.")
+      end
+      if filter.empty? then
+        raise CommandError.new(:invalid_usage, "You must specify a filter when for ssh.")
+      end
+      slots = show(filter, options, args)
+      if slots.empty?
+        return []
+      end
+
+      slot = slots.first
+      command = ENV['GALAXY_SSH_COMMAND'] || "ssh"
+      Kernel.system "#{command} #{slot.host}"
+      []
+    end
 
-  opts.on("-s", "--state STATE", "Select 'r{unning}', 's{topped}', 'u{assigned}' or 'unknown' slots", [:running, :r, :stopped, :s, :unassigned, :u, :unknown]) do |arg|
-    case arg
-      when :running, :r then
-        filter[:state] = 'running'
-      when :stopped, :s then
-        filter[:state] = 'stopped'
-      when :unassigned, :u then
-        filter[:state] = 'unassigned'
-      when :unknown then
-        filter[:state] = 'unknown'
+    private
+
+    def self.coordinator_request(filter, options, method, sub_path = nil, value = nil, is_json = false)
+      # build the uri
+      uri = options[:coordinator_url]
+      uri += '/' unless uri.end_with? '/'
+      uri += 'v1/slot/'
+      uri += sub_path unless sub_path.nil?
+
+      # create filter query
+      query = filter.map { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v)}" }.join('&')
+
+      # encode body as json if necessary
+      body = value
+      headers = {}
+      if is_json
+        body = value.to_json
+        headers['Content-Type'] = 'application/json'
+      end
+
+      # log request in as a valid curl command if in debug mode
+      if options[:debug]
+        if value then
+          puts "curl -H 'Content-Type: application/json' -X#{method.to_s.upcase} '#{uri}?#{query}' -d '"
+          puts body
+          puts "'"
+        else
+          puts "curl -X#{method.to_s.upcase} '#{uri}?#{query}'"
+        end
+      end
+
+      # execute request
+      response = HTTPClient.new.request(method, uri, query, body, headers).body
+
+      # parse response as json
+      slots_json = JSON.parse(response)
+
+      # log response if in debug mode
+      if options[:debug]
+        puts slots_json
+      end
+
+      # convert parsed json into slot objects
+      slots = slots_json.map do |slot_json|
+        Slot.new(slot_json['id'], slot_json['self'], slot_json['binary'], slot_json['config'], slot_json['status'])
+      end
+
+      # verify response
+      if slots.empty? then
+        raise CommandError.new(:no_slots, "No slots match the provided filters.")
+      end
+
+      slots
     end
   end
 
-  notes = <<-NOTES
-    Notes:
-        - A filter is required for all commands except for show
-        - Filters are evaluated as: set | host | ip | state | (binary & config)
-        - The HOST, BINARY, and CONFIG arguments are globs
-        - BINARY format is groupId:artifactId[:packaging[:classifier]]:version
-        - CONFIG format is @env:component[:pools]:version
-        - The default filter selects all hosts
-  NOTES
-  opts.separator ''
-  opts.separator strip(notes)
-  opts.separator ''
-  opts.separator 'Commands:'
-  opts.separator "  #{commands.join("\n  ")}"
-end
-
-option_parser.parse!(ARGV)
-
-puts options.map { |k, v| "#{k}=#{v}" }.join("\n") if options[:debug]
-puts filter.map { |k, v| "#{k}=#{v}" }.join("\n") if options[:debug]
-
-if ARGV.length == 0
-  puts option_parser
-  exit exit_codes[:success]
-end
-
-command = ARGV[0].to_sym
-
-#
-#  Execute Command
-#
-begin
-  if !commands.include?(command)
-    raise CommandError.new(:invalid_usage, "Unsupported command: #{command}")
-  end
+  class CLI
+
+    COMMANDS = [:show, :assign, :clear, :start, :stop, :restart, :ssh]
+    INITIAL_OPTIONS = {
+        :coordinator_url => ENV['GALAXY_COORDINATOR'] || 'http://localhost:64000'
+    }
+
+    def self.parse_command_line(args)
+      options = INITIAL_OPTIONS
+
+      filter = Hash.new
+
+      option_parser = OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} [options] <command>"
+
+        opts.separator ''
+        opts.separator 'Options:'
+
+        opts.on('-h', '--help', 'Display this screen') do
+          puts opts
+          exit EXIT_CODES[:success]
+        end
+
+        opts.on("-v", "--version", "Display the Galaxy version number and exit") do
+          puts "Galaxy version #{GALAXY_VERSION}"
+          exit EXIT_CODES[:success]
+        end
+
+        opts.on("--coordinator COORDINATOR", "Galaxy coordinator host (overrides GALAXY_COORDINATOR)") do |v|
+          options[:coordinator_url] = v
+        end
+
+        opts.on('--debug', 'Enable debug messages') do
+          options[:debug] = true
+        end
+
+        opts.separator ''
+        opts.separator 'Filters:'
+
+        opts.on("-b", "--binary BINARY", "Select slots with a given binary") do |arg|
+          filter[:binary] = arg
+        end
+
+        opts.on("-c", "--config CONFIG", "Select slots with given configuration") do |arg|
+          filter[:config] = arg
+        end
+
+        opts.on("-i", "--host HOST", "Select slots on the given hostname") do |arg|
+          filter[:host] = arg
+        end
+
+        opts.on("-I", "--ip IP", "Select slots at the given IP address") do |arg|
+          filter[:ip] = arg
+        end
+
+        opts.on("-u", "--uuid SLOT_UUID", "Select slots with given slot uuid") do |arg|
+          filter[:uuid] = arg
+        end
+
+        opts.on("-s", "--state STATE", "Select 'r{unning}', 's{topped}', 'u{assigned}' or 'unknown' slots", [:running, :r, :stopped, :s, :unassigned, :u, :unknown]) do |arg|
+          case arg
+            when :running, :r then
+              filter[:state] = 'running'
+            when :stopped, :s then
+              filter[:state] = 'stopped'
+            when :unassigned, :u then
+              filter[:state] = 'unassigned'
+            when :unknown then
+              filter[:state] = 'unknown'
+          end
+        end
+
+        opts.separator ''
+        opts.separator <<-NOTES
+Notes:
+    - A filter is required for all commands except for show
+    - Filters are evaluated as: set | host | ip | state | (binary & config)
+    - The HOST, BINARY, and CONFIG arguments are globs
+    - BINARY format is groupId:artifactId[:packaging[:classifier]]:version
+    - CONFIG format is @env:component[:pools]:version
+    - The default filter selects all hosts
+NOTES
+        opts.separator ''
+        opts.separator 'Commands:'
+        opts.separator "  #{COMMANDS.join("\n  ")}"
+      end
+
+      option_parser.parse!(args)
+
+      puts options.map { |k, v| "#{k}=#{v}" }.join("\n") if options[:debug]
+      puts filter.map { |k, v| "#{k}=#{v}" }.join("\n") if options[:debug]
+
+      if args.length == 0
+        puts option_parser
+        exit EXIT_CODES[:success]
+      end
+
+      command = args[0].to_sym
+
+      unless COMMANDS.include?(command)
+        raise CommandError.new(:invalid_usage, "Unsupported command: #{command}")
+      end
+
+      if options[:coordinator_url].nil? || options[:coordinator_url].empty?
+        raise CommandError.new(:invalid_usage, "You must set Galaxy coordinator host by passing --coordinator COORDINATOR or by setting the GALAXY_COORDINATOR environment variable.")
+      end
+
+      return [command, filter, options, args.drop(1)]
+    end
 
-  if options[:coordinator_url].nil? || options[:coordinator_url].empty?
-    raise CommandError.new(:invalid_usage, "You must set Galaxy coordinator host by passing --coordinator COORDINATOR or by setting the GALAXY_COORDINATOR environment variable.")
-  end
+    def self.execute(args)
+      begin
+        (command, filter, options, command_args) = parse_command_line(args)
+        slots = Commands.send(command, filter, options, command_args)
+        slots = slots.sort_by { |slot| "#{slot.ip}|#{slot.binary}|#{slot.config}|#{slot.uuid}" }
+        puts '' if options[:debug]
+        puts "uuid\tip\tstatus\tbinary\tconfig"
+        slots.each { |slot| slot.print_col } unless slots.nil?
+        exit EXIT_CODES[:success]
+      rescue CommandError => e
+        puts e.message
+        if e.code == :invalid_usage
+          puts ''
+          parse_command_line([])
+        end
+        if options[:debug]
+          puts ''
+          puts "exit: #{e.code}"
+        end
+        exit EXIT_CODES[e.code]
+      end
+    end
 
-  slots = send(command, filter, options, ARGV.drop(1))
-  slots = slots.sort_by { |slot| slot.name + slot.id }
-  puts '' if options[:debug]
-  slots.each { |slot| slot.print_col } unless slots.nil?
-  exit exit_codes[:success]
-rescue CommandError => e
-  puts e.message
-  if e.code == :invalid_usage
-    puts ''
-    puts option_parser
   end
-  if options[:debug]
-    puts ''
-    puts "exit: #{e.code}"
-  end
-  exit exit_codes[e.code]
 end
-

metadata

@@ -2,7 +2,7 @@
 name: com.proofpoint.galaxy.cli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.5"
+  version: "0.6"
 platform: ruby
 authors: 
 - Dain Sundstrom
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency