conditional_capistrano 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3085020b2ca58897de31421534673847407529
-  data.tar.gz: 3378e5a30a4ff7a10b718ccb1c376112723de2e5
+  metadata.gz: f45de9060a9828612ef331630eed9a86818c1d24
+  data.tar.gz: 628b71a9a4735e2777aa79fe794fb8fd2965fbe6
 SHA512:
-  metadata.gz: 5a3d6e3884fff3858ab52779902fcf86645cdf06c518f780d8953c7b8820953a701e54689d369928a767c5b5f0809a886f5a49810825dfd38f64bd808cc3a08d
-  data.tar.gz: 2fa696d924c08c19f5d77cbe250ea0007be2dbe619413b141074cb2a6ddc2d56fef20d95b9228ab30d3e40a8afa9a9cbf477a3b695b2e9a770c9125fb8463632
+  metadata.gz: fc86f11b5fe49a3e95393ddb388b3e9aad5aff58fdecf40b766753ff3cf3187a487ca6f1abe659e38e74e182e2518ebad6bf642ab5b307d78a49de6b37c17da2
+  data.tar.gz: 2f67842e3830cfd5c186f61a73456c97c1a5795c17231c9b8eeb94bd36fb4038fde8f4d76db2c6bdafacdbe5d7232622ef18af39ad987ee711467ce1e6e55f58

data/README.md

@@ -23,10 +23,15 @@ Simply require the capistrano module in your `config/deploy.rb` file:
 
     require 'conditional_capistrano/capistrano'
 
-Then add some options to the task scheduling:
+Then add some options to the tasks:
 
-    after "key_vault:symlink", "key_vault:check", when_changed: "config/key_vault.yml"
-    after "deploy:symlink_configs", "assets:compile", when_changed: %w[app/assets Gemfile Gemfile.lock config/application.rb]
+    task :compile, roles: :assets, when_changed: %w[app/assets Gemfile Gemfile.lock config/application.rb] do
+      ...
+    end
+
+    task :check, roles: :app, when_changed: "config/key_vault.yml" do
+      ...
+    end
 
 You can either mention single files or whole folders, which will be checked for any
 changes within.

data/lib/conditional_capistrano/capistrano/task_definition.rb

@@ -0,0 +1,23 @@
+module ConditionalCapistrano
+  module Capistrano
+    module TaskDefinition
+      def self.included(base)
+        base.class_eval do
+          include InstanceMethods
+        end
+      end
+
+      module InstanceMethods
+        def check_for_path_changes?
+          options.has_key? :when_changed
+        end
+
+        def paths_to_check
+          Array options[:when_changed]
+        end
+      end
+    end
+  end
+end
+
+Capistrano::TaskDefinition.send :include, ConditionalCapistrano::Capistrano::TaskDefinition

data/lib/conditional_capistrano/capistrano.rb

@@ -1,49 +1,38 @@
+require 'conditional_capistrano/capistrano/task_definition'
+
 module ConditionalCapistrano
   module Capistrano
     def self.included(base)
       base.class_eval do
         include InstanceMethods
 
-        alias_method :applies_to_without_file_check?, :applies_to?
-        alias_method :applies_to?, :applies_to_with_file_check?
+        alias_method :execute_task_without_paths_check, :execute_task
+        alias_method :execute_task, :execute_task_with_paths_check
       end
     end
 
     module InstanceMethods
-      def applies_to_with_file_check?(task)
-        return false if check_for_changes? && !trigger?(*paths_to_check)
-
-        applies_to_without_file_check?(task)
-      end
+      def execute_task_with_paths_check(task)
+        return if task.check_for_path_changes? && !trigger?(task)
 
-    private
-
-      def check_for_changes?
-        options.has_key?(:when_changed)
+        execute_task_without_paths_check task
       end
 
-      def paths_to_check
-        Array(options[:when_changed])
-      end
-
-      def trigger?(*paths)
-        paths.find { |path| changed_files.find { |p| p[0, path.length] == path } }
+      def trigger?(task)
+        task.paths_to_check.find { |path| changed_files.find { |p| p[0, path.length] == path } }
       rescue IndexError
         false
       end
 
-      def changed_files
-        @changed_files ||=
-          config.capture(
-            "cd #{fetch(:repository_cache)} && git diff --name-only #{fetch(:current_git_tag)} HEAD | cat"
-          ).strip.split
-      end
+    private
 
-      def fetch(key)
-        config.fetch key
+      def changed_files
+        capture(
+          "cd #{repository_cache} && git diff --name-only #{current_git_tag} HEAD | cat"
+        ).strip.split
       end
     end
   end
 end
 
-Capistrano::Callback.send :include, ConditionalCapistrano::Capistrano
+Capistrano::Configuration.send :include, ConditionalCapistrano::Capistrano

data/lib/conditional_capistrano/version.rb

@@ -1,3 +1,3 @@
 module ConditionalCapistrano
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/conditional_capistrano/capistrano/task_definition_spec.rb

@@ -0,0 +1,23 @@
+module Capistrano; end
+module Capistrano
+  class TaskDefinition
+    attr_reader :options
+  end
+end
+
+require 'conditional_capistrano/capistrano/task_definition'
+
+describe Capistrano::TaskDefinition do
+
+  describe "#check_for_path_changes?" do
+    it "returns true if no 'when_changed' options are present" do
+      subject.stub :options => {}
+      subject.check_for_path_changes?.should_not be
+    end
+
+    it "returns false if 'when_changed' options are present" do
+      subject.stub :options => { when_changed: "path" }
+      subject.check_for_path_changes?.should be
+    end
+  end
+end

data/spec/conditional_capistrano/capistrano_spec.rb

@@ -1,53 +1,80 @@
 module Capistrano; end
-class Capistrano::Callback
-  attr_reader :options
-
-  def initialize(options)
-    @options = options
+module Capistrano
+  class Configuration
+    def execute_task(task)
+      "original"
+    end
   end
+end
 
-  def applies_to?(task)
-    "original"
+module Capistrano
+  class TaskDefinition
   end
 end
 
 require 'conditional_capistrano/capistrano'
 
-describe Capistrano::Callback do
+describe Capistrano::Configuration do
+
+  describe "#applies_to_with_paths_check?" do
+    let(:task) { Capistrano::TaskDefinition.new }
+
+    it "falls back to the original if this task doesn't require a path check" do
+      task.stub :check_for_path_changes? => false
+      subject.execute_task(task).should == "original"
+    end
+
+    context "when path check is required" do
+      before do
+        task.stub :check_for_path_changes? => true
+      end
+
+      it "returns false if files have been specified, but haven't changed" do
+        subject.stub :trigger? => false
+        subject.execute_task(task).should_not be
+      end
 
-  describe "#applies_to_with_file_check?" do
-    it "falls back to the original 'applies_to?' if no 'when_changed' options were found" do
-      Capistrano::Callback.new({}).applies_to?("test").should == "original"
+      it "falls back to the original if files have been specified, and have changed" do
+        subject.stub :trigger? => true
+        subject.execute_task(task).should == "original"
+      end
     end
+  end
 
-    it "returns false if files have been specified, but haven't changed" do
-      callback = Capistrano::Callback.new(when_changed: "file")
-      callback.stub :trigger? => false
+  describe "#trigger?" do
+    let(:task) { Capistrano::TaskDefinition.new }
 
-      callback.applies_to?("test").should_not be
+    it "returns false if the task doesn't have any paths to check" do
+      task.stub paths_to_check: []
+      subject.trigger?(task).should_not be
     end
 
-    it "falls back to the original if files have been specified, and have changed" do
-      callback = Capistrano::Callback.new(when_changed: "file")
-      callback.stub :trigger? => true
+    it "returns false if no files have changed" do
+      task.stub paths_to_check: %w[path/to/file]
+      subject.stub changed_files: []
 
-      callback.applies_to?("test").should == "original"
+      subject.trigger?(task).should_not be
     end
 
-    context "possible file options" do
-      it "allows a single file" do
-        callback = Capistrano::Callback.new(when_changed: "file")
+    it "returns true if we have matching files" do
+      task.stub paths_to_check: %w[path/to/file]
+      subject.stub changed_files: %w[path/to/file]
 
-        callback.should_receive(:trigger?).with "file"
-        callback.applies_to? "test"
-      end
+      subject.trigger?(task).should be
+    end
 
-      it "allows an array of files" do
-        callback = Capistrano::Callback.new(when_changed: %w[file1 file2])
+    it "returns false if we files that don't match" do
+      task.stub paths_to_check: %w[path/to/file1]
+      subject.stub changed_files: %w[path/to/file2]
 
-        callback.should_receive(:trigger?).with "file1", "file2"
-        callback.applies_to? "test"
-      end
+      subject.trigger?(task).should_not be
+    end
+
+    it "returns true if we have files that match a path" do
+      task.stub paths_to_check: %w[path/to]
+      subject.stub changed_files: %w[path/to/file]
+
+      subject.trigger?(task).should be
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conditional_capistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - redbubble
@@ -68,7 +68,9 @@ files:
 - conditional_capistrano.gemspec
 - lib/conditional_capistrano.rb
 - lib/conditional_capistrano/capistrano.rb
+- lib/conditional_capistrano/capistrano/task_definition.rb
 - lib/conditional_capistrano/version.rb
+- spec/conditional_capistrano/capistrano/task_definition_spec.rb
 - spec/conditional_capistrano/capistrano_spec.rb
 homepage: ''
 licenses:
@@ -96,4 +98,5 @@ specification_version: 4
 summary: Execute capistrano task's only when certain path's have changed since the
   last deploy
 test_files:
+- spec/conditional_capistrano/capistrano/task_definition_spec.rb
 - spec/conditional_capistrano/capistrano_spec.rb