blockhosts 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3410bf876c4374350ebfe70a76a7f88d3e7575017972acf8843f08d9c3c85488
-  data.tar.gz: 73e2f8780d1c634f961a1940c0709f30d7e198e28d6069b76e28984229ffe1ed
+  metadata.gz: 40724e7916a86388c65a9edf705d05ffbf796b27702f4ed03639d17cc9dda8e4
+  data.tar.gz: 2ef36ae952b23b74294d48347e6aca9ff777c7e661f9b43221883869013b1c7c
 SHA512:
-  metadata.gz: 4aa7d87eee37c39784fa31444300016e8fb16f0455cdcd4fa5ee361bc30f8ceea5e6c405af55f1b9b4a4f8d6b8e43f4e7a93e6fa2b7b5205b1bc3295635aaf26
-  data.tar.gz: 9ef3feafd803acee6a6cab23efd18eeb776277740c2e55dbb9d59b00b2fb80015a172a4d5125213ed89a4d8c76d38359958490b3397f0d7cca5e2f646074e8e6
+  metadata.gz: e2ff940762b4f739729c0d0d87702cfeed125207671418be58103bdca2cb5afc6a2906661a7f744579f5e7f8ef61438d1f4626499921ee4d9de0be6513fc4050
+  data.tar.gz: 0c398104cdbafb9ec82cb4d94161d89df425a83c9da59893540ac9dff44b22817c23590105a2b84bdc94092ee3946a435fb7d8016e4dda05830fa388a4d87630

data/lib/blockhosts.rb

@@ -3,6 +3,8 @@
 # file: blockhosts.rb
 
 
+require 'rxfhelper'
+
 class Host
 
   @ip = '127.0.0.1'
@@ -16,25 +18,53 @@ class Host
     '/etc/hosts'
   end
 
-  def self.add(hostname)
-    s = "#{@ip} #{hostname}"
+  def self.add(hostname, banlist=nil, 
+               hashtag=hostname.sub(/^www./,'').gsub('-','').gsub('.','dot'))
+
+    s = if banlist then
+
+      hashtag = hostname.sub(/^#/,'')
+      list, _ = RXFHelper.read(banlist)
+      list.lines.map {|hostx| "#{@ip} #{hostx.chomp} ##{hashtag}" }.join("\n")
+
+    else
+      "#{@ip} #{hostname} ##{hashtag}"
+    end
+
     open(@file, 'a') { |f| f.puts s } unless File.read(@file).include? hostname
   end
 
-  def self.disable(hostname)
-    modify() {|s| s.sub(/^#(#{@ip}\s+#{hostname}[^$]+)$/,'\1')}
+  def self.disable(hashtag)   
+
+    modify() do |line|
+      line.gsub(/^#([^#]+##{hashtag.sub(/^#/,'')}[^$]+$)/,'\1')
+    end
+
   end
 
-  def self.enable(hostname)
-    modify() {|s| s.sub(/^(#{@ip}\s+#{hostname}[^$]+)$/,'#\1')}
+  def self.enable(hashtag)
+
+    modify() do |line|
+      
+      if line[0] == '#' then
+        line
+      else
+        line.gsub(/^([^^]+##{hashtag.sub(/^#/,'')}[^$]+$)/,'#\1')
+      end
+      
+    end
+
   end
+  
+  def self.block(hashtag)   self.disable(hashtag)  end  
+  def self.unblock(hashtag) self.enable(hashtag)   end
 
   def self.modify()
    
     return unless block_given?
 
     s = File.read(@file)
-    s2 = yield(s)
+    s2 = s.lines.map {|x| yield(x)}.join
     File.write(@file, s2) unless s == s2
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blockhosts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson