uirusu 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cf7de8705fa6a0e595f9c1a1781dd4936ea9df91
+  data.tar.gz: 698407a8dddc1a1b8fb9aac9de18afb33b2c4248
+SHA512:
+  metadata.gz: 1e9dc51ae0271f2640578e26572e76014d78c29125d47bab199c1715b56d273e68402da9d317ee4e47be21af698bd776359cb56138b9edba5338cd632888cf5d
+  data.tar.gz: c86b7afc18da01de6482f0eb824684fa9534207e1f19fb1bee5993031f0fe1c2425ce9401ffb5b8cd42404589d88802c3670a76f89ccf70816c0bbb863ce5cb9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Arxopia LLC.
+Copyright (c) 2012-2013 Arxopia LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/NEWS.markdown

@@ -1,8 +1,18 @@
 # News
 
+# 0.0.4 (April 11, 2013)
+- Added Proxy support [abenson]
+- Copyright date updates
+- Made sure each hash request waits for the timeout specified in the yaml file
+- The default timeout is 15 seconds, by default virustotal.org only allows 4 requests per minute
+
+# 0.0.3 ()
+- Gemspec fix
+
 # 0.0.2 ()
--
+- Copyright fixes
 
 # 0.0.1 (March 4, 2012)
 - Rename ruby-virustotal/virustotal gem to uirusu, to prevent being sued.
 - Complete rewrite of the gem
+

data/README.markdown

@@ -2,12 +2,11 @@
 
 uirusu is an [Virustotal](http://www.virustotal.com) automation and convenience tool for hash, file and URL submission.
 
-The current version is 0.0.1
+The current version is 0.0.4.
 
 ## Requirements
 
 * ruby
-* rubygems
 * json
 * rest-client
 
@@ -73,4 +72,4 @@ print results if results != nil
 Uirusu is licensed under the BSD license see the `LICENSE` file for the full license.
 
 ## Contact
-You can reach me at uirusu[@]arxopia[dot]com or http://www.arxopia.com
+You can reach the team at uirusu[@]arxopia[dot]com or http://www.arxopia.com

data/Rakefile

@@ -1,20 +1,20 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
-# Redistributions of source code must retain the above copyright notice, 
+#
+# Redistributions of source code must retain the above copyright notice,
 # this list of conditions and the following disclaimer.
 #
-# Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
 # and/or other materials provided with the distribution.
 #
-# Neither the name of the project's author nor the names of its contributors 
-# may be used to endorse or promote products derived from this software 
+# Neither the name of the project's author nor the names of its contributors
+# may be used to endorse or promote products derived from this software
 # without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@ end
 
 task :release => :build do
   system "gem push #{Uirusu::APP_NAME}-#{Uirusu::VERSION}.gem"
-	puts "Just released #{Uirusu::APP_NAME} v#{Uirusu::VERSION}. #{Uirusu::APP_NAME} is always available in RubyGems! More information at http://hammackj.com/projects/uirusu/"
+	puts "Just released #{Uirusu::APP_NAME} v#{Uirusu::VERSION}. #{Uirusu::APP_NAME} is rubygem for using the Virustotal web service! More information at http://arxopia.com/projects/uirusu/"
 end
 
 task :clean do

data/TODO.markdown

@@ -3,3 +3,4 @@
 **Release dates are estimates, and features can be changed at any time.**
 
 - TESTS!!!!
+- Better docs

data/bin/uirusu

@@ -1,4 +1,6 @@
-# Copyright (c) 2012 Arxopia LLC.
+#!/usr/bin/env ruby
+
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -26,8 +28,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#!/usr/bin/env ruby
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../lib'))
 
 require 'rubygems'

data/lib/uirusu.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 
 module Uirusu
 	APP_NAME = "uirusu"
-	VERSION = "0.0.3"
+	VERSION = "0.0.4"
 	CONFIG_FILE = "~/.uirusu"
 end
 

data/lib/uirusu/cli/application.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,7 @@ module Uirusu
 				begin
 					@options['output'] = :stdout
 					@options['verbose'] = false
+					@options[:timeout] = 25
 				
 					opt = OptionParser.new do |opt|
 						opt.banner =	"#{APP_NAME} v#{VERSION}\nJacob Hammack\nhttp://www.hammackj.com\n\n"
@@ -116,6 +117,10 @@ module Uirusu
 							end
 						end
 
+						opt.on('-p PROXY', '--proxy-server', 'Uses a specified proxy server') do |proxy|
+							@options['proxy'] = proxy
+						end
+
 						opt.on('--[no-]verbose', 'Print verbose information') do |v|
 							@options["verbose"] = v
 						end
@@ -155,6 +160,8 @@ module Uirusu
 					STDERR.puts "[!] #{CONFIG_FILE} does not exist. Please run #{APP_NAME} --create-config, to create it."
 					exit
 				end
+
+				@options[:timeout] = @config["virustotal"]["timeout"] if @config["virustotal"]["timeout"] != nil
 			end
 			
 			# Submits a file/url and waits for analysis to be complete and returns the results.
@@ -203,7 +210,7 @@ module Uirusu
 						nil
 					end	
 				rescue => e					
-					STDERR.puts "[!] An error has occured retrieving the report. Retrying 60 seconds up #{retries} retries.\n" if  @options["verbose"]
+					STDERR.puts "[!] An error has occurred retrieving the report. Retrying 60 seconds up #{retries} retries.\n" if  @options["verbose"]
 					if retries >= 0
 						sleep 60
 						retry
@@ -227,6 +234,10 @@ module Uirusu
 					print "<results>\n"
 				end
 
+				if @options['proxy'] != nil
+					RestClient.proxy = @options['proxy']
+				end
+
 				if @files_of_hashes != nil
 					@files_of_hashes.each do |file|
 						f = File.open(file, 'r')
@@ -239,26 +250,29 @@ module Uirusu
 				end		
 
 				if @hashes != nil
-					@hashes.each do |hash|
+					@hashes.each_with_index do |hash, index|
 						results = Uirusu::VTFile.query_report(@config["virustotal"]["api-key"], hash)
 						result = Uirusu::VTResult.new(hash, results)
 						print result.send output_method if result != nil
+						sleep @options[:timeout] if index != @hashes.length - 1
 					end
 				end
 
 				if @sites != nil
-					@sites.each do |url|
+					@sites.each_with_index do |url, index|
 						results = scan_and_wait(Uirusu::VTUrl, url, 5)
 						result = Uirusu::VTResult.new(results[0], results[1])
 						print result.send output_method if result != nil
+						sleep @options[:timeout] if index != @sites.length - 1
 					end
 				end
 
 				if @uploads != nil
-					@uploads.each do |upload|
+					@uploads.each_with_index do |upload, index|
 						results = scan_and_wait(Uirusu::VTFile, upload, 5)
 						result = Uirusu::VTResult.new(results[0], results[1])						
 						print result.send output_method if result != nil
+						sleep @options[:timeout] if index != @uploads.length - 1
 					end
 				end
 

data/lib/uirusu/vtcomment.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

data/lib/uirusu/vtfile.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ module Uirusu
 			end
 
 			if resource == nil
-				raise "Invalid resource, must be MD5/sha1/sha256/scan_id"
+				raise "Invalid resource, must be md5/sha1/sha256/scan_id"
 			end
 
 			response = RestClient.post REPORT_URL, :apikey => api_key, :resource => resource

data/lib/uirusu/vtresult.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@ module Uirusu
 				end
 			end
 
-			#if we didn't have any results let create a fake not found
+			#if we didn't have any results lets create a fake not found
 			if @results.size == 0
 				res = Hash.new
 				res['hash'] = hash
@@ -111,7 +111,7 @@ module Uirusu
 			result_string = String.new
 			@results.each do |result|
 				result_string << "#{result['hash']}: Scanner: #{result['scanner']} Result: #{result['result']}\n"
-			end
+			end if @results != nil
 
 			print result_string
 		end
@@ -131,7 +131,7 @@ module Uirusu
 				result_string << "  date: #{result['date']}\n"
 				result_string << "  permalink: #{result['permalink']}\n" unless result['permalink'] == nil
 				result_string << "  result: #{result['result']}\n\n"
-			end
+			end if @results != nil
 
 			print result_string
 		end
@@ -152,7 +152,7 @@ module Uirusu
 				result_string << "\t\t<permalink>#{result['permalink']}</permalink>\n" unless result['permalink'] == nil
 				result_string << "\t\t<result>#{result['result']}</result>\n"
 				result_string << "\t</vtresult>\n"
-			end
+			end if @results != nil
 
 			print result_string
 		end

data/lib/uirusu/vturl.rb

@@ -1,20 +1,20 @@
-# Copyright (c) 2012 Arxopia LLC.
+# Copyright (c) 2012-2013 Arxopia LLC.
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
-# Redistributions of source code must retain the above copyright notice, 
+#
+# Redistributions of source code must retain the above copyright notice,
 # this list of conditions and the following disclaimer.
 #
-# Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
 # and/or other materials provided with the distribution.
 #
-# Neither the name of the project's author nor the names of its contributors 
-# may be used to endorse or promote products derived from this software 
+# Neither the name of the project's author nor the names of its contributors
+# may be used to endorse or promote products derived from this software
 # without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -32,7 +32,7 @@ module Uirusu
 	module VTUrl
 		SCAN_URL = "https://www.virustotal.com/vtapi/v2/url/scan"
 		REPORT_URL = "http://www.virustotal.com/vtapi/v2/url/report"
-		
+
 		# Submits a URL to be scanned by Virustotal.com
 		#
 		# @param api_key Virustotal.com API key
@@ -43,13 +43,13 @@ module Uirusu
 			if api_key == nil
 				raise "Invalid API Key"
 			end
-			
+
 			if resource == nil
 				raise "Invalid resource, must be a valid url"
 			end
-			
+
 			response = RestClient.post SCAN_URL, :apikey => api_key, :url => resource
-			
+
 			case response.code
 				when 429
 					raise "Virustotal limit reached. Try again later."
@@ -59,10 +59,10 @@ module Uirusu
 					JSON.parse(response)
 				else
 					raise "Unknown Server error."
-			end	
+			end
 		end
-		
-		# Searchs reports by URL from Virustotal.com
+
+		# Searches reports by URL from Virustotal.com
 		#
 		# @param api_key Virustotal.com API key
 		# @param resource url to search
@@ -72,13 +72,13 @@ module Uirusu
 			if api_key == nil
 				raise "Invalid API Key"
 			end
-			
+
 			if resource == nil
 				raise "Invalid resource, must be a valid url"
 			end
-			
+
 			response = RestClient.post REPORT_URL, :apikey => api_key, :resource => resource
-			
+
 			case response.code
 				when 429
 					raise "Virustotal limit reached. Try again later."
@@ -88,7 +88,7 @@ module Uirusu
 					JSON.parse(response)
 				else
 					raise "Unknown Server error."
-			end			
+			end
 		end
 	end
 end

data/uirusu.gemspec

@@ -1,31 +1,58 @@
+# Copyright (c) 2012-2013 Arxopia LLC.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# Neither the name of the project's author nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 base = __FILE__
 $:.unshift(File.join(File.dirname(base), 'lib'))
 
 require 'uirusu'
 
 Gem::Specification.new do |s|
-	s.name 									= Uirusu::APP_NAME
-	s.version 							= Uirusu::VERSION
-	s.homepage 							= "http://github.com/hammackj/uirusu/"
-	s.summary 							= Uirusu::APP_NAME
-	s.description 					= "uirusu is library for interacting with Virustotal.org"
-	s.license								= "BSD"
-
-	s.author 								= "Jacob Hammack"
-	s.email 								= "jacob.hammack@hammackj.com"
-
-	s.files 								= Dir['[A-Z]*'] + Dir['lib/**/*'] + ['uirusu.gemspec']
-	s.default_executable 		= 'uirusu'
-	s.executables 					= ['uirusu']
-	s.require_paths 				= ["lib"]
-
-	s.required_ruby_version = '>= 1.9.2'
+	s.name = Uirusu::APP_NAME
+	s.version = Uirusu::VERSION
+	s.homepage = "http://github.com/arxopia/uirusu/"
+	s.summary = Uirusu::APP_NAME
+	s.description = "uirusu is library for interacting with Virustotal.org"
+	s.license = "BSD"
+
+	s.author = "Jacob Hammack"
+	s.email = "uirusu@arxopia.com"
+
+	s.files = Dir['[A-Z]*'] + Dir['lib/**/*'] + ['uirusu.gemspec']
+	s.default_executable = 'uirusu'
+	s.executables = ['uirusu']
+	s.require_paths	= ["lib"]
+
+	s.required_ruby_version = '>= 1.9.3'
 	s.required_rubygems_version = ">= 1.8.16"
 
-	s.has_rdoc 							= 'yard'
-	s.extra_rdoc_files 			= ["README.markdown", "LICENSE", "NEWS.markdown", "TODO.markdown"]
+	s.has_rdoc = 'yard'
+	s.extra_rdoc_files = ["README.markdown", "LICENSE", "NEWS.markdown", "TODO.markdown"]
 
 	s.add_dependency('json', '>= 1.5.1')
 	s.add_dependency('rest-client', '>= 1.6.1')
-
 end

metadata

@@ -1,50 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: uirusu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Jacob Hammack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
 description: uirusu is library for interacting with Virustotal.org
-email: jacob.hammack@hammackj.com
+email: uirusu@arxopia.com
 executables:
 - uirusu
 extensions: []
@@ -54,42 +49,42 @@ extra_rdoc_files:
 - NEWS.markdown
 - TODO.markdown
 files:
-- README.markdown
-- LICENSE
-- NEWS.markdown
 - TODO.markdown
 - Rakefile
-- lib/uirusu/vturl.rb
-- lib/uirusu/vtfile.rb
+- NEWS.markdown
+- README.markdown
+- LICENSE
+- lib/uirusu.rb
 - lib/uirusu/cli/application.rb
-- lib/uirusu/vtcomment.rb
 - lib/uirusu/vtresult.rb
-- lib/uirusu.rb
+- lib/uirusu/vtcomment.rb
+- lib/uirusu/vtfile.rb
+- lib/uirusu/vturl.rb
 - uirusu.gemspec
 - bin/uirusu
-homepage: http://github.com/hammackj/uirusu/
+homepage: http://github.com/arxopia/uirusu/
 licenses:
 - BSD
+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.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.16
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: uirusu
 test_files: []
+has_rdoc: yard