localdev 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ee8a71006d5f83bb9d7337d69694981c8f58bc
-  data.tar.gz: 3d845faf2a9dbd5ddbc51a33f13ab26493856805
+  metadata.gz: ebc540a4cd5ea1afa2d2105340916d0c87f532a1
+  data.tar.gz: 8dd912ccd5ee08e8a24b05a84d115b6981e2647e
 SHA512:
-  metadata.gz: cd1eac2f6ccbd745aa334ab385e1e461e7218821fa5fe08708d25d6bd3b875bc185ab50fd2179e5324e400759b4566394467be09febc3aa0b51ec3b2c02a9814
-  data.tar.gz: 9b2a9cd25c95330a5154c04b286f3bd38a26fa9119000c67c64350abd21d572ad2110413c5ae4b5367c3aa5211f503dc85542ceae0a0f2bbdae609f09e3325ff
+  metadata.gz: 36236ab97c1728cf2216c95817e7a11e02f1032a65e29651498b29e1680018db18c4d5221a78aa5fdceec55c1e63647d5fabb942c2dbdd289bd104a00152db8c
+  data.tar.gz: 15d62ffa4ce494922763c2266b0ecfcb3a74d68bdad0aadc3c2c20c4519244dab2d31fd5c27ccdcb45631b42b5999f061c98f9ebe7be112d272e4aa41ee2a1c2

data/lib/localdev.rb

@@ -1,7 +1,7 @@
 #
 # Localdev - Hosts file tool for local development
 #
-# Copyright 2011 by Mark Jaquith
+# Copyright 2011-2015 by Mark Jaquith
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'digest/md5'
+require 'yaml'
 
 class Localdev
-	VERSION = '0.3.2'
+	VERSION = '0.4.0'
 
 	def initialize
-		@debug = false
+		@debugMode = false
 		@localdev = '/etc/hosts-localdev'
 		@hosts = '/etc/hosts'
 		@start = '#==LOCALDEV==#'
@@ -44,9 +45,13 @@ class Localdev
 				require_sudo
 				object.nil? && exit_error_message("'localdev #{command}' requires you to provide a domain")
 				ensure_localdev_exists
-				send command, object
+				if ARGV.first.nil?
+					send command, object
+				else
+					send command, object, ARGV.first
+				end
 			when nil, '--help', '-h'
-				exit_message "Usage: localdev [on|off|status|list|clear]\n       localdev [add|remove] domain"
+				exit_message "Usage: localdev [on|off|status|list|clear]\n       localdev [add|remove] domain [ip-address]"
 			else
 				exit_error_message "Invalid command"
 		end
@@ -63,7 +68,7 @@ class Localdev
 	end
 
 	def debug message
-		puts message if @debug
+		puts message if @debugMode
 	end
 
 	def exit_message message
@@ -87,7 +92,8 @@ class Localdev
 		disable
 		domains = []
 		File.open( @localdev, 'r' ) do |file|
-			domains = file.read.split("\n").uniq
+			domains = YAML::load file.read
+			domains = [] unless domains.respond_to? 'each'
 		end
 		File.open( @hosts, 'a' ) do |file|
 			file.puts "\n"
@@ -95,7 +101,8 @@ class Localdev
 			file.puts "# The md5 dummy entries are here so that things like MAMP Pro don't"
 			file.puts "# discourtiously remove our entries"
 			domains.each do |domain|
-				file.puts "127.0.0.1 #{Digest::MD5.hexdigest(domain)}.#{domain} #{domain}"
+				# puts domain.inspect
+				file.puts "#{domain['ip']} #{Digest::MD5.hexdigest(domain['domain'])}.#{domain['domain']} #{domain['domain']}"
 			end
 			file.puts @end
 		end
@@ -134,32 +141,43 @@ class Localdev
 	def update_localdev
 		domains = []
 		File.open( @localdev, 'r' ) do |file|
-			domains = file.read.split("\n")
+			domains = YAML::load file.read
+			domains = [] unless domains.respond_to? 'each'
 			debug domains.inspect
 			yield domains
 			debug domains.inspect
 		end
 		File.open( @localdev, 'w' ) do |file|
-			file.puts domains
+			file.puts YAML::dump domains
 		end
 	end
 
-	def add domain
-		update_localdev {|domains| domains << domain unless domains.include? domain }
+	def add domain, ip='127.0.0.1'
+		domain = {
+			'domain' => domain,
+			'ip' => ip
+		}
+
+		_remove domain['domain']
+		update_localdev {|domains| domains << domain }
 		enable if :on == get_status
-		puts "Added '#{domain}'"
+		puts "Added #{domain['domain']} => #{domain['ip']}"
 		status
 	end
 
 	def remove domain
-		update_localdev {|domains| domains = domains.delete domain }
+		_remove domain
 		enable if :on == get_status
-		puts "Removed '#{domain}'"
+		puts "Removed #{domain}"
 		status
 	end
 
+	def _remove domain
+		update_localdev {|domains| domains = domains.delete_if{|item| item['domain'] == domain } }
+	end
+
 	def clear
-		update_localdev {|domains| domains.clear() }
+		update_localdev {|domains| domains.clear }
 		enable if :on == get_status
 		puts "Removed all domains"
 		status
@@ -181,7 +199,10 @@ class Localdev
 
 	def list
 		File.open( @localdev, 'r' ) do |file|
-			puts file.read
+			domains = YAML::load file.read
+			domains.each do |domain|
+				puts "#{domain['domain']} => #{domain['ip']}"
+			end
 		end
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: localdev
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Jaquith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies: []
 description: Localdev manages part of your hosts file and lets you specify domains
   to host locally. You can quickly enable or disable local hosting of those domains.