blocklist 0.1.3 → 0.1.4

data/blocklist.gemspec

@@ -3,8 +3,8 @@ 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.3'
-  s.date         = '2009-09-16'
+  s.version      = '0.1.4'
+  s.date         = '2009-09-18'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]
   s.email        = "narnach@gmail.com"

data/lib/blocklist/cli.rb

@@ -27,6 +27,7 @@ class Blocklist
     end
 
     def add
+      auto_add = @argv.delete('-a')
       block_name = @argv.shift
       unless block = @bl.block(block_name)
         block = Blocklist::Block.new(block_name)
@@ -46,7 +47,9 @@ class Blocklist
         dom_no_tld = dom_segments[0...-tld_size]
         domain_base = dom_no_tld.last
         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
+        subdomains_to_add = [subdomain]
+        subdomains_to_add += [nil, 'www'] if auto_add
+        new_domains = subdomains_to_add.uniq.map {|sub| [sub, domain_base, tld].compact.join(".")} - domains
         if new_domains.size > 0
           new_line = Blocklist::Line.new('127.0.0.1', *new_domains)
           new_line.commented = comment_new_lines
@@ -85,10 +88,10 @@ Flags:
     Quiet mode. Minimizes the output to STDOUT
 
 Commands:
-  add <block name> [domain1] .. [domainN]
+  add [-a] <block name> [domain1] .. [domainN]
     Add a number of domains to the specified block.
-    Each domain will automatically be added with the www subdomain and without subdomain.
     Duplicate domains are skipped.
+    When -a is given, the base domain and www-subdomain for each domain wil automatically be added.
   list
     Shows a list of all blocks currently defined
   toggle <block name>

data/spec/blocklist/cli_spec.rb

@@ -20,8 +20,9 @@ describe Blocklist::Cli do
     File.open('/etc/hosts','w') {|f| f.puts content}
   end
   
-  def run(cmd)
+  def run(cmd, silent=true)
     cli = Blocklist::Cli.new(cmd.split(" "))
+    cli.stub!(:puts) if silent
     cli.run
     cli
   end
@@ -47,14 +48,25 @@ describe Blocklist::Cli do
   end
 
   describe 'add' do
-    it "should add a domain and its www-subdomain to a block's lines" do
+    it "should add the chosen subdomain to a block's lines" do
       fake_hosts <<-STR
 # localhost
       STR
       run 'add localhost example.org'
       File.read('/etc/hosts').should == <<-STR
 # localhost
-127.0.0.1       example.org www.example.org
+127.0.0.1       example.org
+      STR
+    end
+
+    it "should add the chosen subdomain, the domain and the www-subdomain to a block's lines when -a is given" do
+      fake_hosts <<-STR
+# localhost
+      STR
+      run 'add -a localhost news.example.org'
+      File.read('/etc/hosts').should == <<-STR
+# localhost
+127.0.0.1       news.example.org example.org www.example.org
       STR
     end
 
@@ -69,7 +81,7 @@ describe Blocklist::Cli do
 127.0.0.1       localhost
 
 # example
-127.0.0.1       example.org www.example.org
+127.0.0.1       example.org
       STR
     end
 
@@ -83,7 +95,7 @@ describe Blocklist::Cli do
       File.read('/etc/hosts').should == <<-STR
 # localhost
 # 127.0.0.1       localhost
-# 127.0.0.1       example.org www.example.org
+# 127.0.0.1       example.org
       STR
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blocklist
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +02:00
+date: 2009-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: []