hmx_client 0.0.7 → 0.1.0

data/lib/hmx/command.rb

@@ -1,140 +1,140 @@
-require "optparse"
-require "hmx/helpers"
-
-module HmxClient
-   module Command
-     class InvalidCommand < RuntimeError; end
-     class CommandFailed < RuntimeError; end
-
-     extend HmxClient::Helpers
-
-     def self.load
-       Dir[File.join(File.dirname(__FILE__), "command", "*.rb")].each do | file |
-           require file
-       end
-     end
-
-     def self.commands
-       @@command ||= {}
-     end
-
-     def self.command_aliases
-       @@command_aliases ||= {}
-     end
-
-     def self.namespaces
-       @@namespaces ||= {}
-     end
-
-     def self.register_command(command)
-       commands[command[:command]] = command
-     end
-
-     def self.register_namespace(namespace)
-       namespaces[namespace[:name]] = namespace
-     end
-
-     def self.current_command
-       @current_command
-     end
-
-     def self.current_args
-       @current_args
-     end
-
-     def self.current_options
-       @current_options
-     end
-
-     def self.global_options
-       @global_options ||= []
-     end
-
-     def self.global_option(name, *args) 
-       global_options << { :name => name, :args => args }
-     end
-
-     global_option :debug, "--debug", "-d"
-     global_option :fileIn, "--file-in FILE", "-i"
-     global_option :fileOut, "--file-out FILE", "-o"
-
-     def self.prepare_run(cmd, args=[])
-       command = parse(cmd)
-       
-       unless command
-	 error " ! #{cmd} is not a hmx command. See 'hmx help'."
-         return
-       end
-
-       @current_command = cmd
-       opts = {}
-       invalid_options = []
-       
-       parser = OptionParser.new do | parser |
-          global_options.each do | global_option |
-            parser.on(*global_option[:args]) do | value |
-              opts[global_option[:name]] = value
-            end
-          end
-          command[:options].each do | name, option |
-            parser.on("-#{option[:short]}", "--#{option[:long]}", option[:desc]) do | value |
-               opts[name.gsub("-","_").to_sym] = value
-            end
-          end
-       end
-
-       begin
-         parser.order!(args) do |nonopt|
-           invalid_options << nonopt
-         end
-       rescue OptionParser::InvalidOption => ex
-         invalid_options << ex.args.first
-         retry
-       end
- 
-       raise OptionParser::ParseError if opts[:help]
-
-       args.concat(invalid_options)
-
-       @current_args = args
-       @current_options = opts
- 
-       [ command[:klass].new(args.dup, opts.dup), command[:method] ]
-    end
-
-    def self.debug?
-      @current_options.has_key?(:debug)
-    end
-
-    def self.fileIn
-      @current_options[:fileIn]
-    end
-
-    def self.fileOut
-      @current_options[:fileOut]
-    end
-
-    def self.run(cmd, arguments=[])
-      object, method = prepare_run(cmd, arguments.dup)
-      object.send(method)
-    rescue InvalidCommand
-      error "Unknown command. Run 'hmx help' for usage information."
-    rescue CommandFailed => e
-      error e.message
-    rescue OptionParser::ParseError => ex
-      commands[cmd] ? run("help", [cmd]) : run("help")
-    rescue Interrupt => e
-      error "\n[cancelled]"
-    end
-
-    def self.parse(cmd)
-      commands[cmd] || commands[command_aliases[cmd]]
-    end
-
-    def self.extract_error(body, options={})
-      default_error = block_given ? yield : "Internal server error"
-    end
-  end
-end
-
-
+require "optparse"
+require "hmx/helpers"
+
+module HmxClient
+   module Command
+     class InvalidCommand < RuntimeError; end
+     class CommandFailed < RuntimeError; end
+
+     extend HmxClient::Helpers
+
+     def self.load
+       Dir[File.join(File.dirname(__FILE__), "command", "*.rb")].each do | file |
+           require file
+       end
+     end
+
+     def self.commands
+       @@command ||= {}
+     end
+
+     def self.command_aliases
+       @@command_aliases ||= {}
+     end
+
+     def self.namespaces
+       @@namespaces ||= {}
+     end
+
+     def self.register_command(command)
+       commands[command[:command]] = command
+     end
+
+     def self.register_namespace(namespace)
+       namespaces[namespace[:name]] = namespace
+     end
+
+     def self.current_command
+       @current_command
+     end
+
+     def self.current_args
+       @current_args
+     end
+
+     def self.current_options
+       @current_options
+     end
+
+     def self.global_options
+       @global_options ||= []
+     end
+
+     def self.global_option(name, *args) 
+       global_options << { :name => name, :args => args }
+     end
+
+     global_option :debug, "--debug", "-d"
+     global_option :fileIn, "--file-in FILE", "-i"
+     global_option :fileOut, "--file-out FILE", "-o"
+
+     def self.prepare_run(cmd, args=[])
+       command = parse(cmd)
+       
+       unless command
+	 error " ! #{cmd} is not a hmx command. See 'hmx help'."
+         return
+       end
+
+       @current_command = cmd
+       opts = {}
+       invalid_options = []
+       
+       parser = OptionParser.new do | parser |
+          global_options.each do | global_option |
+            parser.on(*global_option[:args]) do | value |
+              opts[global_option[:name]] = value
+            end
+          end
+          command[:options].each do | name, option |
+            parser.on("-#{option[:short]}", "--#{option[:long]}", option[:desc]) do | value |
+               opts[name.gsub("-","_").to_sym] = value
+            end
+          end
+       end
+
+       begin
+         parser.order!(args) do |nonopt|
+           invalid_options << nonopt
+         end
+       rescue OptionParser::InvalidOption => ex
+         invalid_options << ex.args.first
+         retry
+       end
+ 
+       raise OptionParser::ParseError if opts[:help]
+
+       args.concat(invalid_options)
+
+       @current_args = args
+       @current_options = opts
+ 
+       [ command[:klass].new(args.dup, opts.dup), command[:method] ]
+    end
+
+    def self.debug?
+      @current_options.has_key?(:debug)
+    end
+
+    def self.fileIn
+      @current_options[:fileIn]
+    end
+
+    def self.fileOut
+      @current_options[:fileOut]
+    end
+
+    def self.run(cmd, arguments=[])
+      object, method = prepare_run(cmd, arguments.dup)
+      object.send(method)
+    rescue InvalidCommand
+      error "Unknown command. Run 'hmx help' for usage information."
+    rescue CommandFailed => e
+      error e.message
+    rescue OptionParser::ParseError => ex
+      commands[cmd] ? run("help", [cmd]) : run("help")
+    rescue Interrupt => e
+      error "\n[cancelled]"
+    end
+
+    def self.parse(cmd)
+      commands[cmd] || commands[command_aliases[cmd]]
+    end
+
+    def self.extract_error(body, options={})
+      default_error = block_given ? yield : "Internal server error"
+    end
+  end
+end
+
+

data/lib/hmx/command/base.rb

@@ -1,194 +1,195 @@
-require "fileutils"
-require "hmx/command"
-require 'cli-colorize'
-require 'hmx/helpers'
-
-class HmxClient::Command::Base
-  include HmxClient::Helpers
-  include CLIColorize
-
-  def self.namespace
-    self.to_s.split("::").last.downcase
-  end
-
-  attr_reader :args
-  attr_reader :options
-
-  FILE = File.expand_path("~/.hmxConfig")
-
-  def initialize(args=[], options={})
-    @args = args
-    @options = options
-    loadConfig!
-  end
-
-  def loadConfig!
-	# Load the config from the save file
-        @config = if File.exist?(FILE)
-	            File.open(FILE) { |file| Marshal.load(file) }
-		  else
-		     {}
-		  end
-       RestClient.proxy = @config[:proxy] if @config.has_key?(:proxy)
-  end
-  def storeConfig(keyName, keyValue)
-       # Update the config hashMap and persist it
-       if (keyName == :password) 
-           keyValue = Digest::MD5.hexdigest(keyValue)
-       end
-       @config[keyName] = keyValue
-       writeConfig
-  end
-  def removeConfig(keyName)
-      @config.delete keyName
-      writeConfig
-  end
-  def writeConfig
-       File.open(FILE, 'w+') { |f| Marshal.dump(@config, f) }
-  end
-  def hmx
-    if @hmx.nil?
-    	@hmx = Hmx.new    
-    	@hmx.login(@config)
-        writeConfig
-    end
-    @hmx
-  end
-
-protected
-
-  def self.inherited(klass)
-    help = extract_help_from_caller(caller.first)
-    HmxClient::Command.register_namespace(
-      :name => klass.namespace,
-      :description => help.split("\n").first
-    )
-  end
-
-  def self.method_added(method)
-    return if self == HmxClient::Command::Base
-    return if private_method_defined?(method)
-    return if protected_method_defined?(method)
-
-    help = extract_help_from_caller(caller.first)
-    resolved_method = (method.to_s == "index") ? nil : method.to_s
-    default_command = [ self.namespace, resolved_method ].compact.join(":")
-    command = extract_command(help) || default_command
-    banner = extract_banner(help) || command
-    permute = !banner.index("*")
-    banner.gsub!("*", "")
-
-    HmxClient::Command.register_command(
-      :klass       => self,
-      :method      => method,
-      :namespace   => self.namespace,
-      :command     => command,
-      :banner      => banner,
-      :help        => help,
-      :summary     => extract_summary(help),
-      :description => extract_description(help),
-      :options     => extract_options(help),
-      :permute     => permute
-    )
-  end
-
-  def self.alias_command(new, old)
-    raise "no such command: #{old}" unless HmxClient::Command.commands[old]
-    HmxClient::Command.command_aliases[new] = old
-  end
-
-  #
-  # Parse the caller format and identify the file and line number as identified
-  # in : http://www.ruby-doc.org/core/classes/Kernel.html#M001397.  This will
-  # look for a colon followed by a digit as the delimiter.  The biggest
-  # complication is windows paths, which have a color after the drive letter.
-  # This regex will match paths as anything from the beginning to a colon
-  # directly followed by a number (the line number).
-  #
-  # Examples of the caller format :
-  # * c:/Ruby192/lib/.../lib/heroku/command/addons.rb:8:in `<module:Command>'
-  # * c:/Ruby192/lib/.../heroku-2.0.1/lib/heroku/command/pg.rb:96:in `<class:Pg>'
-  # * /Users/ph7/...../xray-1.1/lib/xray/thread_dump_signal_handler.rb:9
-  #
-  def self.extract_help_from_caller(line)
-    # pull out of the caller the information for the file path and line number
-    if line =~ /^(.+?):(\d+)/
-      return extract_help($1, $2)
-    end
-    raise "unable to extract help from caller: #{line}"
-  end
-
-  def self.extract_help(file, line)
-    buffer = []
-    lines  = File.read(file).split("\n")
-
-    catch(:done) do
-      (line.to_i-2).downto(0) do |i|
-        case lines[i].strip[0..0]
-          when "", "#" then buffer << lines[i]
-          else throw(:done)
-        end
-      end
-    end
-
-    buffer.map! do |line|
-      line.strip.gsub(/^#/, "")
-    end
-
-    buffer.reverse.join("\n").strip
-  end
-
-  def self.extract_command(help)
-    extract_banner(help).to_s.split(" ").first
-  end
-
-  def self.extract_banner(help)
-    help.split("\n").first
-  end
-
-  def self.extract_summary(help)
-    extract_description(help).split("\n").first
-  end
-
-  def self.extract_description(help)
-    lines = help.split("\n").map { |l| l.strip }
-    lines.shift
-    lines.reject do |line|
-      line =~ /^-(.+)#(.+)/
-    end.join("\n").strip
-  end
-
-  def self.extract_options(help)
-    help.split("\n").map { |l| l.strip }.select do |line|
-      line =~ /^-(.+)#(.+)/
-    end.inject({}) do |hash, line|
-      description = line.split("#", 2).last.strip
-      long  = line.match(/--([A-Za-z\- ]+)/)[1].strip
-      short = line.match(/-([A-Za-z ])/)[1].strip
-      hash.update(long.split(" ").first => { :desc => description, :short => short, :long => long })
-    end
-  end
-
-  def extract_option(name, default=true)
-    key = name.gsub("--", "").to_sym
-    return unless options[key]
-    value = options[key] || default
-    block_given? ? yield(value) : value
-  end
-
-  def confirm_mismatch?
-    options[:confirm] && (options[:confirm] != options[:app])
-  end
-
-  def dout(msg) 
-        if (!HmxClient::Command.fileOut.nil?)
-       	   realFile = File.expand_path(HmxClient::Command.fileOut)
-	   File.open(realFile, 'w') { | f | 
-               		display("Writing to #{ realFile }")
-               		f.write(msg) } 
-        end
-        puts colorize(msg, :yellow)
-        #display(green(msg))
-  end
-end
-
+require "fileutils"
+require "hmx/command"
+require 'cli-colorize'
+require 'hmx/helpers'
+
+class HmxClient::Command::Base
+  include HmxClient::Helpers
+  include CLIColorize
+
+  def self.namespace
+    self.to_s.split("::").last.downcase
+  end
+
+  attr_reader :args
+  attr_reader :options
+
+  FILE = File.expand_path("~/.hmxConfig")
+
+  def initialize(args=[], options={})
+    @args = args
+    @options = options
+    loadConfig!
+  end
+
+  def loadConfig!
+	# Load the config from the save file
+        @config = if File.exist?(FILE)
+	            File.open(FILE) { |file| Marshal.load(file) }
+		  else
+		     {}
+		  end
+       RestClient.proxy = @config[:proxy] if @config.has_key?(:proxy)
+  end
+  def storeConfig(keyName, keyValue)
+       # Update the config hashMap and persist it
+       if (keyName == :password) 
+           keyValue = Digest::MD5.hexdigest(keyValue)
+       end
+       @config[keyName] = keyValue
+       # Remove any saved session config
+       removeConfig("context".to_sym); # Also saves config
+  end
+  def removeConfig(keyName)
+      @config.delete keyName
+      writeConfig
+  end
+  def writeConfig
+       File.open(FILE, 'w+') { |f| Marshal.dump(@config, f) }
+  end
+  def hmx
+    if @hmx.nil?
+    	@hmx = Hmx.new    
+    	@hmx.login(@config)
+        writeConfig
+    end
+    @hmx
+  end
+
+protected
+
+  def self.inherited(klass)
+    help = extract_help_from_caller(caller.first)
+    HmxClient::Command.register_namespace(
+      :name => klass.namespace,
+      :description => help.split("\n").first
+    )
+  end
+
+  def self.method_added(method)
+    return if self == HmxClient::Command::Base
+    return if private_method_defined?(method)
+    return if protected_method_defined?(method)
+
+    help = extract_help_from_caller(caller.first)
+    resolved_method = (method.to_s == "index") ? nil : method.to_s
+    default_command = [ self.namespace, resolved_method ].compact.join(":")
+    command = extract_command(help) || default_command
+    banner = extract_banner(help) || command
+    permute = !banner.index("*")
+    banner.gsub!("*", "")
+
+    HmxClient::Command.register_command(
+      :klass       => self,
+      :method      => method,
+      :namespace   => self.namespace,
+      :command     => command,
+      :banner      => banner,
+      :help        => help,
+      :summary     => extract_summary(help),
+      :description => extract_description(help),
+      :options     => extract_options(help),
+      :permute     => permute
+    )
+  end
+
+  def self.alias_command(new, old)
+    raise "no such command: #{old}" unless HmxClient::Command.commands[old]
+    HmxClient::Command.command_aliases[new] = old
+  end
+
+  #
+  # Parse the caller format and identify the file and line number as identified
+  # in : http://www.ruby-doc.org/core/classes/Kernel.html#M001397.  This will
+  # look for a colon followed by a digit as the delimiter.  The biggest
+  # complication is windows paths, which have a color after the drive letter.
+  # This regex will match paths as anything from the beginning to a colon
+  # directly followed by a number (the line number).
+  #
+  # Examples of the caller format :
+  # * c:/Ruby192/lib/.../lib/heroku/command/addons.rb:8:in `<module:Command>'
+  # * c:/Ruby192/lib/.../heroku-2.0.1/lib/heroku/command/pg.rb:96:in `<class:Pg>'
+  # * /Users/ph7/...../xray-1.1/lib/xray/thread_dump_signal_handler.rb:9
+  #
+  def self.extract_help_from_caller(line)
+    # pull out of the caller the information for the file path and line number
+    if line =~ /^(.+?):(\d+)/
+      return extract_help($1, $2)
+    end
+    raise "unable to extract help from caller: #{line}"
+  end
+
+  def self.extract_help(file, line)
+    buffer = []
+    lines  = File.read(file).split("\n")
+
+    catch(:done) do
+      (line.to_i-2).downto(0) do |i|
+        case lines[i].strip[0..0]
+          when "", "#" then buffer << lines[i]
+          else throw(:done)
+        end
+      end
+    end
+
+    buffer.map! do |line|
+      line.strip.gsub(/^#/, "")
+    end
+
+    buffer.reverse.join("\n").strip
+  end
+
+  def self.extract_command(help)
+    extract_banner(help).to_s.split(" ").first
+  end
+
+  def self.extract_banner(help)
+    help.split("\n").first
+  end
+
+  def self.extract_summary(help)
+    extract_description(help).split("\n").first
+  end
+
+  def self.extract_description(help)
+    lines = help.split("\n").map { |l| l.strip }
+    lines.shift
+    lines.reject do |line|
+      line =~ /^-(.+)#(.+)/
+    end.join("\n").strip
+  end
+
+  def self.extract_options(help)
+    help.split("\n").map { |l| l.strip }.select do |line|
+      line =~ /^-(.+)#(.+)/
+    end.inject({}) do |hash, line|
+      description = line.split("#", 2).last.strip
+      long  = line.match(/--([A-Za-z\- ]+)/)[1].strip
+      short = line.match(/-([A-Za-z ])/)[1].strip
+      hash.update(long.split(" ").first => { :desc => description, :short => short, :long => long })
+    end
+  end
+
+  def extract_option(name, default=true)
+    key = name.gsub("--", "").to_sym
+    return unless options[key]
+    value = options[key] || default
+    block_given? ? yield(value) : value
+  end
+
+  def confirm_mismatch?
+    options[:confirm] && (options[:confirm] != options[:app])
+  end
+
+  def dout(msg) 
+        if (!HmxClient::Command.fileOut.nil?)
+       	   realFile = File.expand_path(HmxClient::Command.fileOut)
+	   File.open(realFile, 'w') { | f | 
+               		display("Writing to #{ realFile }")
+               		f.write(msg) } 
+        end
+        puts colorize(msg, :yellow)
+        #display(green(msg))
+  end
+end
+