blocklist 0.1.2 → 0.1.3

data/blocklist.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.name         = 'blocklist'
   s.summary      = "Blocklist manages /etc/hosts"
   s.description  = "Blocklist manages /etc/hosts with the goal of routing distracting websites to localhost. It also works well as an ad blocker."
-  s.version      = '0.1.2'
+  s.version      = '0.1.3'
   s.date         = '2009-09-16'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]

data/lib/blocklist/cli.rb

@@ -32,7 +32,10 @@ class Blocklist
         block = Blocklist::Block.new(block_name)
         @bl.blocks << block
       end
-
+      
+      commented_lines = block.lines.inject(0) {|sum, line| line.commented ? sum + 1 : sum}
+      uncommented_lines = block.lines.size - commented_lines
+      comment_new_lines = commented_lines > uncommented_lines
 
       domains = block.lines.map {|line| line.domains}.flatten
       saved_domains = @argv.map do |domain|
@@ -45,7 +48,9 @@ class Blocklist
         subdomain = dom_no_tld.size == 1 ? nil : dom_no_tld[0...-1].join(".")
         new_domains = [nil, 'www', subdomain].uniq.map {|sub| [sub, domain_base, tld].compact.join(".")} - domains
         if new_domains.size > 0
-          block.lines << Blocklist::Line.new('127.0.0.1', *new_domains)
+          new_line = Blocklist::Line.new('127.0.0.1', *new_domains)
+          new_line.commented = comment_new_lines
+          block.lines << new_line
           domains.concat(new_domains)
         end
         new_domains

data/spec/blocklist/cli_spec.rb

@@ -19,6 +19,12 @@ describe Blocklist::Cli do
   def fake_hosts(content='')
     File.open('/etc/hosts','w') {|f| f.puts content}
   end
+  
+  def run(cmd)
+    cli = Blocklist::Cli.new(cmd.split(" "))
+    cli.run
+    cli
+  end
 
   it 'should display help when no command is given' do
     fake_hosts
@@ -45,8 +51,7 @@ describe Blocklist::Cli do
       fake_hosts <<-STR
 # localhost
       STR
-      cli = Blocklist::Cli.new(%w[add localhost example.org])
-      cli.run
+      run 'add localhost example.org'
       File.read('/etc/hosts').should == <<-STR
 # localhost
 127.0.0.1       example.org www.example.org
@@ -58,8 +63,7 @@ describe Blocklist::Cli do
 # localhost
 127.0.0.1       localhost
       STR
-      cli = Blocklist::Cli.new(%w[add example example.org])
-      cli.run
+      run 'add example example.org'
       File.read('/etc/hosts').should == <<-STR
 # localhost
 127.0.0.1       localhost
@@ -68,5 +72,19 @@ describe Blocklist::Cli do
 127.0.0.1       example.org www.example.org
       STR
     end
+
+
+    it 'should add a domain commented-out if there are more commented-out domains in the block' do
+      fake_hosts <<-STR
+# localhost
+# 127.0.0.1       localhost
+      STR
+      run 'add localhost example.org'
+      File.read('/etc/hosts').should == <<-STR
+# localhost
+# 127.0.0.1       localhost
+# 127.0.0.1       example.org www.example.org
+      STR
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blocklist
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Wes Oldenbeuving