masquito 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475805dc608ba0ec90ad60fe06e97e808c6df2d4
-  data.tar.gz: 064c50eede7608e545e02882de927db547aef397
+  metadata.gz: 10d01491a5d517a67884d816e177870592f4b9a1
+  data.tar.gz: e9aa4089332f7948e84ee93d358e7c6dc856cff4
 SHA512:
-  metadata.gz: 2c47cb5b111aadaa9aec0c214c2078b2c2d423b04e4d6a5d8a7f2d026d153dd801d4fcdcb0937d5a20c7158ae768afe4f303a60eb34b5d159f1f5a03b13c8945
-  data.tar.gz: b1788664477278498a85ff82db93607c751f3669b10abc2cbf2ee1a8a566f9bd0b7ab131ff1689de060bebfa131daa52438d8d5b14c1f0a65009f8f6f3d76e8f
+  metadata.gz: 106f4fd5b3f2741265bceb1021c8c4813d6235f956df46ce441592a513c2ca384becd690725d9d494a03b5ec45d913ef3dd7dd45aaa177f2fcf83a6113fe453a
+  data.tar.gz: ba2ff985b9504500ea9073be2311b0dfe5169059e3663115f8f0c4ee2bac6b22f460baf95281e785a422fe5f49adb79b2053252d5a41bb3cb5910d1ff2b24b1c

data/config/masquito.erb

@@ -1,3 +1,2 @@
 nameserver 127.0.0.1
 port <%= Masquito::DNS::PORT %>
-domain dev

data/lib/masquito/dns.rb

@@ -12,9 +12,9 @@ module Masquito
     }
     @@ttl = 10800 # 3 hours
 
-    def initialize(addr = ADDRESS, port = PORT, config_path = CONFIG_PATH)
+    def initialize(addr = ADDRESS, port = PORT, settings = Settings.new)
       puts "Starting Masquito on #{addr}:#{port}"
-      @settings = Settings.new(config_path)
+      @settings = settings
 
       # Bind port to receive requests
       socket = UDPSocket.new

data/lib/masquito/install.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'fileutils'
 require 'lunchy'
 require 'tempfile'
+require 'pathname'
 
 module Masquito
   GEM_PATH = File.expand_path('../../../', __FILE__)
@@ -10,7 +11,7 @@ module Masquito
   SERVICE_NAME = File.basename(PLIST_NAME, '.plist')
 
   RESOLVER_TEMPLATE_PATH = File.join(GEM_PATH, 'config', 'masquito.erb')
-  RESOLVER_PATH = '/etc/resolver/masquito'
+  RESOLVERS_PATH = Pathname.new('/etc/resolver')
 
   module Install
     class << self
@@ -43,12 +44,16 @@ module Masquito
         abort_unless_superuser
         resolver = ERB.new(File.read(RESOLVER_TEMPLATE_PATH))
         template = resolver.result(binding)
-        File.open(RESOLVER_PATH, 'w') { |f| f.write(template) }
+        Masquito::Settings.new.domains.each do |domain|
+          File.open(RESOLVERS_PATH.join(domain.to_s), 'w') { |f| f.write(template) }
+        end
       end
 
       def resolver_uninstall
         abort_unless_superuser
-        FileUtils.rm_rf(RESOLVER_PATH)
+        Masquito::Settings.new.domains.each do |domain|
+          FileUtils.rm_rf(RESOLVERS_PATH.join(domain.to_s))
+        end
       end
 
       private

data/lib/masquito/settings.rb

@@ -3,7 +3,7 @@ require 'pathname'
 
 module Masquito
   class Settings
-    def initialize(config_path)
+    def initialize(config_path = CONFIG_PATH)
       @pattern = File.join(config_path, '*')
     end
 

data/lib/masquito/version.rb

@@ -1,3 +1,3 @@
 module Masquito
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

data/lib/masquito.rb

@@ -1,8 +1,8 @@
 module Masquito
   CONFIG_PATH = File.join(ENV['HOME'], '.masquito')
 
-  autoload :DNS, 'masquito/dns'
+  autoload :DNS,      'masquito/dns'
   autoload :Settings, 'masquito/settings'
-  autoload :Install, 'masquito/install'
-  autoload :VERSION, 'masquito/version'
+  autoload :Install,  'masquito/install'
+  autoload :VERSION,  'masquito/version'
 end

data/masquito.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'lunchy'
+
+  gem.add_development_dependency 'rake'
 end

data/test/dns_test.rb

@@ -17,7 +17,7 @@ class TestMasquitoDNS < Test::Unit::TestCase
     end
 
     @thread = Thread.new do
-      Masquito::DNS.new('127.0.0.1', '51234', TEMP_DIR)
+      Masquito::DNS.new('127.0.0.1', '51234', Masquito::Settings.new(TEMP_DIR))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masquito
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Dmitry Vorotilin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lunchy
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Masquito is a dns masquerading server for rubists
 email:
 - d.vorotilin@gmail.com
@@ -78,3 +92,4 @@ test_files:
 - test/dns_test.rb
 - test/settings_test.rb
 - test/test_helper.rb
+has_rdoc: