lacquer 0.6.7.pre.alpha → 0.6.7.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8225278545c3f3578292b862f0326c40393a07ab
-  data.tar.gz: 7565daf9bb067c70fff1274f7974e00df71d0617
+  metadata.gz: f75f379e37e668629da39a75a7503380e18a8455
+  data.tar.gz: 5f91642759f72ae04eddbd3b32d5577132c15922
 SHA512:
-  metadata.gz: 859335ca9872c1951b198a27177a66dd85a0a15ef2fdfcfb2a0e57092a8567ea58b3eea567c2355120e8c6382a3ae4834fb08296da0580eb42fffa20c5b57bde
-  data.tar.gz: f8fc23ae649701a0d0f5b702f7e984cc01dea0517d323b548a308df9d974501f0d3c0107a35bbe315bee898cd94bbe83849499925cfe01d428921074852d5fcd
+  metadata.gz: 2f82f511c817e4052c601e74ee1a359847ffa0dacec126e09d916c520f0f7351441a59f174ebe2e2ffb2b335e4182ed7e37e5a1bc9b39cf5a942fcf04b6ddcdd
+  data.tar.gz: 8e01f43d8722f63302c3fc0091b408b1ca6c81df5e6044c6de6b9f27855633f2c7274c4e030850b0b3c516677a56f9c0eeaf2568b43c953da6ac748596bb0669

data/lib/lacquer/capistrano/v2/hooks.rb

@@ -10,7 +10,7 @@ Capistrano::Configuration.instance(:must_exit).load do
   after "deploy:update", "lacquer:restart"
 
   namespace :lacquer do
-    %w( start stop restart global_purge status ).each do |name|
+    %w( start stop restart global_purge status reload ).each do |name|
       desc "#{name} varnish"
       task name.to_sym, :roles => lacquer_roles do
         next if find_servers_for_task(current_task).empty?

data/lib/lacquer/capistrano/v3/tasks/lacquer.rake

@@ -5,7 +5,7 @@ namespace :load do
 end
 
 namespace :lacquer do
-  %w( start stop restart purge global_purge status ).each do |name|
+  %w( start stop restart purge global_purge status reload ).each do |name|
     desc "#{name} varnish"
     task name.to_sym do
       on roles(fetch(:lacquer_roles)) do

data/lib/lacquer/tasks.rb

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

data/lib/lacquer/varnishd.rb

@@ -37,13 +37,9 @@ module Lacquer
 
     def generate_vcl
       if erb_vcl_script_filename.exist?
-        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"
+        log "#{erb_vcl_script_filename} found rendering to #{vcl_script_filename}"
+        File.open(vcl_script_filename, "w") do |vcl|
+          vcl.write(render_vcl)
         end
       end
     end
@@ -84,12 +80,6 @@ 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.7-alpha'
+  VERSION = '0.6.7-alpha1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacquer
 version: !ruby/object:Gem::Version
-  version: 0.6.7.pre.alpha
+  version: 0.6.7.pre.alpha1
 platform: ruby
 authors:
 - Russ Smith (russ@bashme.org)