lacquer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67124eacec337f8d11e5e72c7a03d899b759d17a
-  data.tar.gz: a985a3d7fc01d062afc82d86c5c6c76fe45faffc
+  metadata.gz: 9c26af9cbec46371eaafc94d90f9e37146fd755b
+  data.tar.gz: 3e2d2c56f33bd746432353929f57a3deeaa78ddb
 SHA512:
-  metadata.gz: 40278b6b726c88845e9b9c411f1baae3020b36e6faac77b1ae08b295d34aba8e1607223c2127b728ef74c4fc284e8b9b71387eb66f16d4678fefda1c8a579e3f
-  data.tar.gz: 3522c1e552018600eec6b1a08c7c9a1e363013aa406ab2ad0c18adcba42b974235bf4aa1f683dbf4f2032d269b989d027255e7c5400f4045e3179289642583ea
+  metadata.gz: 6667536d65ae191d360918bab20e9e51794103e2ab9f664e3fc75b725568cde62c7e18bd7e5d53e15930e794ae87885a9454b6e299b442b23a93b576b77d315f
+  data.tar.gz: bd82245651e7156bc19abc87d34cdff08f708d956b243c84cf38d5e85d005cadc3be13ee5639c6454dffe32133406825dd8ae5aa708b359a25c508951d106acf

data/lib/lacquer/capistrano.rb

@@ -1,21 +1,7 @@
-# Capistrano tasks for Lacquer
+require 'capistrano/version'
 
-Capistrano::Configuration.instance(:must_exit).load do
-  _cset(:lacquer_roles) { :web }
-
-  after "deploy:web:disable", "lacquer:global_purge"
-  after "deploy:web:enable", "lacquer:global_purge"
-  after "deploy:rollback", "lacquer:global_purge"
-  after "deploy:rollback", "lacquer:restart"
-  after "deploy:update", "lacquer:restart"
-
-  namespace :lacquer do
-    %w( start stop restart global_purge status ).each do |name|
-      desc "#{name} varnish"
-      task name.to_sym, :roles => lacquer_roles do
-        next if find_servers_for_task(current_task).empty?
-        run "cd #{current_path} && #{rake} lacquer:varnishd:#{name}"
-      end
-    end
-  end
+if defined?(Capistrano::VERSION) && Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
+  load File.expand_path("../capistrano/v3/tasks/lacquer.rake", __FILE__)
+else
+  require 'lacquer/capistrano/v2/hooks'
 end

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

@@ -0,0 +1,21 @@
+# Capistrano tasks for Lacquer
+
+Capistrano::Configuration.instance(:must_exit).load do
+  _cset(:lacquer_roles) { :web }
+
+  after "deploy:web:disable", "lacquer:global_purge"
+  after "deploy:web:enable", "lacquer:global_purge"
+  after "deploy:rollback", "lacquer:global_purge"
+  after "deploy:rollback", "lacquer:restart"
+  after "deploy:update", "lacquer:restart"
+
+  namespace :lacquer do
+    %w( start stop restart global_purge status ).each do |name|
+      desc "#{name} varnish"
+      task name.to_sym, :roles => lacquer_roles do
+        next if find_servers_for_task(current_task).empty?
+        run "cd #{current_path} && #{rake} lacquer:varnishd:#{name}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+namespace :load do
+  task :defaults do
+    set :lacquer_roles, -> { :web }
+  end
+end
+
+namespace :lacquer do
+  %w( start stop restart global_purge status ).each do |name|
+    desc "#{name} varnish"
+    task name.to_sym do
+      on roles(fetch(:lacquer_roles)) do
+        within current_path do
+          with rails_env: fetch(:rails_env) do
+            execute :bundle, "exec rake", "lacquer:varnishd:#{name}"
+          end
+        end
+      end
+    end
+  end
+
+  after "deploy:rollback", "lacquer:global_purge"
+  after "deploy:rollback", "lacquer:restart"
+  after "deploy:updated", "lacquer:restart"
+end

data/lib/lacquer/version.rb

@@ -1,3 +1,3 @@
 module Lacquer
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacquer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Russ Smith (russ@bashme.org)
@@ -11,90 +11,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.10
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails drop in for Varnish support.
@@ -103,9 +103,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -121,6 +121,8 @@ files:
 - lib/lacquer/cache_control.rb
 - lib/lacquer/cache_utils.rb
 - lib/lacquer/capistrano.rb
+- lib/lacquer/capistrano/v2/hooks.rb
+- lib/lacquer/capistrano/v3/tasks/lacquer.rake
 - lib/lacquer/configuration.rb
 - lib/lacquer/delayed_job_job.rb
 - lib/lacquer/railtie.rb
@@ -154,17 +156,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: lacquer
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rails drop in for Varnish support.