minitest-tagz 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9e4461673c4b4cbb75cf631e06f4f014a91900
-  data.tar.gz: 8120c031de27c987e1074ba373a8536658ac141d
+  metadata.gz: ebe2a552b70a6c9636949552b092405b0ff8606b
+  data.tar.gz: 41d024c65a904fd822f0e4d15afd7864eb1c9bfd
 SHA512:
-  metadata.gz: 8ed494bea52ab8c48a3d88f2230301dc63cfb4fa001153d570aa787b0919ff5bfe1c165de0cbd95aa3501b6f5074614d5785a1236f1bc08aaeeb64d0e2cda358
-  data.tar.gz: b1aa6f2526c6cdcb42fe5b9d79403aeb0fb9c36d106e0c19c03410bc49eaf8dcb5abb0dcb7f12952a0f4608f650d3386be525024b9dafee276c1708a540a35e4
+  metadata.gz: 520e49ba6db312c4e5617390aa49ba1ee22103518c1523d2f742815eba564d596fe7c664f78ee908131b406752cbe36ba5036027b6b752b8ba2325064ca6f919
+  data.tar.gz: eb2615c95ca8472a814146de35fb8c18d8d0360145c08a844b3d396de6235c17359de0c420968a071e9c72f221b225105119fce69d693e8dda35c92aff8b6910

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.1.3
+  - 2.2.0
+  - 2.2.1

data/README.md

@@ -1,5 +1,9 @@
 # Minitest::Tagz
 
+[![Build Status](https://travis-ci.org/backupify/minitest-tagz.svg)](https://travis-ci.org/backupify/minitest-tagz)
+[![Code Climate](https://codeclimate.com/github/backupify/minitest-tagz/badges/gpa.svg)](https://codeclimate.com/github/backupify/minitest-tagz)
+[![Gem Version](https://badge.fury.io/rb/minitest-tagz.svg)](http://badge.fury.io/rb/minitest-tagz)
+
 yet another tags implementation for Minitest
 
 ## Installation
@@ -18,16 +22,27 @@ Or install it yourself as:
 
     $ gem install minitest-tagz
 
-## Usage
+## Setup
+
+In your `test_helper.rb` you'll need to require `Minitest::Tagz`. You'll also
+want to tell `Tagz` which tags you want to use. I suggest using the `TAGS` environment
+variable:
 
 ```rb
-# spec_helper.rb
 require 'minitest/tagz'
-
-Minitest::Tagz.patch_minitest
 Minitest::Tagz.choose_tags(*ENV['TAGS'].split(',')) if ENV['TAGS']
+```
+
+This wil let you do this like: `bundle exec rake test TAGS=fast,login` to run all
+tests with the fast and login tags.
 
-# my_spec.rb
+## Usage
+
+`Minitest::Tagz` works with both `Minitest::Test` and `Minitest::Spec`. You can declare
+tags by using the `tag` helper.
+
+```rb
+# Using Minitest::Spec
 class MySpec < Minitest::Spec
   tag :fast, :unit
   it 'should run' do
@@ -44,8 +59,31 @@ class MySpec < Minitest::Spec
   end
 end
 
-# command line
-bundle exec rake test TAGS=fast,unit
+# Using Minitest::Test
+class MyTest < Minitest::Test
+  tag :fast
+  def test_my_stuff
+    assert true
+  end
+end
+```
+
+With `Minitest::Spec` adding tags to a `describe` will add the tags to all of the
+tests in the block:
+
+```rb
+class MySpec < Minitest::Spec
+  tag :login
+  describe 'all tests in this are tagged with :login' do
+    it 'tests this' do
+      assert true
+    end
+
+    it 'also tests this' do
+      assert true
+    end
+  end
+end
 ```
 
 ## Development
@@ -56,7 +94,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/minitest-tagz/fork )
+1. Fork it ( https://github.com/backupify/minitest-tagz/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/minitest/tagz.rb

@@ -1,49 +1,74 @@
-require "minitest/tagz/version"
+require 'minitest/tagz/version'
+require 'minitest/tagz/minitest_adapter'
 
 module Minitest
   module Tagz
     class << self
+      # Pick the tags you want to test
       def choose_tags(*tags)
-        @chosen_tags = tags.map(&:to_sym).compact
+        @chosen_tags = tags.map(&:to_sym).compact.to_set
       end
 
-      def has_matching_tags?(tags)
-        tags ||= []
-        chosen_tags.all? { |tag| tags.include?(tag) }
+      # Create a tag on a test
+      def declare_tags(*pending_tags)
+        @pending_tags = pending_tags
       end
 
-      def chosen_tags
-        @chosen_tags ||= []
+      # Record the given tags with the object
+      def apply_tags(namespace, obj)
+        if @pending_tags
+          # TODO
+          tags["#{namespace}::#{obj}"] += @pending_tags
+          @pending_tags = nil
+        end
+      end
+
+      def record_blanket_tags
+        if @pending_tags
+          # TODO
+          self.blanket_tags = @pending_tags
+          @pending_tags = nil
+        end
       end
-    end
 
-    module MinitestAdapter
-      def tag(*pending_tags)
-        @pending_tags ||= pending_tags
+      def apply_blanket_tags(namespace, obj)
+        unless blanket_tags.empty?
+          tags["#{namespace}::#{obj}"] += @blanket_tags
+        end
       end
 
-      def method_added(name)
-        return unless name[/^test_/]
-        tags[name.to_s] = @pending_tags
-        @pending_tags = nil
+      # Select all the testables with matching tags
+      def filter(namespace, enum)
+        enum.select {|obj| has_matching_tags?(namespace, obj)}
+      end
+
+      def reset_blanket_tags
+        @blanket_tags = []
+      end
+
+      private
+
+      # Check if object has matching tags
+      def has_matching_tags?(namespace, obj)
+        obj_tags = tags["#{namespace}::#{obj}"] || []
+        chosen_tags.all? { |tag| obj_tags.include?(tag) }
+      end
+
+      def chosen_tags
+        @chosen_tags ||= Set.new
       end
 
       def tags
-        @tags ||= {}
+        @tags ||= Hash.new([])
       end
 
-      def runnable_methods
-        runnables = super
-        runnables.select do |runnable|
-          Minitest::Tagz.has_matching_tags?(tags[runnable])
-        end
+      def blanket_tags
+        @blanket_tags ||= reset_blanket_tags
       end
-    end
 
-    def self.patch_minitest
-      ::Minitest::Test.singleton_class.prepend(MinitestAdapter)
+      def blanket_tags=(arg)
+        @blanket_tags = arg
+      end
     end
-
-    patch_minitest
   end
 end

data/lib/minitest/tagz/minitest_adapter.rb

@@ -0,0 +1,47 @@
+module Minitest
+  module Tagz
+    module MinitestAdapter
+      module Base
+        def tag(*tags)
+          Tagz.declare_tags(*tags)
+        end
+
+        def method_added(name)
+          return unless name[/^test_/]
+          Tagz.apply_tags(self, name)
+        end
+
+        def runnable_methods
+          Tagz.filter(self, super)
+        end
+      end
+
+      module Spec
+        def describe(*args, &block)
+          Tagz.record_blanket_tags
+          super
+          apply_blanket_tags_recursively
+          Tagz.reset_blanket_tags
+        end
+
+        def apply_blanket_tags_recursively
+          test_methods_in_describe = instance_methods.select {|m| m[/^test/]}
+          test_methods_in_describe.each do |runnable|
+            Tagz.apply_blanket_tags(self, runnable)
+          end
+
+          children.each do |child|
+            child.apply_blanket_tags_recursively
+          end
+        end
+      end
+    end
+  end
+end
+
+if defined?(Minitest)
+  ::Minitest::Test.singleton_class.prepend(Minitest::Tagz::MinitestAdapter::Base)
+  if defined?(Minitest::Spec)
+    ::Minitest::Spec.singleton_class.prepend(Minitest::Tagz::MinitestAdapter::Spec)
+  end
+end

data/lib/minitest/tagz/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Tagz
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/minitest-tagz.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_dependency "minitest", "~> 5"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: minitest-tagz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Bodah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,7 @@ files:
 - bin/console
 - bin/setup
 - lib/minitest/tagz.rb
+- lib/minitest/tagz/minitest_adapter.rb
 - lib/minitest/tagz/version.rb
 - minitest-tagz.gemspec
 homepage: https://github.com/backupify/minitest-tagz