silo_manager 0.0.9 → 0.0.10

data/bin/silo_manager

@@ -658,7 +658,7 @@ end
 begin
 	options = Options.parse ARGV
 	begin
-		@client_api = Nexpose::Connection.new options.host, options.user, options.password, options.port
+		@client_api = Nexpose::Connection.new options.host, options.user, options.password, options.port, options.silo_id
 		@client_api.login
 	rescue Exception => e
 		puts "Unable to connect to #{options.host}"

data/lib/nexpose.rb

@@ -962,11 +962,12 @@ class Connection
 	attr_reader :url
 
 	# Constructor for Connection
-	def initialize(ip, user, pass, port = 3780)
+	def initialize(ip, user, pass, port = 3780, silo_id = nil)
 		@host = ip
 		@port = port
 		@username = user
 		@password = pass
+		@silo_id = silo_id
 		@session_id = nil
 		@error = false
 		@url = "https://#{@host}:#{@port}/api/VERSION_STRING/xml"
@@ -975,7 +976,11 @@ class Connection
 	# Establish a new connection and Session ID
 	def login
 		begin
-			r = execute(make_xml('LoginRequest', { 'sync-id' => 0, 'password' => @password, 'user-id' => @username }))
+			login_hash = { 'sync-id' => 0, 'password' => @password, 'user-id' => @username }
+			unless @silo_id.nil?
+				login_hash['silo-id'] = @silo_id
+			end
+			r = execute(make_xml('LoginRequest', login_hash))
 		rescue APIError
 			raise AuthenticationFailed.new(r)
 		end

data/lib/options.rb

@@ -9,12 +9,13 @@ class Options
 		options = OpenStruct.new
 		options.port = 3780
 		options.host = 'localhost'
-
+		options.silo_id = nil
 
 		option_parser = OptionParser.new do |option_parser|
 			option_parser.on("-h host", "The network address of the NeXpose instance - Defaults to 'localhost'") { |arg| options.host=arg.chomp }
 			option_parser.on("-u user_name", "The NeXpose user name - Required") { |arg| options.user=arg.chomp }
 			option_parser.on("-p password", "The NeXpose password - Required") { |arg| options.password=arg.chomp }
+			option_parser.on("-s silo-id", "The Silo ID - Optional") { |arg| options.silo_id=arg.chomp }
 			option_parser.on("--port port", "The NSC port - Defaults to 3780") { |arg| options.port=arg.chomp }
 			option_parser.on_tail("--help", "Help") do
 				puts option_parser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silo_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex
-  requirement: &24169236 !ruby/object:Gem::Requirement
+  requirement: &24451716 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.0.32
   type: :runtime
   prerelease: false
-  version_requirements: *24169236
+  version_requirements: *24451716
 description: ! '  This is a tool is used to provide CRUD silo operations for Nexpose.
 
 '
@@ -34,7 +34,6 @@ extra_rdoc_files: []
 files:
 - lib/nexpose.rb
 - lib/options.rb
-- lib/test.rb
 - bin/silo_manager
 has_rdoc: true
 homepage: https://github.com/chrlee/silo_manager

data/lib/test.rb

@@ -1,8 +0,0 @@
-# encoding: utf-8
-begin
-	test = {}
-	test['hi-hi'] = true
-	unless test['hi-hi']
-		puts "Hi"
-	end
-end