landrush 0.7.0 → 0.7.1

data/lib/landrush/resolver_config.rb

@@ -13,26 +13,31 @@ module Landrush
       `uname`.chomp == 'Darwin'
     end
 
+    def self.config_dir
+      @config_dir ||= Pathname('/etc/resolver')
+    end
+
     def self.config_file
-      @config_file ||= Pathname('/etc/resolver/vagrant.dev')
+      config_dir.join('vagrant.dev')
     end
 
     def self.contents_match?
       config_file.exist? && File.read(config_file) == desired_contents
     end
 
-    def self.write_config
+    def self.write_config(opts)
       puts "Mometarily using sudo to put the host config in place..."
+      sudo = opts.fetch(:sudo, 'sudo')
+      system "#{sudo} mkdir #{config_dir}" unless config_dir.directory?
       Tempfile.open('vagrant_landrush_host_config') do |f|
         f.write(desired_contents)
         f.close
-        sudo = config_file.parent.writable? ? '' : 'sudo'
         system "#{sudo} cp #{f.path} #{config_file}"
         system "#{sudo} chmod 644 #{config_file}"
       end
     end
 
-    def self.ensure_config_exists
+    def self.ensure_config_exists(opts={})
       unless osx?
         puts "Not an OSX machine, so skipping host DNS resolver config."
         return
@@ -42,7 +47,7 @@ module Landrush
         puts "Host DNS resolver config looks good."
       else
         puts "Need to configure the host."
-        write_config
+        write_config(opts)
       end
     end
 

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/landrush/resolver_config_test.rb

@@ -6,7 +6,7 @@ module Landrush
       it 'writes a resolver config on the host if one is not already there' do
         ResolverConfig.config_file.exist?.must_equal false
         hush {
-          ResolverConfig.ensure_config_exists
+          ResolverConfig.ensure_config_exists(sudo: '')
         }
         ResolverConfig.config_file.exist?.must_equal true
         ResolverConfig.config_file.read.must_equal <<-EOF.gsub(/^ +/, '')
@@ -14,7 +14,9 @@ module Landrush
           nameserver 127.0.0.1
           port 10053
         EOF
-      end 
+      end
+
+
     end
   end
 end

data/test/support/fake_resolver_config.rb

@@ -1,17 +1,17 @@
 module FakeResolverConfigHooks
   def setup
     super
-    @test_resolver_config = Pathname('/tmp/vagrant_landrush_test_resolver_config')
+    @test_resolver_config_dir = Pathname('/tmp/landrush_fake_resolver')
     Landrush::ResolverConfig.instance_variable_set(
-      "@config_file",
-      @test_resolver_config
+      "@config_dir",
+      @test_resolver_config_dir
     )
   end
 
   def teardown
     super
-    if @test_resolver_config.exist?
-      @test_resolver_config.delete
+    if @test_resolver_config_dir.exist?
+      @test_resolver_config_dir.rmtree
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns