blockhosts 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f35e5c7b868eefb3b5b184ab01f5883d86adc44dc519f2065eb7e19cebee1c
-  data.tar.gz: 1ab911b3b884e473b763974267b445a780e0d6794678fadfd8fd83c05a2b91c8
+  metadata.gz: 3f05c99989ffd139291184309fcfd62a38087c6589dce286ecd888ad3c631daf
+  data.tar.gz: 83f046385ec592077b82d586978430de8c3e4893f3010eefbe2f69295b933696
 SHA512:
-  metadata.gz: 25edfcc06f3cebac99ed20789509cbbf5baeb6f9a2ef96a69e4de18f7da242cb8faa4007bbcd8485787ad68d03fdecd972a3cd037c64d89144113b37cd89cd43
-  data.tar.gz: 75e99d4c0899430c8a7f04a4a8cecebcd97f1ad38f79fbf7e450033c93ed40d1bdc59b50dfb309879a0c08e0fd697afaff5eadbf74ef31420ccc2e1ad176bad7
+  metadata.gz: 79bfc2e31f79338a71c3fb2a28216c8f0840b3ff8a7a8187bb9b111ab7a8bac8413f6971dd7b0a255dda035d088f79eddfbb502ce34765e09927f3065dd16673
+  data.tar.gz: 841a89102afbdce169b4f255a593a0d6b4fbbe1fd192b9e6b9dd1faf7af205d094eb6c782ef72f290b5f5aae948b4701eaf666a0c32dd7d8d0ec620a4010d755

data/lib/blockhosts.rb

@@ -2,10 +2,12 @@
 
 # file: blockhosts.rb
 
+require 'sps-sub'
 require 'rxfhelper'
 
 
 class Host
+  include RXFHelperModule
 
   @ip = '127.0.0.1'
 
@@ -16,17 +18,21 @@ class Host
     '/etc/hosts'
   end
 
-  def self.add(hostname, banlist=nil, 
-               hashtag=hostname.sub(/^www./,'').gsub('-','').gsub('.','dot'))
+  def self.add(hostname, 
+               hashtag=hostname.sub(/^www./,'').gsub('-','').gsub('.','dot'),
+               banlist: nil, block: false)
 
+    b = block ? '' : '#'
+    
     s = if banlist then
 
       hashtag = hostname.sub(/^#/,'')
       list, _ = RXFHelper.read(banlist)
-      list.lines.map {|hostx| "##{@ip} #{hostx.chomp} ##{hashtag}" }.join("\n")
+      list.lines.map {|hostx| "#{b}#{@ip} #{hostx.chomp} ##{hashtag}" }\
+          .join("\n")
 
     else
-      "##{@ip} #{hostname} ##{hashtag}"
+      "#{b}#{@ip} #{hostname} ##{hashtag}"
     end
 
     open(@file, 'a') { |f| f.puts s } unless File.read(@file).include? hostname
@@ -35,7 +41,7 @@ class Host
   def self.disable(hashtag)   
 
     modify() do |line|
-      line.gsub(/^#([^#]+##{hashtag.sub(/^#/,'')}[^$]+$)/,'\1')
+      line.gsub(/^#([^#]+##{hashtag.sub(/^#/,'')}[^$]+)/,'\1')
     end
 
   end
@@ -54,6 +60,19 @@ class Host
 
   end
   
+  def self.exists?(host)
+    s = File.read(@file)
+    s.lines.grep(/\s#{host}\s/).any?
+  end
+  
+  def self.export(hashtag, filename=nil)
+    
+    s = self.view(hashtag)
+     
+    filename ? FileX.write(filename, s) : s
+     
+  end
+  
   def self.block(hashtag)   self.disable(hashtag)  end  
   def self.unblock(hashtag) self.enable(hashtag)   end
 
@@ -73,4 +92,56 @@ class Host
 
   end  
   
+  def self.view(hashtag)
+    
+    File.read(@file).lines.select {|x| x =~ /##{hashtag}/}\
+         .map {|x| x[/(?<=#{@ip} )[^ ]+/]}.join("\n")    
+    
+  end
+  
+end
+
+class HostsE
+  include RXFHelperModule
+
+  def initialize(filename='hostse.txt', sps_host: '127.0.0.1',
+        sps_port: '59053', hostname: Socket.gethostname, 
+        topic: 'dnslookup/' + hostname, debug: false)
+
+    @sps_host, @sps_port, @topic, @debug = sps_host, sps_port, topic, debug
+    @filename = filename
+    @entries = FileX.read(filename).lines
+
+  end
+
+  def subscribe(topic=@topic)
+
+    sps = SPSSub.new(host: @sps_host, port: @sps_port)
+
+    sps.subscribe(topic: topic + ' or reload' ) do |host, topic|
+
+      if topic == 'reload' then
+        @entries = FileX.read(@filename).lines 
+        puts 'reloaded ' if @debug
+        next
+      end
+      
+      puts 'host: ' + host.inspect if @debug      
+      
+      @entries.each do |line|
+
+        pattern, hashtag = line.split(/\s+#/)
+        puts 'pattern: ' + pattern.inspect if @debug
+
+        if host =~ /#{pattern.gsub('*','.*')}/ then
+          puts 'adding host' if @debug
+          Host.add(host, hashtag, block: true) unless Host.exists? host
+
+        end
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blockhosts
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   7vecf9qfrpZt4fjOajWBWWZEUQ3QKHva1uNegE75UqN77YfewLL+A+SrV0ORhL9q
   /sJ0X03RC0pDp5fyhHmUoTyT
   -----END CERTIFICATE-----
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: sps-sub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.7
 description: 
 email: james@jamesrobertson.eu
 executables: []