work 0.1.0 → 0.2.0

data/bin/play

@@ -16,22 +16,20 @@ end
 # Find the location of the user's work preferences.
 dotfile = Work::DotFile.locate
 
-case ARGV.first
 # We need a list of domains to work with, which is stored in a
 # ~/.work hidden file.
-when 'setup'
-  dotfile = Work::DotFile.locate
+if ARGV.first == 'setup'
   if dotfile.exists?
     puts "Work file already exists at #{dotfile.path}"
   else
-    dotfile.write(Work::DEFAULT_DOMAINS) if !dotfile.exists?
+    dotfile.write!
     puts "Default work domains added to #{dotfile.path}"
   end
 
 # Not a setup command, so we'll need the `Teacher`
 else
   # Warn the user if they've not set up a domains list
-  if dotfile.read.length == 0
+  if dotfile.domains.length == 0
     puts "Domain list is empty.  Add work domains to #{dotfile.path}"
     puts "or run `#{$0} setup` to populate with the default list."
     exit
@@ -39,7 +37,7 @@ else
 
   # If we can't write to the hosts file, re-run but with `sudo`.
   begin
-    p = Work::Teacher.new(dotfile.read, ARGV[1], ARGV[2])
+    p = Work::Teacher.new(dotfile.domains, dotfile.ip)
   rescue Work::HostsFileNotWritable
     sudome
   end
@@ -54,6 +52,9 @@ else
     p.play
   else
     puts "Bums on seats, please."
+    # Clear out any old data in case the domain list or IP address has
+    # been updated and we're just running `work` again without a `play`.
+    p.play
     p.work
   end
 

data/bin/work

@@ -16,22 +16,20 @@ end
 # Find the location of the user's work preferences.
 dotfile = Work::DotFile.locate
 
-case ARGV.first
 # We need a list of domains to work with, which is stored in a
 # ~/.work hidden file.
-when 'setup'
-  dotfile = Work::DotFile.locate
+if ARGV.first == 'setup'
   if dotfile.exists?
     puts "Work file already exists at #{dotfile.path}"
   else
-    dotfile.write(Work::DEFAULT_DOMAINS) if !dotfile.exists?
+    dotfile.write!
     puts "Default work domains added to #{dotfile.path}"
   end
 
 # Not a setup command, so we'll need the `Teacher`
 else
   # Warn the user if they've not set up a domains list
-  if dotfile.read.length == 0
+  if dotfile.domains.length == 0
     puts "Domain list is empty.  Add work domains to #{dotfile.path}"
     puts "or run `#{$0} setup` to populate with the default list."
     exit
@@ -39,7 +37,7 @@ else
 
   # If we can't write to the hosts file, re-run but with `sudo`.
   begin
-    p = Work::Teacher.new(dotfile.read, ARGV[1], ARGV[2])
+    p = Work::Teacher.new(dotfile.domains, dotfile.ip)
   rescue Work::HostsFileNotWritable
     sudome
   end
@@ -54,6 +52,9 @@ else
     p.play
   else
     puts "Bums on seats, please."
+    # Clear out any old data in case the domain list or IP address has
+    # been updated and we're just running `work` again without a `play`.
+    p.play
     p.work
   end
 

data/lib/work.rb

@@ -4,6 +4,7 @@ require 'work/dotfile'
 
 module Work
 
+  DEFAULT_IP = "127.0.0.1"
   DEFAULT_DOMAINS = %w{
     arstechnica.com boingboing.net cnet.com codinghorror.com crunchgear.com
     daringfireball.net digg.com en.wikipedia.org engadget.com engadgetmobile.com

data/lib/work/dotfile.rb

@@ -1,7 +1,10 @@
+require 'yaml'
+
 module Work
   class DotFile
 
-    attr_accessor :path
+    attr_accessor :path, :ip, :domains
+    attr_writer :ip, :domains
 
     def self.locate
       @dotfile ||= self.new File.expand_path(File.join('~', '.work'))
@@ -9,19 +12,32 @@ module Work
 
     def initialize(path)
       @path = path
+      read!
+    end
+
+    def ip
+      @ip ||= Work::DEFAULT_IP
+    end
+
+    def domains
+      @domains ||= Work::DEFAULT_DOMAINS
     end
 
     def exists?
       File.exists? @path
     end
 
-    def read
-      File.readlines(path).collect { |d| d.strip }.sort rescue []
+    def read!
+      if exists?
+        data = YAML.load_file(path)
+        self.ip = data["ip"] if data.has_key?("ip")
+        self.domains = data["domains"].sort if data.has_key?("domains")
+      end
     end
 
-    def write(data)
+    def write!
       File.open(path, 'w+') do |f|
-        f.write(data.is_a?(Array) ? data.join("\n") : data)
+        f.write YAML::dump({ "ip" => ip, "domains" => domains })
       end
     end
 

data/lib/work/teacher.rb

@@ -7,10 +7,10 @@ module Work
 
     attr_accessor :path, :domains, :ip
 
-    def initialize(domains, path=nil, ip=nil)
+    def initialize(domains, ip=nil, path=nil)
       @domains = domains
+      @ip = ip || Work::DEFAULT_IP
       @path = path || "/etc/hosts"
-      @ip = ip || "127.0.0.1"
       raise HostsFileNotWritable if !File.writable?(@path)
     end
 

data/lib/work/version.rb

@@ -1,3 +1,3 @@
 module Work
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: work
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tim Blair