disavow_tool 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db2e508792ce319b2f11c7e4dd43a3e7d31b875a0c3d80aa97828b600e34e96
-  data.tar.gz: 868088592ece6710d0326ce9b586c79e072f083cb9bdc2060998c1649552bc87
+  metadata.gz: 77189b8d9bcfe6f39a02e4f6f9c1029a8e0195db398a77cc3b41710298b29b48
+  data.tar.gz: 7420106da6fe2ff050a538c7d65b76bea2215513a1992d1ec230d8432da52e99
 SHA512:
-  metadata.gz: a7e6e2ab72198469ff1ec3cfa68497fbefcfec8eba7746ad1c2e17a087a045f2a8c1539de12642c04841256e83958095a20d0c0bc06b625940baf52c796b0546
-  data.tar.gz: a4da05637f583bf94cd3b4eb83c234297adf18954339757529e8ace255a008bf6674ed2fa2c80184dcf1002fc624b31695290b7161cfa304e18b58ce74901776
+  metadata.gz: bfba74cb97ecbcb18513d916db793aa2504d9c64e3502cfab5719b3452b1ab1d1886532a4370906eaf34b47651169d2ab649a9e958be1af76b62a174e062dee9
+  data.tar.gz: 567a7ea282a3a726eeae9ca838f4223a0d126a3812edb035991ca93d836dfdb8c87375ca056ae31d973be8b2735689dcefdecf33a5bcdc4b5854636aa1a0ef2a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    disavow_tool (0.3.0)
+    disavow_tool (0.3.2)
       activesupport
       colorize
       nokogiri

data/lib/disavow_tool/imported_links.rb

@@ -6,7 +6,11 @@ require 'timeout'
 module DisavowTool
   class ImportedLinks < List
 
+
+
     def initialize(import_file=nil)
+      @menu_options = {whitelist_domain: "W", whitelist_url: "w", whitelist_all_urls: "a",
+                      disavow_domain: "D", disavow_url: "d", open_in_browser: "o", exit: "."}
       super(OPTIONS.import_files)
     end
 
@@ -29,31 +33,47 @@ module DisavowTool
          end
          puts "* URls with this same domain: #{urls_with_same_domain(url)}"
          puts "*\n#{"*"*100}"
-         puts menu()
-         input = $stdin.getch
-         input = $stdin.getch if open_browser_option(input, url)
-         case input
-              when "w"
-                raise "Command run with no whitelist option" if OPTIONS.whitelist == false
-                white_list.add_url url
-                self.delete_url url
-              when "W"
-                raise "Command run with no whitelist option" if OPTIONS.whitelist == false
-                domain = white_list.add_domain_from_url(url)
-                self.delete_url url
-                puts "Attempting to remove URLs with the domain #{domain} from imported links to stop anaylsing"
-                self.delete_urls_if_domains(domain)
-              when "a"
-                white_list.add_urls_with_same_domain_as url, self
-              when "d"
-                domain = disavowed.add_domain_from_url(url)
-                self.delete_url url
-                puts "Attempting to remove URLs with the domain #{domain} from imported links to stop anaylsing"
-                self.delete_urls_if_domains(domain)
-              when "u"
-                disavowed.add_url(url)
-                self.delete_url url
-              else raise "Invalid character."
+
+         loop do
+           puts menu()
+           input = $stdin.getch
+           case input
+                when @menu_options[:whitelist_url]
+                  raise "Command run with no whitelist option" if OPTIONS.whitelist == false
+                  white_list.add_url url
+                  self.delete_url url
+
+                when @menu_options[:whitelist_domain]
+                  raise "Command run with no whitelist option" if OPTIONS.whitelist == false
+                  domain = white_list.add_domain_from_url(url)
+                  self.delete_url url
+                  puts "Attempting to remove URLs with the domain #{domain} from imported links to stop anaylsing"
+                  self.delete_urls_if_domains(domain)
+
+                when @menu_options[:whitelist_all_urls]
+                  white_list.add_urls_with_same_domain_as url, self
+
+                when @menu_options[:disavow_domain]
+                  domain = disavowed.add_domain_from_url(url)
+                  self.delete_url url
+                  puts "Attempting to remove URLs with the domain #{domain} from imported links to stop anaylsing"
+                  self.delete_urls_if_domains(domain)
+
+                when @menu_options[:disavow_url]
+                  disavowed.add_url(url)
+                  self.delete_url url
+
+                when @menu_options[:open_in_browser]
+                  open_browser(url)
+
+                when @menu_options[:exit]
+                  exit
+
+                else
+                  puts "Incorrect option selected"
+           end
+           next if input == @menu_options[:open_in_browser]
+           break if @menu_options.value?(input) unless input == @menu_options[:open_in_browser]
          end
        puts "\n\n#{@list.count} Remaining links to analize".blue
        end
@@ -76,17 +96,22 @@ module DisavowTool
     :private
     def menu
       message = ""
-      message = "[w] Whitelist url [W] Whitelist the entire domain [a] whitelist as url All urls with this domain\n" if OPTIONS.whitelist
-      message += "[d] Disavow as domain [u] Disavow as a URL [o] to open the URL."
+      if OPTIONS.whitelist
+        message = "[#{@menu_options[:whitelist_domain]}] Whitelist as domain "\
+                  "[#{@menu_options[:whitelist_url]}] Whitelist URL "\
+                  "[#{@menu_options[:whitelist_all_urls]}] whitelist as url All urls with this domain\n"
+      end
+      message += "[#{@menu_options[:disavow_domain]}] Disavow as domain "\
+                 "[#{@menu_options[:disavow_url]}] Disavow as URL\n"\
+                 "[#{@menu_options[:open_in_browser]}] to open the URL "\
+                 "[#{@menu_options[:exit]}] to exit"
+
     end
 
-    def open_browser_option(input, link)
-      if input == "o"
-          if Gem.win_platform? then system "start chrome #{link}" else system "open -a safari #{link}" end
-          puts "Opening #{link}...".blue
-          puts menu
-          return true
-        end
+    def open_browser(link)
+      if Gem.win_platform? then system "start chrome #{URL.escape(link)}" else system "open -a safari #{link}" end
+      puts "Opening #{link}...".blue
+      return true
     end
 
     def website_title(url)

data/lib/disavow_tool/list.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'fileutils'
 
 module DisavowTool
   class List
@@ -112,6 +113,7 @@ module DisavowTool
       now = Time.now.strftime("%Y%m%d%H")
       file_name = self.class.to_s.underscore + "_" + now
       export_file = export_file || EXPORT_PATH + file_name
+      FileUtils.mkdir_p File.dirname(export_file)
       file = File.new(export_file, "w")
       file.puts "# Exporting #{self.class.to_s.underscore} #{ now }"
       export_write(file)

data/lib/disavow_tool/version.rb

@@ -1,3 +1,3 @@
 module DisavowTool
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disavow_tool
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Maesitos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler