buildhosts 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ec0ab7bc45e163d3c1f018b00ca2e557136c17
-  data.tar.gz: 9da6efcacf54aa3940dfb4260b98e173ed1513c7
+  metadata.gz: cd39ee6d2cf4a7bda58a8b798a3b75909095fde6
+  data.tar.gz: f77559e91525d86add3987b6509034aac2b5a46f
 SHA512:
-  metadata.gz: a32c8a1d188a32570219591ac1511df36a8023f4bd2f95534c02bf8670c97d6d6d28b369834f186bd9f04bc3bcc2547b862fd18a62cd57de3a404d727d4a6723
-  data.tar.gz: 7ae6b0dc91ab805800ea12fe8575dfed806c91b74332e5f9a21b08b1c5beca7b0c385b0664b642585cfd02097b2838f52a18c3ecfc6b797b6bdd23e04641b7ec
+  metadata.gz: 07d66f06173d5a1e5b408c7fe80ea4a925765a635c049f72b94fd57b6b24b95b0a0142857bc1cd150fcd7430b640c1c3a273b1cf381b9125835725fb093532e5
+  data.tar.gz: 34ccdf1682c6b1b1fd97a8f7fe48001f98ca95ee2d3abdb37d88c361eb2f46128b9e3e5d18a1c80387a9eddee62e3b95368c97b92e8f06aa066561c06f01d7e6

data/bin/buildhosts

@@ -1,44 +1,28 @@
 #!/usr/bin/env ruby
 
 require 'buildhosts'
+require 'buildhosts/Manginx'
 
-$path = File.expand_path('../../', __FILE__)
-
-$files = Hash.new
-
-def find_files files
-    files.each do |f|
-        if (File.exist?(File.expand_path("~/.buildhosts/#{f}")))
-            $files[f] = File.expand_path("~/.buildhosts/#{f}").chomp
-        else
-            $files[f] = "#{$path}/#{f}".chomp
-        end
-    end
-end
-
-find_files ['config', 'custom', 'header', 'newhosts', 'temp']
+main = Buildhosts::Main.new
 
 case ARGV[0]
 when "-e"
-    system("vim #{$files['config']}")
+    system("vim #{main.files['config']}")
 when "-c"
-    system("vim #{$files['custom']}")
+    system("vim #{main.files['custom']}")
 when "-ec"
-    system("vim #{$files['config']} ; vim #{$files['custom']}")
+    system("vim #{main.files['config']} ; vim #{main.files['custom']}")
 when "-ce"
-    system("vim #{$files['custom']} ; vim #{$files['config']}")
+    system("vim #{main.files['custom']} ; vim #{main.files['config']}")
 when "-l"
     system("grep 127.0.0.1 /etc/hosts | grep -Ev 'xip.io|localhost' | awk '{print $2}'")
     exit
 when "--nginx", "-nginx"
-    puts "TODO: run manginx..."
+    Buildhosts::Manginx.new(main.files['config']).run
     exit
 end
 
 # Do all the stuff
 puts "Building..."
-Buildhosts::Main.build $files['config'], $files['newhosts']
-system("cat #{$files['header']} #{$files['custom']} #{$files['newhosts']} > #{$files['temp']}")
-system("sudo cp #{$files['temp']} /etc/hosts")
-system("rm #{$files['newhosts']} #{$files['temp']}")
+main.build
 puts "Done!"

data/lib/buildhosts.rb

@@ -2,18 +2,32 @@ require "buildhosts/version"
 require "buildhosts/ConfigParser"
 
 module Buildhosts
-    class Main
-        def self.build config, newhosts
+    class Main 
+        attr_reader :files
+        attr_reader :path
+
+        def initialize
+            @path = File.expand_path('../../', __FILE__)
+            @files = Hash.new
+            ['config', 'custom', 'header', 'newhosts', 'temp'].each do |f|
+                if (File.exist?(File.expand_path("~/.buildhosts/#{f}")))
+                    @files[f] = File.expand_path("~/.buildhosts/#{f}").chomp
+                else
+                    @files[f] = "#{@path}/#{f}".chomp
+                end
+            end
+        end
+
+        def build
             # Prefixy strings
             ipv6 = '::1             '
             home = '127.0.0.1       '
 
             # Grab that parser and parse
-            
-            conf = Buildhosts::ConfigParser.parse config
+            conf = Buildhosts::ConfigParser.parse @files['config']
 
             # Write the lines to a "newhosts" file
-            out = File.open(newhosts, 'w+')
+            out = File.open(@files['newhosts'], 'w+')
             conf['hosts'].each do |host|
                 out.write "#{ipv6}#{host}\n"
                 out.write "#{home}#{host}\n"
