vagrant-reverse-proxy 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2bade0a1a9fa80664838bddeeea6372d6d9270
-  data.tar.gz: 183513ca7e4df37802e84df2d342f512fc0483fe
+  metadata.gz: 26d9391f462c1912d503f0fc872ad82f1171bf26
+  data.tar.gz: 31b74fb24938a8ad11f549bf0750900b1ecef175
 SHA512:
-  metadata.gz: dec9e1ad3abb232431b6264587f692d710509f6a9403199aaf295fc6a0409fd443f5596d50f35784e414c629ec51e0f65d0d44a7b78c3df712be0071689d1ccf
-  data.tar.gz: 7cda2ec9d2dd2c264a3c8d57655e943afeaf7ccd212acf67e6caf14881b0e36da07b658ea079297689d82fd2bf43d3eebf0775bbbeea48b0a2d7f8e7caaf5d4b
+  metadata.gz: 10f1d65e39fcfd7877ecdaf91a8d47708179eb9e5cd32e2e73be19ca559e749d475f5edebaa87d6a442e9ccd32b52baec142fbdb7ef100b7ad2c46247a006174
+  data.tar.gz: ecaec449938977b8555bc5811bac8ac1eba378804119a6809cf75df5775a6d0ff103cdcc9f1c591b2c470ab23d0acf9c83385f02f995113b26cbae6fe8b5aa5f

data/lib/vagrant-reverse-proxy/action/write_nginx_config.rb

@@ -2,11 +2,12 @@ module VagrantPlugins
   module ReverseProxy
     module Action
       class WriteNginxConfig
-        def initialize(app, env)
+        def initialize(app, env, action)
           @app = app
           @global_env = env[:machine].env
           @provider = env[:machine].provider_name
           @config = @global_env.vagrantfile.config
+          @action = action
         end
 
         def call(env)
@@ -25,9 +26,28 @@ module VagrantPlugins
 
           env[:ui].info('Updating nginx configuration. Administrator privileges will be required...')
 
-          File.open(tmp_file, 'w') do |f|
-            get_machines().each do |m|
-              f.write(server_block(m))
+          machines = get_machines()
+          # This code is so stupid
+          File.open(nginx_site, 'r') do |old|
+            File.open(tmp_file, 'w') do |new|
+              sm = machines.map {|m| start_marker(m) }
+              em = machines.map {|m| end_marker(m) }
+
+              while ln = old.gets() do
+                if sm.member?(ln.chomp)
+                  until !ln || em.member?(ln.chomp) do
+                    ln = old.gets()
+                  end
+                else
+                  new.puts(ln)
+                end
+              end
+
+              if @action == :add
+                machines.each do |m|
+                  new.write(start_marker(m)+"\n"+server_block(m)+end_marker(m)+"\n")
+                end
+              end
             end
           end
 
@@ -57,14 +77,21 @@ EOF
           end.join("\n")
         end
 
+        def start_marker(m)
+          "# BEGIN #{m.id} #"
+        end
+
+        def end_marker(m)
+          "# END #{m.id} #"
+        end
+
         # Machine-finding code stolen from vagrant-hostmanager :)
         def get_machines()
           # Collect only machines that exist for the current provider
           @global_env.active_machines.collect do |name, provider|
             if provider == @provider
               begin
-                m = @global_env.machine(name, @provider)
-                m.state.id == :running ? m : nil
+                @global_env.machine(name, @provider)
               rescue Vagrant::Errors::MachineNotFound
                 nil #ignore
               end

data/lib/vagrant-reverse-proxy/action.rb

@@ -9,15 +9,15 @@ module VagrantPlugins
       # machine; we always write a complete config with all machines.
       def self.add_machine
         Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use WriteNginxConfig
+          builder.use(ConfigValidate)
+          builder.use(WriteNginxConfig, :add)
         end
       end
 
       def self.remove_machine
         Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use WriteNginxConfig
+          builder.use(ConfigValidate)
+          builder.use(WriteNginxConfig, :remove)
         end
       end
     end

data/lib/vagrant-reverse-proxy/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ReverseProxy
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Peter Bex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler