zabcon 0.0.327 → 0.0.332

data/libs/argument_processor.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: argument_processor.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: argument_processor.rb 330 2011-09-27 06:16:40Z nelsonab $
+# $Revision: 330 $
 ##########################################
 
 require 'zbxapi/zdebug'
@@ -197,12 +197,15 @@ module ArgumentProcessor
   # The default processor also checks the incoming parameters against a list of valid arguments, and merges
   # the user variables with the inbound arguments with the inbound arguments taking precedence, raises an
   # exception if there is an error
+  # arg_info should be a hash containing two keys, :required_args, :valid_args
   # If :use_array_processor is passed as an option the array processor will be used
   # In :num_args is passed with a value, and error will be returned if more than that many args are passed
 
-  def default_processor(args,valid_args,*flags)
+  def default_processor(args,arg_info,flags={})
     args=args.strip  #remove preceding and trailing whitespace
-    flags=flags[0]
+    #valid_args=arg_info[:valid_args]
+    #required_args=arg_info[:required_args]
+    invalid_args=[]
 
     if flags[:not_empty]
       raise ParameterError.new("No arguments",:retry=>true) if args.empty?
@@ -215,30 +218,36 @@ module ArgumentProcessor
     else
       args=params_to_hash(args)
 
+      if !arg_info[:valid_args].empty?
+        args_keys=args.keys
 
-#      if !(invalid=check_parameters(args, valid_args)).empty?
-#        msg="Invalid parameters:\n"
-#        msg+=invalid.join(", ")
-#        raise ParameterError_Invalid.new(msg,:retry=>true, :help_func=>help_func)
-#      end
-#      args=substitute_vars(args)
+        invalid_args=args_keys-arg_info[:valid_args] if arg_info[:valid_args]
+        raise ParameterError.new("Invalid parameters: "+invalid_args.join(", "),
+                                 :retry=>true) if !invalid_args.empty?
 
+        required_args=arg_info[:required_args].reject{|i| i.class==Array }
+        required_or_args=arg_info[:required_args].reject{|i| i.class!=Array }
 
-#      valid_user_vars = {}
-#
-#      if !valid_args.nil?
-#        valid_args.each {|item|
-#          valid_user_vars[item]=user_vars[item] if !user_vars[item].nil?
-#        }
-#      end
-#      args = valid_user_vars.merge(args)
-    end
+        missing_args=[]
+        missing_args=required_args-args_keys
 
-#    if !num_args.nil?
-#      eval_exp="#{args.length}#{num_args}"
-#      raise ParameterError.new("Too many arguments (#{args.length})",:retry=>true, :help_func=>help_func) if !eval(eval_exp)
-#    end
+        required_or_args.delete_if do |i|
+          count=i.length
+          missing_args<<i if (i-args_keys).count==count
+        end
 
+        if !missing_args.empty?
+          msg=missing_args.map do |i|
+            if i.class==Array
+              "(#{i.join(" | ")})"
+            else
+              i
+            end
+          end.join(", ")
+          raise ParameterError.new("Missing required arguments: #{msg}",:retry=>true)
+        end
+      end
+    end
     Command::Arguments.new(args, flags)
   end
 

data/libs/command_tree.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: command_tree.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: command_tree.rb 330 2011-09-27 06:16:40Z nelsonab $
+# $Revision: 330 $
 ##########################################
 #++
 
@@ -71,9 +71,10 @@ class ZabconExecuteCommand < ZabconExecuteBase
     @command_obj=cmd_obj.command_obj
     begin
       arg_result=@command_obj.call_arg_processor(cmd_obj.parameters)
-    rescue ParameterError => e
-      e.help_func=cmd_obj.command_obj.help_method
-      raise e
+    #TODO Fix showing help messages
+    #rescue ParameterError => e
+    #  e.help_func=cmd_obj.command_obj.help_method
+    #  raise e
     end
     @cmd_params=arg_result.cmd_params
     @show_params=arg_result.show_params
@@ -250,6 +251,9 @@ class Command
     end
   end
 
+  class NonFatalError < Exception
+  end
+
   class LoginRequired < Exception
   end
 
@@ -266,7 +270,7 @@ class Command
     raise "Path must be an array" if path.class!=Array
     @path=path
     @cmd_method=nil
-    @valid_args=[]
+    @valid_args=@required_args=[]
     @aliases=[]
     @flags={}
     @result_type=nil
@@ -311,9 +315,20 @@ class Command
     new_alias
   end
 
+  #Sets up a list of required arguments
+  #args is an array of items.  If there are multiple options
+  #which are optional but one of which is required, it shall
+  #be passed as a sub-array
+  #example, host, useip are required, but only one of dns and ip is required
+  #[host,useip,[dns,ip]]
+  def required_args(*args)
+    @required_args=args
+    @valid_args=@valid_args|args.flatten
+  end
+
   #accepts an array of valid arguments
-  def set_valid_args(args)
-    @valid_args=args
+  def set_valid_args(*args)
+    @valid_args=@valid_args|args
   end
 
   def default_show(cols)
@@ -359,7 +374,7 @@ class Command
     end
 
     @arguments=Arguments.new("",@flags)
-    result=@argument_processor.call(parameters,@valid_args,@flags)
+    result=@argument_processor.call(parameters,{:valid_args=>@valid_args,:required_args=>@required_args},@flags)
     return result if result.is_a?(Arguments)
     if !result.is_a?(String) && !result.is_a?(Hash) && !result.is_a?(Array)
       raise ("Arugment processor for \"#{command_name}\" returned invalid parameters: class: #{result.class}, #{result}")

data/libs/lexer.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: lexer.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: lexer.rb 330 2011-09-27 06:16:40Z nelsonab $
+# $Revision: 330 $
 ##########################################
 #++
 
@@ -34,7 +34,7 @@ require "zbxapi/zdebug"
 #This is a wrapper class for creating a generalized lexer.
 class Lexr
 
-  class NoLexerError < RuntimeError
+  class NoLexerError < ZError
   end
 
 	def self.setup(&block)
@@ -51,11 +51,37 @@ class Lexr
   end
 
   def parse
-    retval=[]
+    tokens=[]
     until self.end?
-      retval << self.next
+      tokens << self.next
     end
-    retval
+
+    join_escape(tokens)
+  end
+
+  def join_escape(tokens)
+    tmp=[]
+    escapes=0
+    tokens=tokens.map do |i|
+      if i.kind==:escape
+        escapes+=1
+        tmp<<i.value
+        nil
+      elsif escapes>0 && i.kind!=:end
+        escapes=0
+        tmp<<i.value
+        token=Token.new(tmp.join.to_s,:escape)
+        tmp=[]
+        token
+      else
+        i
+      end
+    end.compact
+    if escapes>0
+      tokens[-1]=Token.new(tmp.join.to_s,:escape)
+      tokens<<Lexr::Token.end
+    end
+    tokens
   end
 
 	def next
@@ -278,6 +304,7 @@ ExpressionLexer = Lexr.setup {
   matches /[-+]?\d+/ => :number, :convert_with => lambda { |v| Integer(v) }
   matches "=" => :equals
   matches "\"" => :umatched_quote, :raises=> "Unmatched quote"
+  matches /#.*$/ => :comment
   default /[^\s^\\^"^\(^\)^\{^\}^\[^\]^,^=]+/ => :word
 }
 
@@ -332,18 +359,34 @@ class Tokenizer < Array
     end
   end
 
-  def initialize(str)
+  class EscapeEnd < InvalidCharacter
+    def initialize(message=nil, params={})
+      super(message,params)
+      @message=message || "Cannot escape the end of a string"
+    end
+  end
+
+  attr_accessor :parsed
+  attr :items
+
+  #Takes a string str and and hash arguments and creates a Lexical token reference of str
+  #It will also parse the lexical tokens into an array of items.
+  #:keep_escape determines weather or not to keep all escape backslashes, default false
+  def initialize(str,args={})
     super()
     debug(8,:msg=>"Initial String",:var=>str.inspect)
     replace(str.lexer_parse(ExpressionLexer))
     debug(8,:msg=>"Tokens",:var=>self)
     debug(8,:msg=>"Tokens(Length)",:var=>length)
     @available_tokens=ExpressionLexer.available_tokens
+    @parsed=parse(args)
+    @items=@parsed.clone
   end
 
   def parse(args={})
     pos=args[:pos] || 0
-    pos,tmp=unravel(pos)
+    args.delete(:pos)
+    pos,tmp=unravel(pos,args)
     if tmp.length==1 && tmp[0].class==Array
       tmp[0]
     else
@@ -367,6 +410,7 @@ class Tokenizer < Array
     return :whitespace if of_type?(pos,:whitespace)
     return :comma if of_type?(pos,:comma)
     return :escape if of_type?(pos,:escape)
+    return :comment if of_type?(pos,:comment)
     return :paren if of_type?(pos,:paren)
     return :close if close?(pos)
     return :hash if hash?(pos)
@@ -586,59 +630,55 @@ class Tokenizer < Array
   end
 
   def get_escape(pos,args={})
-    keep_initial=args[:keep_initial] || false
+    keep_initial=args[:keep_escape] || false
+    debug(8,:msg=>"(#{self[pos].value.inspect}).length => #{self[pos].value.length}")
+    invalid_character(pos, :error=>EscapeEnd) if self[pos].value.length==1 && end?(pos+1)
 
-    invalid_character(pos,:msg=>"Escape characters cannot be last") if end?(pos+1)
-    pos+=1 if !keep_initial #gobble the first escape char
-    retval=[]
-    while !end?(pos) && self[pos].kind==:escape
-      retval<<self[pos].value
-      pos+=1
-    end
-    invalid_character "Unexpected End of String during escape" if end?(pos)
-    retval<<self[pos].value
-    pos+=1
-    return pos,retval.flatten.join
+    return pos+1,self[pos].value if keep_initial
+    return pos+1,self[pos].value[1..self[pos].value.length]
   end
 
   class Status
-    attr_accessor :close, :nothing_seen, :delim
-    attr_accessor :have_delim, :have_item, :item_seen, :delim_seen
 
     def initialize(pos,tokenizer,args={})
-      super()
+      @named_vars=[:close, :nothing_seen, :delim, :have_delim, :have_item,
+                   :item_seen, :delim_seen]
+
       @tokenizer=tokenizer
-      @start_pos=pos
-      @close=args[:close] || nil
-      @item_seen=args[:preload].nil?
 
-      @have_item = @have_delim =  @delim_seen = false
+      @stat_hash={}
+      @named_vars.each {|i| @stat_hash[i]=nil}  #preload for debugging
+      self.have_item = self.have_delim =  self.delim_seen = false
+      @stat_hash.merge!(args) #args overwrites @stat_hash where keys are equal
+
+      self.item_seen=@stat_hash[:preload].nil?
 
       #If we expect to find a closing element, the delimiter will be a comma
       #Otherwise we'll discover it later
-      if args[:delim].nil?
-        @delim=close.nil? ? nil : :comma
-      else
-        @delim=args[:delim]
-      end
+      self.delim=:comma if self.delim.nil? && !self.close.nil?
 
-      #self[:have_item]=false
-      #self[:have_delim]=false
-      #self[:nothing_seen]=true
-      @stat_hash={}
-      @stat_hash[:skip_until_close]=args[:skip_until_close]==true || false
+      self.skip_until_close=self.skip_until_close==true || false #enforce boolean result
     end
 
-    def inspect
-      str="#<#{self.class}:0x#{self.__id__.to_s(16)} "
-      arr=[]
+    def args
+      hash={}
       vars=instance_variables
       vars.delete("@tokenizer")
       vars.delete("@stat_hash")
-      vars.each{|i| arr<<"#{i}=#{instance_variable_get(i).inspect}" }
-      @stat_hash.each_pair{ |k,v| arr<<"@#{k.to_s}=#{v.inspect}" }
-      str+=arr.join(", ")+">"
-      str
+      vars.delete("@named_vars")
+      vars.each do |i|
+        hash.merge!(i.split("@")[-1].to_sym=>instance_variable_get(i))
+      end
+      hash.merge!(@stat_hash)
+    end
+
+    def merge(other_hash)
+      raise ZError.new("Hash Value required",:retry=>false) if other_hash.class!=Hash
+      args.merge(other_hash)
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{self.__id__.to_s(16)} " + args.inspect + ">"
     end
 
     def []=(key,value)
@@ -650,48 +690,51 @@ class Tokenizer < Array
     end
 
     def method_missing(sym,*args)
-      have_key=@stat_hash.has_key?(sym)
-      if have_key && args.empty?
-        return @stat_hash[sym]
-      elsif have_key && !args.empty?
-        str=sym.to_s
-        if str[str.length-1..str.length]=="="
-          str.chop!
-          @stat_hash[str.intern]=args
-          return args
-        end
+      key=sym.to_s.split("=")[0].intern
+      have_equal=(key.to_s!=sym.to_s)
+      val=@stat_hash[key]
+      return val if val && !have_equal && args.empty?
+
+      if have_equal
+        @stat_hash[key]=*args
+        return *args
       end
 
-      super(sym,args)
+      #just to be sure let's kick this to the super class, otherwise return nil
+      begin
+        return super(sym,args)
+      rescue NoMethodError
+        return nil
+      end
     end
 
     def item(pos)
       #set the delimiter to whitespace if we've never seen a delimiter but have an item
-      if @delim.nil? && @have_item && !@delim_seen
-        @delim=:whitespace
-        @delim_seen=true
+      if self.delim.nil? && self.have_item && !self.delim_seen
+        self.delim=:whitespace
+        self.delim_seen=true
       end
 
       @tokenizer.invalid_character(pos, :error=>DelimiterExpected) if
-          @have_item && @delim!=:whitespace && !@tokenizer.of_type?(pos,[:open,:close])
-      @item_seen=true
-      @have_item=true
-      @have_delim=false
+          self.have_item && self.delim!=:whitespace && !@tokenizer.of_type?(pos,[:open,:close])
+      self.item_seen=true
+      self.have_item=true
+      self.have_delim=false
     end
 
     def delimiter(pos)
       if @tokenizer.of_type?(pos,:comma)
-        @tokenizer.invalid_character(pos,:error=>WhitespaceExpected) if @delim==:whitespace
-        @tokenizer.invalid_character(pos,:error=>ItemExpected) if @delim==:comma and @have_delim
+        @tokenizer.invalid_character(pos,:error=>WhitespaceExpected) if self.delim==:whitespace
+        @tokenizer.invalid_character(pos,:error=>ItemExpected) if self.delim==:comma and self.have_delim
       elsif @tokenizer.of_type?(pos,:whitespace)
-        @delim=:whitespace if @delim.nil? && @seen_item
+        self.delim=:whitespace if self.delim.nil? && self.seen_item
       else
         @tokenizer.invalid_character(pos)
       end
 
-      @delim_seen=true
-      @have_item=false
-      @have_delim=true
+      self.delim_seen=true
+      self.have_item=false
+      self.have_delim=true
     end
 
   end
@@ -725,13 +768,6 @@ class Tokenizer < Array
 
         invalid_character(pos,:error=>UnexpectedClose) if close?(pos) && status.close.nil?
 
-        if of_type?(pos,:escape)
-          debug(8,:msg=>"escape",:var=>[pos,self[pos]])
-          pos,result=get_escape(pos)
-          retval<<result
-          next
-        end
-
         if status.skip_until_close
           debug(8,:msg=>"skip_until_close",:var=>[pos,self[pos]])
           retval<<self[pos].value
@@ -741,9 +777,13 @@ class Tokenizer < Array
         end
 
         case what_is?(pos)
+          when :comment
+            return pos,retval if !status.keep_comment
+            retval<<self[pos].value
+            return pos,retval
           when :escape
             status.item(pos)
-            pos,result=get_escape(pos)
+            pos,result=get_escape(pos,status.args)
             retval<<result
           when :paren
             status.item(pos)

data/libs/printer.rb

@@ -19,8 +19,8 @@
 
 ##########################################
 # Subversion information
-# $Id: printer.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: printer.rb 332 2011-09-30 07:24:38Z nelsonab $
+# $Revision: 332 $
 ##########################################
 
 require 'zbxapi/zdebug'
@@ -285,7 +285,7 @@ class OutputPrinter
             header=["groupid","name"]
           when :hostgroupid
             header=["name", "groupid", "internal"]
-          when :raw
+          when :raw_api
             header=results[0].keys
           when nil
             header=results[0].keys
@@ -334,7 +334,7 @@ class OutputPrinter
 
   def print_hash(dataset,cols)
     puts "Hash object printing not implemented, here is the raw result"
-    p dataset.result
+    p dataset.data
   end
 
 

data/libs/revision.rb

@@ -1 +1 @@
-REVISION=327
+REVISION=332

data/libs/zabcon_commands.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_commands.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: zabcon_commands.rb 332 2011-09-30 07:24:38Z nelsonab $
+# $Revision: 332 $
 ##########################################
 
 require "zbxapi/zdebug"
@@ -234,17 +234,19 @@ ZabconCommand.add_command "raw api" do
   set_method do |params|
     api_func=params[:method]
     params=params[:params]
-
     server.connection.raw_api(api_func, params)
   end
 
-  arg_processor do |params,valid_args,flags|
+  arg_processor do |params,args,flags|
+    params=Tokenizer.new(params).parse
     parameter_error "Command \"raw api\" requires parameters" if params.empty?
-    params=params.split2
     api_func=params[0]
     params.delete_at(0)
-    retval= params_to_hash(params.join(" "))
-    {:method=>api_func, :params=>retval}
+    params2={}
+    params.each do |i|
+      params2.merge!(i)
+    end
+    {:method=>api_func, :params=>params2}
   end
   set_flag :login_required
   set_flag :print_output
@@ -276,17 +278,6 @@ ZabconCommand.add_command "raw json" do
   result_type :raw_api
 end
 
-ZabconCommand.add_command "test" do
-  set_method do |params|
-    test="one=[one two three four=4] two three four=five=six=seven"
-    p test
-    p params_to_hash2(test)
-  end
-#  set_flag :print_output
-  set_help_tag :print
-  result_type :none
-end
-
 ###############################################################################
 #Application                                                       Application#
 ###############################################################################
@@ -349,6 +340,28 @@ ZabconCommand.add_command "get host" do
   result_type :host
 end
 
+ZabconCommand.add_command "update host" do
+  set_method do |params|
+    raise Command::NonFatalError.new("Update host requires a parameter to update.") if params.size<2
+
+    #TODO Add host.update to the zbxapi library
+    server.connection.raw_api("host.update",params)
+  end
+
+  set_valid_args 'hostid', 'proxy_hostid', 'host', 'dns', 'useip', 'ip',
+                 'port', 'status', 'useipmi', 'ipmi_port', 'ipmi_authtype',
+                 'ipmi_privilege', 'ipmi_username', 'ipmi_password',
+                 'ipmi_ip'
+  required_args "hostid"
+
+#  default_show ["itemid", "key_", "description"]
+  set_flag :login_required
+  set_flag :print_output
+  set_help_tag :update_user
+  result_type :host
+end
+
+
 ###############################################################################
 #Host Group                                                         Host Group#
 ###############################################################################
@@ -403,9 +416,9 @@ ZabconCommand.add_command "get item" do
   set_method do |params|
     server.connection.item.get(params)
   end
-  set_valid_args ['itemids','hostids','groupids', 'triggerids','applicationids',
+  set_valid_args 'itemids','hostids','groupids', 'triggerids','applicationids',
                   'status','templated_items','editable','count','pattern','limit',
-                  'order', 'show']
+                  'order', 'show'
   default_show ["itemid", "key_", "description"]
   set_flag :login_required
   set_flag :print_output
@@ -514,9 +527,9 @@ ZabconCommand.add_command "update user" do
       @connection.user.update([parameters])
     end
   end
-  set_valid_args ['userid','name', 'surname', 'alias', 'passwd', 'url',
+  set_valid_args 'userid','name', 'surname', 'alias', 'passwd', 'url',
                   'autologin', 'autologout', 'lang', 'theme', 'refresh',
-                  'rows_per_page', 'type',]
+                  'rows_per_page', 'type'
   default_show ["itemid", "key_", "description"]
   set_flag :login_required
   set_flag :print_output
@@ -544,12 +557,25 @@ end
 ZabconCommand.add_command "clone host" do
   set_method do |params|
     source=params["source"]
-    p source_info=server.connection.host.get({"output"=>"extend", "selectParentTemplates"=>"refer", "filter"=>{"host"=>[source]}})
-    p source_hostid=source_info[0]["hostid"]
-    p source_templates=source_info[0]["parentTemplates"].map{|i| i["hostid"]}
-
+    target=server.connection.host.get({"output"=>"extend", "filter"=>{"host"=>[params["host"]]}})
+    if !target.empty?
+      raise Command::NonFatalError.new("host #{params["host"]} already exists with hostid #{target[0]["hostid"]}")
+    end
+    source_info=server.connection.host.get({"output"=>"extend", "selectParentTemplates"=>"refer", "filter"=>{"host"=>[source]}})
+    source_hostid=source_info[0]["hostid"]
+    templates=source_info[0]["parentTemplates"].map{|i| i["hostid"] }
+    groups=server.connection.hostgroup.get(
+        {"hostids"=>[source_hostid],
+         "output"=>"extend"}).map do |i| {"groupid"=>i["groupid"]}
+    end
+    result=server.connection.host.create({"host"=>params["host"],
+      "ip"=>params["ip"],"useip"=>params["useip"],"groups"=>groups,
+      "port"=>params["port"],
+      "templates"=>templates.map {|i| {"templateid"=>i}} })
+    result
   end
 
+  required_args "host", ["ip","dns"], "useip", "port", "source"
   set_flag :login_required
   set_flag :print_output
   set_help_tag :clone_host

data/libs/zabcon_core.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_core.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: zabcon_core.rb 330 2011-09-27 06:16:40Z nelsonab $
+# $Revision: 330 $
 ##########################################
 
 require 'libs/utility_items'
@@ -187,6 +187,9 @@ class ZabconCore
     rescue CommandList::InvalidCommand => e
       puts e.message
       retry
+    rescue Command::NonFatalError => e
+      puts e.message
+      retry
     rescue Command::ParameterError => e
       puts e.message
       retry

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  version: 0.0.327
+  hash: 647
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 332
+  version: 0.0.332
 platform: ruby
 authors: 
 - A. Nelson
@@ -9,39 +15,53 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-09-26 00:00:00 -04:00
+date: 2011-09-30 00:00:00 -04:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zbxapi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 659
+        segments: 
+        - 0
+        - 1
+        - 324
         version: 0.1.324
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: parseconfig
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Zabcon is a command line interface for Zabbix written in Ruby
 email: nelsonab@red-tux.net
 executables: 
@@ -68,6 +88,7 @@ files:
 - libs/zabcon_globals.rb
 - libs/zabbix_server.rb
 - libs/utility_items.rb
+- ./zabcon.rb
 has_rdoc: true
 homepage: http://trac.red-tux.net/
 licenses: 
@@ -78,21 +99,29 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - Requires zbxapi, parseconfig and highline
 rubyforge_project: zabcon
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Zabcon command line interface for Zabbix