wmap 2.6.9 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fcf909fd9549bdc0c1339d986ec7812563474ef4c9e6b1aa76ca3790b038a5
-  data.tar.gz: 2098e60fc667bf8ba02fa852242ffb2a515ebe04374177f4bf1a50bdb69a05ef
+  metadata.gz: 0306e6992ff754b34724ecd2c7e538531d747a8a0a7b75f6eabe12698f161ddd
+  data.tar.gz: 3282d7c8a30e6526c201dcb8c3270554b2079bb675d50b16e3753c55f144881c
 SHA512:
-  metadata.gz: ea7e49f2b0913ad1159226268355ea9e339468929b614fff99e24b4e1b43fc4225560466930023f2691deb5b3547eaf9a41ada8cdc9128401389e96a5ef2865a
-  data.tar.gz: ba6d2efe7f4ebf1b9bd761b5d4235744ddbdde8a398cefc07af7465a2c5c974e0f6c91c3dbf573659a6de2eca1b01af8434439e63c3a1b125de7b241e7d0feab
+  metadata.gz: 50a6e01ed24576c33592a1564116ee709ec8f9eaca5122fbe04408e546d4ea5799321dbf5f23ea4b8e3b2e90da0cdb9772733f295d28629cb05be9115c62da89
+  data.tar.gz: 38931b0d2de732debd9e4c09fca532b8f192067e3058ceb86a1db61a86a80bffa9a43b334c79a87e0e6887da83b21af2076044ca45b2bc43bf4b5845fafb1dfb

data/bin/wadds

@@ -1,40 +1,52 @@
 #!/usr/bin/env ruby
 # Executable to bulk add sites into the tracking data repository
 require "wmap"
+require "optparse"
 
-def print_usage
-	puts "Program to add sites from a file into local data repository. Usage: wadds [file_sites]"
+# program command line options
+options = {:data_dir => nil, :target => nil, :verbose => false}
+parser = OptionParser.new do|opts|
+	opts.banner = Wmap.banner
+	opts.on('-d', '--data_dir data_dir', 'Web Mapper local cache data directory') do |data_dir|
+		options[:data_dir] = data_dir;
+	end
+	opts.on('-t', '--target target', 'Web Mapper target') do |target|
+		options[:target] = target;
+	end
+	opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+		options[:verbose] = v;
+	end
+	opts.on('-h', '--help', 'Displays Help') do
+		puts opts
+		exit 0
+	end
 end
-
+parser.parse!
 puts Wmap.banner
-print_usage
-abort "Incorrect program argument!" unless File.exist?(ARGV[0])
 
-if ARGV.length == 1
+if options[:data_dir]
 	# Log the command entry
-	Log_dir = File.dirname(__FILE__)+'/../logs/'
-elsif ARGV.length == 2
-	# Log to the instance running directory
-	Log_dir = File.dirname(__FILE__)+'/../logs/' + ARGV[1]
+	Log_dir = Pathname.new(options[:data_dir]).join('logs')
+else
+	Log_dir=Pathname.new(Gem.loaded_specs['wmap'].full_gem_path).join('logs')
 end
 Dir.mkdir(Log_dir) unless Dir.exist?(Log_dir)
-Wmap.wlog("Execute the command: wadds #{ARGV[0]}","wadds",Log_dir+"wmap.log")
 
-if ARGV.length == 1
-	puts puts "Invoke the SiteTracker."
-	st=Wmap::SiteTracker.instance
-	st.verbose=false
-elsif ARGV.length == 2
+Wmap.wlog("Execute the command: wadds #{options[:target]}","wadds",Log_dir+"wmap.log")
+
+if File.exist?(options[:target]) && options[:data_dir]
 	puts puts "Invoke the SiteTracker."
 	st=Wmap::SiteTracker.instance
-	st.verbose=false
-	st.data_dir=ARGV[1]
+	st.verbose=options[:verbose]
+	st.data_dir = options[:data_dir]
+	st.sites_file = st.data_dir + "/" + "sites"
+	st.load_site_stores_from_file(st.sites_file)
 else
 	aborts "Error firing up SiteTracker instance!"
 end
 
 # Evaluate the argument and update the data store accordingly
-sites=st.file_2_list(ARGV[0]).map { |x| st.url_2_site(x) }
+sites=st.file_2_list(options[:target]).map { |x| st.url_2_site(x) }
 if sites.length > 0
 	news=st.adds(sites)
 	puts news
@@ -42,5 +54,5 @@ if sites.length > 0
 	st=nil
 else
 	st=nil
-	abort "No site entry found in file: #{ARGV[0]}. Please check your file format to ensure one site per line."
+	abort "No site entry found in file: #{options[:target]}. Please check your file format to ensure one site per line."
 end

data/version.txt

@@ -3,8 +3,8 @@
 ###############################################################################
 package = wmap
 # wmap version 2.0 == web_discovery version 1.5.3
-version = 2.6.9
-date = 2019-12-02
+version = 2.7.0
+date = 2020-03-09
 
 author = Sam (Yang) Li
 email = yang.li@owasp.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wmap
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.7.0
 platform: ruby
 authors:
 - Sam (Yang) Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsruby