mina-hooks 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa553044d6d1d55d22dba9a45e4124f6d971644
-  data.tar.gz: 8f42095ef8b929d99910aa95bf4540ae32933697
+  metadata.gz: aae82afddf542410261fdad75a76f401aee5bc17
+  data.tar.gz: 68eff9f5ad53598ea8b5bb54feb5ed9538f306be
 SHA512:
-  metadata.gz: 7b47d4d36bc8bb9e433fe9aa1d35a18edc2af331daf8773bdabe15f6a6f236f541837ed46d179cdbc678cb3f81be83c4eb114e06ec64addf1f510a6619e04743
-  data.tar.gz: 2bccac6b8502d061cf7aefc7732dbf779834d26d86cffeb85b8b1c96c97565b98096d4ed82816ac0986e46dfb1165570b3b852dfcf17d41fa99c30a4cf766c23
+  metadata.gz: 83e7bb03e8e5ef0e207cce2a9015194cbc97b8838e387d8a04979060ee131ad33b40e85f3f6a954fe2dd46bfeea2962b3802793fef068901a822800ab0576741
+  data.tar.gz: 88979cc6c52b5b848dfa37dfe2f3a15abb14c853e5d225e103fba206b31cf8f22dd5633c39954f13d991f509f8b2edf79da43ab9fa9692e2b77e1600539f0cf9

data/ChangeLog.md

@@ -1,3 +1,11 @@
+### 0.3 (unreleased)
+
+
+### 0.2 / 2013-12-02
+
+* Only run mina-hooks when deploying.
+* Fix tests for mina scope that weren't executing.
+
 ### 0.1 / 2013-11-30
 
 * Initial release:

data/lib/mina/hooks/plugin.rb

@@ -23,17 +23,21 @@ module Mina
       end
 
       def invoke_before_mina_tasks
+        return unless deploying?
+
         print_local_status "Invoke before mina tasks"
-        print_task_list self.before_mina_tasks if verbose_mode?
+        print_task_list self.before_mina_tasks if self.verbose_mode?
 
-        self.before_mina_tasks.each { |task_name| invoke task_name }
+        self.before_mina_tasks.each { |task_name| self.invoke task_name }
       end
 
       def invoke_after_mina_tasks
+        return unless deploying?
+
         print_local_status "Invoke after mina tasks"
-        print_task_list self.after_mina_tasks if verbose_mode?
+        print_task_list self.after_mina_tasks if self.verbose_mode?
 
-        self.after_mina_tasks.each { |task_name| invoke task_name }
+        self.after_mina_tasks.each { |task_name| self.invoke task_name }
       end
 
       def mina_cleanup!
@@ -53,6 +57,9 @@ module Mina
         puts "#{color('<-----', 32)} #{msg}"
       end
 
+      def deploying?
+        @deploying ||= ARGV.include? "deploy"
+      end
     end
   end
 end

data/lib/mina/hooks/version.rb

@@ -1,6 +1,6 @@
 module Mina
   module Hooks
     # mina-hooks version
-    VERSION = "0.1"
+    VERSION = "0.2"
   end
 end

data/test/deploy.rb

@@ -1,6 +1,6 @@
 require "mina/hooks"
 
 desc "test hook task"
-task :deploy_test do
+task :test_task do
   puts "test hooks"
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "securerandom"
 
 begin
   require "bundler"
@@ -20,7 +21,7 @@ require "mina"
 
 # create a regular class scope to test methods
 class MinaClass
-  require "mina/hooks"
+  require "mina/hooks/plugin"
   extend Mina::Hooks::Plugin
 end
 
@@ -29,7 +30,9 @@ def mina_app
   Rake.application.instance_eval do
     init "mina"
     require "mina/rake"
-    load "test/deploy.rb"
+
+    @rakefiles = ["test/deploy.rb"]
+    load_rakefile
 
     # list of tasks that were "invoked"
     @invoked_tasks = []
@@ -54,7 +57,38 @@ def mina_app
 
     # fake mina_cleanup! command for testing
     def mina_cleanup!
-      cleanup_called = true
+      super
+      @cleanup_called = true
+    end
+
+    @deploying = true
+
+    # set not deploying!
+    def not_deploying!
+      @deploying = false
+    end
+
+    def test_task(task_name = random_task_name, &block)
+      task = define_task(Rake::Task, task_name) do |t|
+        extend Mina::Helpers
+        extend Mina::Hooks::Plugin # simulates a rakefile env
+        block.call(self)
+      end
+      task.invoke
+      task
+    end
+
+    # to avoid rake task enhancing and correct invocation
+    def random_task_name
+      "test_task_#{SecureRandom.hex}"
+    end
+
+    def reset!
+      @before_mina_tasks = []
+      @after_mina_tasks = []
+      @invoked_tasks = []
+      @cleanup_called = false
+      @deploying = true
     end
 
     return self
@@ -62,10 +96,8 @@ def mina_app
 end
 
 # create a task in the scope of the mina app
-def task(name = "test_task", &block)
-  mina_app.instance_eval do
-    define_task Rake::Task, name, &block
-  end
+def task(&block)
+  mina_app.test_task(&block)
 end
 
 require "minitest/autorun"

data/test/hooks/plugin_test.rb

@@ -42,90 +42,106 @@ describe Mina::Hooks::Plugin do
 
     describe "default task lists" do
       it "before tasks" do
-        assert_equal klass.before_mina_tasks, []
+        assert_equal [], klass.before_mina_tasks
       end
 
       it "after tasks" do
-        assert_equal klass.after_mina_tasks, []
+        assert_equal [], klass.after_mina_tasks
       end
     end # default task lists
   end # class scope
 
   describe "rake/mina scope" do
+    before do
+      mina_app.reset!
+    end
+
     describe "before mina" do
       let(:task_list) { ["some:task", "some:other:task"] }
 
-      it "defines before_mina" do
-        task do
-          assert_respond_to self, :before_mina
-        end
-      end
-
       it "adds tasks to the task list" do
-        task do
-          before_mina *task_list
-          assert_equal before_mina_tasks, task_list
+        task do |t|
+          t.before_mina *task_list
         end
+        assert_equal task_list, mina_app.before_mina_tasks
       end
 
       it "adds more tasks to the list" do
-        task do
-          before_mina *task_list
-          before_mina "another:task"
-          assert_equal before_mina_tasks, (task_list + ["another:task"])
+        task do |t|
+          t.before_mina *task_list
+          t.before_mina "another:task"
         end
+        assert_equal (task_list + ["another:task"]), mina_app.before_mina_tasks
       end
     end # before mina
 
     describe "after mina" do
       let(:task_list) { ["after:task"] }
 
-      it "defines after_mina" do
-        task do
-          assert_respond_to self, :after_mina
-        end
-      end
-
       it "adds tasks to the task list" do
-        task do
-          after_mina *task_list
-          assert_equal after_mina_tasks, task_list
+        task do |t|
+          t.after_mina *task_list
         end
+        assert_equal task_list, mina_app.after_mina_tasks
       end
     end # after mina
 
     describe "invoke tasks" do
+      let(:mina) { mina_app }
       let(:task_list) { ["first:task", "second:task", "third:task"]}
 
-      it "invokes before mina in order" do
-        task do
-          before_mina *task_list
-          invoke_before_mina_tasks
-          assert_equal invoked_tasks, task_list
+      describe "when deploying" do
+        it "invokes before mina in order" do
+          mina.test_task do |t|
+            t.before_mina *task_list
+            t.invoke_before_mina_tasks
+          end
+          assert_equal task_list, mina.invoked_tasks
         end
       end
 
       it "invokes after mina in order" do
-        task do
-          after_mina *task_list
-          invoke_after_mina_tasks
-          assert_equal invoked_tasks, task_list
+        mina.test_task do |t|
+          t.after_mina *task_list
+          t.invoke_after_mina_tasks
+        end
+        assert_equal task_list, mina.invoked_tasks
+      end
+
+      describe "when not deploying" do
+        it "invokes before mina in order" do
+          mina.test_task do |t|
+            t.not_deploying!
+            t.before_mina *task_list
+            t.invoke_before_mina_tasks
+          end
+          refute_equal task_list, mina.invoked_tasks
+        end
+
+        it "invokes after mina in order" do
+          mina.test_task do |t|
+            t.not_deploying!
+            t.after_mina *task_list
+            t.invoke_after_mina_tasks
+          end
+          refute_equal task_list, mina.invoked_tasks
         end
       end
     end # invoke tasks
 
     describe "mina cleanup" do
+      let(:mina) { mina_app }
       let(:before_task_list) { ["before:task:one", "before:task:two"] }
       let(:after_task_list)  { ["after:task:one", "after:task:two"]   }
 
       it "invokes all tasks" do
-        task do
-          before_mina *before_task_list
-          after_mina *after_task_list
-          mina_cleanup!
-          assert cleanup_called
-          assert_equal invoked_tasks, (before_task_list + after_task_list)
+        mina.test_task do |t|
+          t.before_mina *before_task_list
+          t.after_mina *after_task_list
+          t.mina_cleanup!
         end
+        assert mina.cleanup_called, "cleanup_called must be true."
+        assert_equal (before_task_list + after_task_list), mina.invoked_tasks
       end
     end # mina cleanup
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-hooks
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Don Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina