lacquer 0.6.6 → 0.6.7.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e706da67a272b82cee6c8da31abe6c8d9e78358c
-  data.tar.gz: 60c69ff19d95e669f1f5201b0ae78a6e69480501
+  metadata.gz: 8225278545c3f3578292b862f0326c40393a07ab
+  data.tar.gz: 7565daf9bb067c70fff1274f7974e00df71d0617
 SHA512:
-  metadata.gz: 1ca0ce46286b668c6617e8d1a619c56abc583ad649d4f321927e2247cf16b79c50e8be20fac4526afd5ca56d670ef0361b3832edc2d43d82e5c2b42eee08d4ca
-  data.tar.gz: f40f3deffabd878d515c46538c6012179c386c143b5b034767c873c652abc12e1751b0c15707818af0deec3d6ed1734a6f025af2eacce6d980a993f94de7a208
+  metadata.gz: 859335ca9872c1951b198a27177a66dd85a0a15ef2fdfcfb2a0e57092a8567ea58b3eea567c2355120e8c6382a3ae4834fb08296da0580eb42fffa20c5b57bde
+  data.tar.gz: f8fc23ae649701a0d0f5b702f7e984cc01dea0517d323b548a308df9d974501f0d3c0107a35bbe315bee898cd94bbe83849499925cfe01d428921074852d5fcd

data/lib/lacquer/tasks.rb

@@ -22,11 +22,13 @@ namespace :lacquer do
     desc "Restart varnishd daemon using Lacquer's settings"
     task :restart => :environment do
       varnishd = Lacquer::Varnishd.new
-      if varnishd.running?
-        varnishd.stop
-        sleep(1)
+      if varnishd.config_changed?
+        if varnishd.running?
+          varnishd.stop
+          sleep(1)
+        end
+        varnishd.start
       end
-      varnishd.start
     end
 
     desc "Reload VCL configuration through varnishadm with Lacquer's settings"

data/lib/lacquer/varnishd.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 module Lacquer
   class Varnishd
     attr_accessor :listen, :telnet, :sbin_path, :bin_path, :storage, :working_dir, :user, :backend, :params, :use_sudo, :pid_path
@@ -35,9 +37,13 @@ module Lacquer
 
     def generate_vcl
       if erb_vcl_script_filename.exist?
-        log "#{erb_vcl_script_filename} found rendering to #{vcl_script_filename}"
-        File.open(vcl_script_filename, "w") do |vcl|
-          vcl.write(render_vcl)
+        if config_changed?
+          log "#{erb_vcl_script_filename} found rendering to #{vcl_script_filename}"
+          File.open(vcl_script_filename, "w") do |vcl|
+            vcl.write(render_vcl)
+          end
+        else
+          log "#{erb_vcl_script_filename} has not changed"
         end
       end
     end
@@ -78,6 +84,12 @@ module Lacquer
       !!pid && !!execute("ps p #{pid}").include?(pid.to_s) # works with sudo
     end
 
+    def config_changed?
+      existing_hash = Digest::MD5.hexdigest(File.read(vcl_script_filename))
+      new_hash = Digest::MD5.hexdigest(render_vcl)
+      new_hash != existing_hash
+    end
+
     def args
       options.map { |k, v| "#{k} #{v}" }.join(" ")
     end

data/lib/lacquer/version.rb

@@ -1,3 +1,3 @@
 module Lacquer
-  VERSION = '0.6.6'
+  VERSION = '0.6.7-alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacquer
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7.pre.alpha
 platform: ruby
 authors:
 - Russ Smith (russ@bashme.org)
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: lacquer
 rubygems_version: 2.5.2