speckle 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ4NTM5MWUxYzA5YzYwMjk1NmFiYjBmZTg1ODcyMjlhNjBjMTJiNA==
+    ZmU1NzA4NTg3YTg4MmM1ZThhNTY2MDg5ZTRjMjA1MmNhYWI5ZDAxNw==
   data.tar.gz: !binary |-
-    MDhhZjVmNmIzMjY2YWM1N2FkYTUxZDZhNzg1Y2JhZjA4YTExMGQzNA==
+    MmFjZjllNDk5ODIxOTAxYTcwNjBmOGVhZTg1ZTU0ZGVlZTBiYzViOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzgxZWFlMTVhNjMwZTk5YmE2MzM2YmI0NWI3ZDIzMDJjZDI1OGZkYWI1MDI4
-    MjhkZDA3ZTg0YjBkMGY5NWNjZWJlM2ZjOWI2ZjI4YTdkNzY4ZWMzMmI0NzJk
-    ZDMwZjI0NjUyNWJkMDM0MTdlZTQ0ODZmNTViY2I1ZmVlMTI5ZDQ=
+    NWM2ZDkzYWE4ZmZhOGFkYjg2MTBjODI1OWMzOGVkMTU3NmI3NjE1YzgwOGRm
+    ZTA5MjU2ZWE0Y2U4NjJkZDBlMGM3YzMwNmU1YWE2Mzg3ZjI0NjYzMmE4MTAw
+    ZDgyODYxNjhmYmE4OTM5ZmZiODQxMWU5MzhjZDVjM2JlMGZiNGI=
   data.tar.gz: !binary |-
-    NTI2Mjk4ODYyNTU1OTk0Yzk4YjQ2Mjg5MTQzMDdhNzA5ZWZlNDJhNTA5ZDEx
-    ZjkzZTBlYTA0Y2NjNDNkMzJlYWM3ZGQ2ZTgxMTYxNjM4NjFlODg1OTg2N2M2
-    MzMyMjM3NmFlMjU4N2UzOWMzN2I3ZTI4NjcwNDE0ZWY0YTk3Mzk=
+    MzUxZjU4ZjkzZjc0ZmY2N2QyYzg5MTE0ZWRjYzE1ODVkMGEyMDFkMzEyYjBj
+    ZDMxZDZhMDMzNGQyNjM5NWEyOTQ3OGYwNWIwYzg0MjYzZmE4MTFiZTk1YWNl
+    ZmQ1ZDBkMzZlY2NjMTU4Y2ZhNjkwOGE5NzE3NDEyODVlNzU0NDk=

data/Rakefile

@@ -88,22 +88,6 @@ namespace :speckle do
     end
   end
 
-  TAGGED_TEST_SOURCES = FileList.new do |fl|
-    TEST_SOURCES.each do |s|
-      if TAG and File.readlines(s).grep(Regexp.new(TAG)).size > 0
-        fl.include(s)
-      end
-    end
-  end
-
-  TAGGED_TEST_COMPILED = FileList.new do |fl|
-    TEST_SOURCES.each do |s|
-      if TAG and File.readlines(s).grep(Regexp.new(TAG)).size > 0
-        fl.include("#{BUILD_DIR}/#{s.ext('vim')}")
-      end
-    end
-  end
-
   desc 'All tasks'
   task :all => [:clean, :compile, :compile_tests, :test]
 
@@ -140,7 +124,7 @@ namespace :speckle do
 
   desc "Compile specs"
   task :compile_tests => [:build] do
-    get_test_sources.each do |t|
+    TEST_SOURCES.each do |t|
       verbose VERBOSE do
         puts "Compiling: #{t} "
         sh "bundle exec riml -c #{t} -I #{TEST_LIBS}"
@@ -179,7 +163,13 @@ namespace :speckle do
     puts 'Running tests: '
     puts
 
-    launch_vim
+    if TEST_COMPILED.length > 0
+      launch_vim
+    elsif TAG
+      puts "All tests were filtered out."
+    else
+      puts "No tests to run."
+    end
   end
 
   desc "Watch files for changes and run tests"
@@ -187,22 +177,6 @@ namespace :speckle do
     puts '--- TODO ---'
   end
 
-  def get_test_sources
-    if TAG
-      return TAGGED_TEST_SOURCES
-    else
-      return TEST_SOURCES
-    end
-  end
-
-  def get_test_compiled
-    if TAG
-      return TAGGED_TEST_COMPILED
-    else
-      return TEST_COMPILED
-    end
-  end
-
   def get_vim_options
     cmd = ''
     if SKIP_VIMRC
@@ -234,7 +208,7 @@ namespace :speckle do
       source #{SPECKLE_OUTPUT}
 CMD
 
-    get_test_compiled.each do |t|
+    TEST_COMPILED.each do |t|
       launch_cmd += <<CMD
       source #{t}
 CMD

data/lib/speckle/cli/controller.rb

@@ -2,15 +2,19 @@ module Speckle
   module CLI
 
     require 'speckle/version'
+    require 'speckle/cli/rake_app'
 
     class Controller
 
-      def initialize(options, rake_app)
+      def initialize(options)
         @options = options
-        @rake_app = rake_app
       end
 
       def rake(task)
+        if @rake_app.nil?
+          @rake_app = RakeApp.new(@options)
+        end
+
         @rake_app.invoke_task(task)
       end
 

data/lib/speckle/cli/rake_app.rb

@@ -2,6 +2,12 @@ module Speckle
   module CLI
 
     require 'rake'
+    require 'speckle/list/builder'
+    require 'speckle/list/absolute_path_transformer'
+    require 'speckle/list/dir_expander'
+    require 'speckle/list/extension_transformer'
+    require 'speckle/list/file_content_filter'
+    require 'speckle/list/pattern_filter'
 
     class RakeApp
       def initialize(options)
@@ -37,6 +43,8 @@ module Speckle
       end
 
       def invoke_task(name)
+        #puts "invoke_task: #{name}"
+        #rake
         rake.invoke_task("speckle:#{name.to_s}")
       end
 
@@ -77,51 +85,40 @@ module Speckle
         "#{@options.cwd}/build"
       end
 
+      def test_sources
+        get_builder.build
+      end
+
       def test_compiled
-        compiled = test_sources.map do |s|
-          s.ext('vim')
+        sources = test_sources
+        sources.collect do |source|
+          source.ext('vim')
         end
-
-        compiled
       end
 
-      def test_sources
-        sources = []
-        grep_pattern = @options.grep_pattern
-        grep_invert = @options.grep_invert
-        unless grep_pattern.nil?
-          regex = Regexp.new(grep_pattern)
-        end
+      def get_builder
+        if @source_builder.nil?
+          @source_builder = Speckle::List::Builder.new
+          @options.inputs.each do |input|
+            @source_builder.add_source input
+          end
+
+          @source_builder.add_filter Speckle::List::DirExpander.new('**/*_spec.riml')
 
-        inputs.each do |input|
-          if File.directory?(input)
-            if grep_pattern.nil?
-              sources << "#{input}/**/*_spec.riml"
-            else
-              sources = Dir.glob("#{input}/**/*_spec.riml")
-              sources.keep_if do |source|
-                matched = regex.match(source)
-                if grep_invert
-                  matched = !matched
-                end
-
-                matched
-              end
-            end
-          else
-            if grep_pattern.nil?
-              sources << input
-            else
-              matched = regex.match(input)
-              if grep_invert
-                matched = !matched
-              end
-              sources << input if matched
-            end
+          unless @options.tag.nil?
+            @source_builder.add_filter Speckle::List::FileContentFilter.new(@options.tag, false)
           end
+
+          unless @options.grep_pattern.nil?
+            @source_builder.add_filter Speckle::List::PatternFilter.new(@options.grep_pattern, @options.grep_invert)
+          end
+
+          # Not using this at the moment, as it's simpler to not rebuild the source paths for test_compiled
+          #@source_builder.add_filter Speckle::List::AbsolutePathTransformer.new
+          #@source_builder.add_filter Speckle::List::ExtensionTransformer.new('vim')
         end
 
-        sources
+        @source_builder
       end
 
       def test_libs

data/lib/speckle/cli/router.rb

@@ -1,13 +1,11 @@
 module Speckle
   module CLI
 
-    require_relative 'rake_app'
     require_relative 'controller'
 
     class Router
       def route(action, options)
-        rake_app = RakeApp.new(options)
-        controller = Controller.new(options, rake_app)
+        controller = Controller.new(options)
         controller.send(action)
       end
     end

data/lib/speckle/list/absolute_path_transformer.rb

@@ -0,0 +1,9 @@
+module Speckle
+  module List
+    class AbsolutePathTransformer
+      def run(item)
+        [File.absolute_path(item)]
+      end
+    end
+  end
+end

data/lib/speckle/list/builder.rb

@@ -0,0 +1,43 @@
+module Speckle
+  module List
+    class Builder
+      def initialize
+        @sources = []
+        @filters = []
+        @filtered = nil
+      end
+
+      def add_source(source)
+        @sources << source
+      end
+
+      def add_filter(filter)
+        @filters << filter
+      end
+
+      def filter_list(list, filter)
+        filtered = []
+        list.each do |item|
+          result = filter.run(item)
+          filtered.concat(result)
+        end
+
+        filtered
+      end
+
+      def rebuild
+        filtered = @sources
+        @filters.each do |filter|
+          filtered = filter_list(filtered, filter)
+        end
+
+        @filtered = filtered
+      end
+
+      def build
+        rebuild if @filtered.nil?
+        @filtered
+      end
+    end
+  end
+end

data/lib/speckle/list/dir_expander.rb

@@ -0,0 +1,21 @@
+module Speckle
+  module List
+    class DirExpander
+      def initialize(pattern)
+        @pattern = pattern
+      end
+
+      def run(item)
+        pattern = "#{item}/#{@pattern}"
+        #puts "DirExpander:run #{item}, pattern=#{pattern}"
+        #puts "is dir = #{File.directory?(item)}"
+
+        if File.directory?(item)
+          return Dir.glob(pattern)
+        else
+          return [item]
+        end
+      end
+    end
+  end
+end

data/lib/speckle/list/extension_transformer.rb

@@ -0,0 +1,14 @@
+module Speckle
+  module List
+    class ExtensionTransformer
+      def initialize(extension)
+        @extension = extension
+      end
+
+      def run(item)
+        item = item.ext(@extension)
+        return [item]
+      end
+    end
+  end
+end

data/lib/speckle/list/file_content_filter.rb

@@ -0,0 +1,27 @@
+module Speckle
+  module List
+    class FileContentFilter
+      def initialize(pattern, invert = false)
+        @pattern = pattern
+        @invert = invert
+      end
+
+      def run(item)
+        return [] unless File.exists?(item)
+
+        matched = has_content(item, @pattern)
+        if @invert
+          matched = !matched
+        end
+
+        return [item] if matched
+        return []
+      end
+
+      def has_content(item, pattern)
+        regex = Regexp.new(pattern)
+        File.readlines(item).grep(regex).size > 0
+      end
+    end
+  end
+end

data/lib/speckle/list/pattern_filter.rb

@@ -0,0 +1,21 @@
+module Speckle
+  module List
+    class PatternFilter
+      def initialize(pattern, invert = false)
+        @pattern = pattern
+        @invert = invert
+      end
+
+      def run(item)
+        regex = Regexp.new(@pattern)
+        matched = !item.match(regex).nil?
+        if @invert
+          matched = !matched
+        end
+
+        return [item] if matched
+        return []
+      end
+    end
+  end
+end

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/speckle/list/absolute_path_transformer_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'speckle/list/absolute_path_transformer'
+
+module Speckle
+  module List
+
+    describe 'AbsolutePathTransformer' do
+
+      before :each do 
+        @filter = AbsolutePathTransformer.new
+      end
+
+      it 'can be run' do
+        expect(@filter).to respond_to(:run)
+      end
+
+      it 'can converts path to list with path' do
+        result = @filter.run('foo')
+        expect(result).to be_kind_of(Array)
+        expect(result).to eq(["#{Dir.pwd}/foo"])
+      end
+
+    end
+
+  end
+end

data/spec/speckle/list/builder_spec.rb

@@ -0,0 +1,43 @@
+require 'rake'
+require 'spec_helper'
+require 'speckle/list/builder'
+require 'speckle/list/absolute_path_transformer'
+require 'speckle/list/dir_expander'
+require 'speckle/list/extension_transformer'
+require 'speckle/list/file_content_filter'
+require 'speckle/list/pattern_filter'
+require 'securerandom'
+
+module Speckle
+  module List
+
+    describe 'Builder' do
+
+      before :each do 
+        @builder = Builder.new
+      end
+
+      it 'can be built' do
+        expect(@builder).to respond_to(:build)
+      end
+
+      it 'can build list of source files from directory', :a => true do
+        builder = Builder.new
+        builder.add_source 'spec'
+        builder.add_filter DirExpander.new('**/*_spec.riml')
+        builder.add_filter FileContentFilter.new('class', false)
+        builder.add_filter PatternFilter.new('matcher')
+        builder.add_filter AbsolutePathTransformer.new
+        builder.add_filter ExtensionTransformer.new('riml')
+
+        result = builder.build
+        result.each do |f|
+          expect(File.exists?(f)).to be_true
+        end
+        #puts result
+      end
+
+    end
+
+  end
+end

data/spec/speckle/list/dir_expander_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'speckle/list/dir_expander'
+
+module Speckle
+  module List
+
+    describe 'DirExpander' do
+
+      before :each do 
+        @filter = DirExpander.new('**/*.riml')
+      end
+
+      it 'can be run' do
+        expect(@filter).to respond_to(:run)
+      end
+
+      it 'returns an array of files on run' do
+        result = @filter.run('spec')
+
+        expect(result).to be_kind_of(Array)
+        expect(result).to_not be_empty
+      end
+
+      it 'can returns an array of files that exist' do
+        result = @filter.run('spec')
+
+        result.each do |f|
+          expect(File.exists?(f)).to be_true
+        end
+      end
+
+    end
+
+  end
+end

data/spec/speckle/list/extension_transformer_spec.rb

@@ -0,0 +1,33 @@
+require 'rake'
+require 'spec_helper'
+require 'speckle/list/extension_transformer'
+
+module Speckle
+  module List
+
+    describe 'ExtensionTransformer' do
+
+      before :each do 
+        @filter = ExtensionTransformer.new('vim')
+      end
+
+      it 'can be run' do
+        expect(@filter).to respond_to(:run)
+      end
+
+      it 'returns an array on run' do
+        result = @filter.run('foo.riml')
+
+        expect(result).to be_kind_of(Array)
+        expect(result).to_not be_empty
+      end
+
+      it 'changes the extension on run' do
+        result = @filter.run('foo.riml')
+        expect(result).to eq(['foo.vim'])
+      end
+
+    end
+
+  end
+end

data/spec/speckle/list/file_content_filter_spec.rb

@@ -0,0 +1,57 @@
+require 'rake'
+require 'spec_helper'
+require 'speckle/list/file_content_filter'
+require 'securerandom'
+
+module Speckle
+  module List
+
+    describe 'FileContentFilter' do
+
+      before :each do 
+        @filter = FileContentFilter.new('custom_content')
+      end
+
+      it 'can be run' do
+        expect(@filter).to respond_to(:run)
+      end
+
+      it 'returns an array on run' do
+        result = @filter.run(__FILE__)
+
+        expect(result).to be_kind_of(Array)
+      end
+
+      it 'returns empty array for non existant file' do
+        result = @filter.run(SecureRandom.uuid())
+        expect(result).to be_empty
+      end
+
+      it 'returns passed file if it has content' do
+        result = @filter.run(__FILE__)
+        expect(result).to eq([__FILE__])
+      end
+
+      it 'returns empty array if file does not match pattern' do
+        @filter = FileContentFilter.new('loremipsumdolorsitamet')
+        result = @filter.run("#{Dir.pwd}/spec/spec_helper.rb")
+        expect(result).to eq([])
+      end
+
+      it 'returns empty array if it has content with invert flag' do
+        @filter = FileContentFilter.new('focus', true)
+        result = @filter.run(__FILE__)
+        expect(result).to eq([])
+      end
+
+      it 'returns array with passed item if file does not match pattern with invert flag' do
+        @filter = FileContentFilter.new('loremipsumdolorsitamet', true)
+        file = "#{Dir.pwd}/spec/spec_helper.rb"
+        result = @filter.run(file)
+        expect(result).to eq([file])
+      end
+
+    end
+
+  end
+end

data/spec/speckle/list/pattern_filter_spec.rb

@@ -0,0 +1,58 @@
+require 'rake'
+require 'spec_helper'
+require 'speckle/list/pattern_filter'
+require 'securerandom'
+
+module Speckle
+  module List
+
+    describe 'PatternFilter' do
+
+      before :each do 
+        @filter = PatternFilter.new('^lorem')
+      end
+
+      it 'can be run' do
+        expect(@filter).to respond_to(:run)
+      end
+
+      it 'returns an array on run' do
+        result = @filter.run('foobar')
+
+        expect(result).to be_kind_of(Array)
+      end
+
+      it 'returns empty array for a mismatched pattern', :a => true do
+        result = @filter.run('foobar')
+        expect(result).to be_empty
+      end
+
+      it 'returns passed filename if it matches pattern', :b => true do
+        @filter = PatternFilter.new('pattern_filter')
+        result = @filter.run(__FILE__)
+        expect(result).to eq([__FILE__])
+      end
+
+      it 'returns empty array if file does not match pattern' do
+        @filter = PatternFilter.new('loremipsumdolorsitamet')
+        result = @filter.run("#{Dir.pwd}/spec/spec_helper.rb")
+        expect(result).to eq([])
+      end
+
+      it 'returns empty array if it has content with invert flag', :d => true do
+        @filter = PatternFilter.new('pattern_filter', true)
+        result = @filter.run(__FILE__)
+        expect(result).to eq([])
+      end
+
+      it 'returns array with passed item if file does not match pattern with invert flag' do
+        @filter = FileContentFilter.new('loremipsumdolorsitamet', true)
+        file = "#{Dir.pwd}/spec/spec_helper.rb"
+        result = @filter.run(file)
+        expect(result).to eq([file])
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Darshan Sawardekar
@@ -140,6 +140,12 @@ files:
 - lib/speckle/cli/environment.rb
 - lib/speckle/cli/rake_app.rb
 - lib/speckle/cli/router.rb
+- lib/speckle/list/absolute_path_transformer.rb
+- lib/speckle/list/builder.rb
+- lib/speckle/list/dir_expander.rb
+- lib/speckle/list/extension_transformer.rb
+- lib/speckle/list/file_content_filter.rb
+- lib/speckle/list/pattern_filter.rb
 - lib/speckle/loader.rb
 - lib/speckle/version.rb
 - lib/utils/spec_meta.riml
@@ -166,6 +172,12 @@ files:
 - spec/matchers/within_matcher_spec.riml
 - spec/spec_helper.rb
 - spec/speckle/cli/environment_spec.rb
+- spec/speckle/list/absolute_path_transformer_spec.rb
+- spec/speckle/list/builder_spec.rb
+- spec/speckle/list/dir_expander_spec.rb
+- spec/speckle/list/extension_transformer_spec.rb
+- spec/speckle/list/file_content_filter_spec.rb
+- spec/speckle/list/pattern_filter_spec.rb
 - spec/tagged_spec.riml
 - speckle.gemspec
 homepage: http://github.com/dsawardekar/speckle
@@ -210,4 +222,10 @@ test_files:
 - spec/matchers/within_matcher_spec.riml
 - spec/spec_helper.rb
 - spec/speckle/cli/environment_spec.rb
+- spec/speckle/list/absolute_path_transformer_spec.rb
+- spec/speckle/list/builder_spec.rb
+- spec/speckle/list/dir_expander_spec.rb
+- spec/speckle/list/extension_transformer_spec.rb
+- spec/speckle/list/file_content_filter_spec.rb
+- spec/speckle/list/pattern_filter_spec.rb
 - spec/tagged_spec.riml