@@ -23,6 +37,9 @@ module Buildhosts
                 end
             end
             out.close
+            system("cat #{@files['header']} #{@files['custom']} #{@files['newhosts']} > #{@files['temp']}")
+            system("sudo cp #{@files['temp']} /etc/hosts")
+            system("rm #{@files['newhosts']} #{@files['temp']}")
         end
     end
 end

data/lib/buildhosts/Manginx.rb

@@ -0,0 +1,67 @@
+require 'buildhosts/ConfigParser'
+
+module Buildhosts
+    class Manginx
+        
+        def initialize config
+            # Set up teh parser and parse with it
+            @conf = Buildhosts::ConfigParser.parse config
+        end
+
+        # Helper methods to print common messages
+        def configuring what
+            puts "Configuring: #{what}..."
+        end
+        def done next_step=''
+            puts "Done! #{next_step}"
+        end
+
+        def run
+            # If you don't have any IP addresses in your config, what are you doing here?
+            if @conf['ips'].nil? || @conf['ips'].empty?
+                puts 'What\'s the point?'
+                exit
+            end
+            # Let's find out what nginx is expecting from us...
+            expected = Array.new
+            n = File.open('/usr/local/etc/nginx/nginx.conf', 'r')
+            n.each_line do |line|
+                # So basically, if the line goes "include xip/derp.local;", we want to
+                # set up a file with that name with the appropriate server_name directives.
+                match = line.match(/include\s+xip\/([\w\.]+);/) 
+                if !match.nil? # We don't want to try to convert nil to an array...
+                   expected << match.to_a[1..-1][0]
+                end
+            end
+
+            # This is where the files will be stored.
+            base_path = '/usr/local/etc/nginx/xip'
+            `rm #{base_path}/*`
+
+            # Le bread and buttere
+            expected.each do |file|
+                configuring file
+                out = File.open("#{base_path}/#{file}", 'w+')
+                @conf['ips'].each do |ip|
+                    # Simple. Just put a line in there for each IP in our config file.
+                    out.write "server_name #{file}.#{ip}.xip.io;\n"
+                end
+                out.close
+            end
+
+            # Now we just reload nginx and apologize if something goes rotten.
+            done 'Reloading nginx...'
+            if system('nginx -s reload')
+                done
+            else
+                puts "Oops!\nSomething went wrong... Sorry."
+            end
+        end
+
+    end
+end
+
+
+
+
+

data/lib/buildhosts/version.rb

@@ -1,3 +1,3 @@
 module Buildhosts
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildhosts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mike Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,7 @@ files:
 - header
 - lib/buildhosts.rb
 - lib/buildhosts/ConfigParser.rb
-- lib/buildhosts/manginx.rb
+- lib/buildhosts/Manginx.rb
 - lib/buildhosts/version.rb
 - lib/old.buildhosts.rb
 - sample-config

data/lib/buildhosts/manginx.rb

@@ -1,56 +0,0 @@
-# Start by load the config parser 
-require './ConfigParser.rb'
-
-# Helper methods to print common messages
-def configuring what
-    puts "Configuring: #{what}..."
-end
-
-def done next_step=''
-    puts "Done! #{next_step}"
-end
-
-# Set up teh parser and parse with it
-parser = ConfigParser.new
-conf = parser.parse 'config'
-
-# If you don't have any IP addresses in your config, what are you doing here?
-if conf['ips'].nil? || conf['ips'].empty?
-    puts 'What\'s the point?'
-    exit
-end
-
-# Let's find out what nginx is expecting from us...
-expected = Array.new
-n = File.open('/usr/local/etc/nginx/nginx.conf', 'r')
-n.each_line do |line|
-    # So basically, if the line goes "include xip/derp.local;", we want to
-    # set up a file with that name with the appropriate server_name directives.
-    match = line.match(/include\s+xip\/([\w\.]+);/) 
-    if !match.nil? # We don't want to try to convert nil to an array...
-       expected << match.to_a[1..-1][0]
-    end
-end
-
-# This is where the files will be stored.
-base_path = '/usr/local/etc/nginx/xip'
-`rm #{base_path}/*`
-
-# Le bread and buttere
-expected.each do |file|
-    configuring file
-    out = File.open("#{base_path}/#{file}", 'w+')
-    conf['ips'].each do |ip|
-        # Simple. Just put a line in there for each IP in our config file.
-        out.write "server_name #{file}.#{ip}.xip.io;\n"
-    end
-    out.close
-end
-
-# Now we just reload nginx and apologize if something goes rotten.
-done 'Reloading nginx...'
-if system('nginx -s reload')
-    done
-else
-    puts "Oops!\nSomething went wrong... Sorry."
-end