boris 1.0.1 → 1.0.2

data/lib/boris/target.rb

@@ -3,7 +3,6 @@ require 'boris/options'
 require 'boris/connectors/snmp'
 require 'boris/connectors/ssh'
 require 'boris/connectors/wmi'
-require 'boris/helpers/network'
 
 module Boris
   # {Boris::Target} is the basic class from which you can control the underlying framework
@@ -63,7 +62,7 @@ module Boris
     # @param [Hash] category name
     # @return [Array, Hash] scanned data elements for provided category
     def [](category)
-      eval "@profiler.#{category.to_s}"
+      @profiler.instance_variable_get("@#{category}".to_sym)
     end
 
     # Connects to the target using the credentials supplied via the connection type as specified
@@ -105,7 +104,9 @@ module Boris
             # we won't add snmp to the @unavailable_connection_types array, as it
             # could respond later with another community string
           when :ssh
-            if !@unavailable_connection_types.include?(:ssh)
+            if @unavailable_connection_types.include?(:ssh)
+              debug 'connection attempt bypassed (ssh connection unavailable)'
+            else
               @connector = SSHConnector.new(@host, cred, @options)
               @connector.establish_connection
 
@@ -114,7 +115,9 @@ module Boris
               end
             end
           when :wmi
-            if !@unavailable_connection_types.include?(:wmi)
+            if @unavailable_connection_types.include?(:wmi)
+              debug 'connection attempt bypassed (wmi connection unavailable)'
+            else
               @connector = WMIConnector.new(@host, cred)
               @connector.establish_connection
             
@@ -130,7 +133,7 @@ module Boris
 
       info 'all connection attempts failed' if !@connector.connected?
 
-      return @connector ? true : false
+      return @connector.connected? ? true : false
     end
 
     # Checks on the status of the connection.
@@ -158,7 +161,7 @@ module Boris
       raise NoActiveConnection, 'no active connection' if @connector.connected? == false
 
       @options[:profilers].each do |profiler|
-        break if @profiler
+        break if @profiler || @connector.failure_message
 
         if profiler.connection_type == @connector.class
           debug "testing profiler: #{profiler}"
@@ -175,6 +178,8 @@ module Boris
         end
       end
 
+      raise PasswordExpired,  @connector.failure_message if @connector.failure_message
+
       raise NoProfilerDetected, 'no suitable profiler found' if !@profiler
 
       @profiler
@@ -207,7 +212,7 @@ module Boris
     # @param [Hash] category name
     # @return [Array, Hash] scanned data elements for provided category
     def get(category)
-      eval "@profiler.get_#{category.to_s}"
+      @profiler.send("get_#{category.to_s}")
       self[category]
     end
 
@@ -243,7 +248,7 @@ module Boris
 
       Structure::CATEGORIES.each do |category|
         debug "calling #get_#{category.to_s}"
-        eval "@profiler.get_#{category.to_s}"
+        @profiler.send("get_#{category.to_s}")
       end
       
       debug 'all items retrieved successfully'
@@ -254,12 +259,7 @@ module Boris
     # Parses the target's scanned data into JSON format for portability.
     #
     #  target.get(:network_id)
-    #  json_string = target.to_json #=> "{...\"domain\":\"mydomain.com\",\"hostname\":\"SERVER01\"}"...
-    #  
-    #  # The JSON string can later be parsed back into an object
-    #  target_object = JSON.parse(json_string, :symbolize_names=>true)
-    #  # and easily accessed...
-    #  target_object[:network_id] #=> {:domain=>"mydomain.com", :hostname=>"SERVER01"}
+    #  json_string = target.to_json #=> "...{\"domain\":\"mydomain.com\",\"hostname\":\"SERVER01\"}"...
     #
     # @param [Hash] print_type a symbol value for json output options.  Only option supported now
     #   is :pretty_print to determine whether the data should be returned in json format with

data/lib/boris/version.rb

@@ -1,3 +1,3 @@
 module Boris
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,97 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: boris
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Joe Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: snmp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
-description: ! 'Boris: A networked-device scanning library. Boris allows you to write
+description: 'Boris: A networked-device scanning library. Boris allows you to write
   programs for logging into and pulling information off of various server platforms,
   appliances, and other types of networked devices, producing clean and consistent
   data ideal for configuration managment usage.'
@@ -111,6 +100,8 @@ files:
 - lib/boris/helpers/network.rb
 - lib/boris/helpers/scrubber.rb
 - lib/boris/helpers/string.rb
+- lib/boris/helpers/time.rb
+- lib/boris/helpers.rb
 - lib/boris/lumberjack.rb
 - lib/boris/options.rb
 - lib/boris/profiler.rb
@@ -132,27 +123,25 @@ files:
 - README.md
 homepage: https://github.com/alkalinecoffee/boris
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: ! 'Boris: A networked-device scanning library.'
+specification_version: 4
+summary: 'Boris: A networked-device scanning library.'
 test_files: []
-has_rdoc: