guard-motion 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.1.2 - May 23, 2013
+
+### Improvements
+
+- Use Inspector to handle paths better
+
+### Bug Fixes
+
+- Switch to rake spec to support both RubyMotion iOS and OSX (by [@libin](https://github.com/libin))
+- Fix Growl notifier error, updated specs to match (by [@philomory ](https://github.com/philomory))
+
 ## 0.1.1 - September 11, 2012
 
 ### Improvements

data/README.md

@@ -52,7 +52,7 @@ end
 ``` ruby
 guard 'motion' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/[^/]+/(.+)\.rb$})     { |m| "./spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/[^/]+/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
 end
 ```
 
@@ -78,13 +78,14 @@ end
 ### List of available options:
 
 ``` ruby
-:bundler => false            # use "bundle exec" to run the rake command, default: true
-:binstubs => true            # use "bin/rake" to run the rake command (takes precedence over :bundle), default: false
-:notification => false       # display Growl (or Libnotify) notification after the specs are done running, default: true
-:all_after_pass => false     # run all specs after changed specs pass, default: true
-:all_on_start => false       # run all the specs at startup, default: true
-:keep_failed => false        # keep failed specs until they pass, default: true
-:spec_paths => ["spec"]      # specify an array of paths that contain spec files
+:bundler => false                 # use "bundle exec" to run the rake command, default: true
+:binstubs => true                 # use "bin/rake" to run the rake command (takes precedence over :bundle), default: false
+:env => {:output => 'test_unit'}  # set env variables to be used by the RubyMotion spec runner, default: {}
+:notification => false            # display Growl (or Libnotify) notification after the specs are done running, default: true
+:all_after_pass => false          # run all specs after changed specs pass, default: true
+:all_on_start => false            # run all the specs at startup, default: true
+:keep_failed => false             # keep failed specs until they pass, default: true
+:spec_paths => ["spec"]           # specify an array of paths that contain spec files
 ```
 
 You can also use a custom binstubs directory using `:binstubs => 'some-dir'`.

data/lib/guard/motion.rb

@@ -7,6 +7,7 @@ module Guard
   class Motion < Guard
     autoload :ResultsParser,  'guard/motion/results_parser'
     autoload :Runner,         'guard/motion/runner'
+    autoload :Inspector,      'guard/motion/inspector'
 
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
@@ -23,6 +24,7 @@ module Guard
       @failed_paths = []
 
       @runner = Runner.new(@options)
+      @inspector = Inspector.new(@options)
     end
 
     # Call once when Guard starts. Please override initialize method to init stuff.
@@ -57,7 +59,7 @@ module Guard
     # @raise [:task_has_failed] when run_on_change has failed
     def run_on_changes(paths)
       paths += @failed_paths if @options[:keep_failed]
-      paths.uniq!
+      paths = @inspector.clean(paths).uniq
 
       if passed = @runner.run(paths)
         remove_failed(paths)

data/lib/guard/motion/inspector.rb

@@ -0,0 +1,72 @@
+module Guard
+  class Motion
+    class Inspector
+
+      def initialize(options = {})
+        self.excluded   = options[:exclude]
+        self.spec_paths = options[:spec_paths]
+      end
+
+      def excluded
+        @excluded || []
+      end
+
+      def excluded=(pattern)
+        @excluded = Dir[pattern.to_s]
+      end
+
+      def spec_paths
+        @spec_paths || []
+      end
+
+      def spec_paths=(paths)
+        @spec_paths = Array(paths)
+      end
+
+      def clean(paths)
+        paths.uniq!
+        paths.compact!
+        clear_spec_files_list_after do
+          paths = paths.select { |path| should_run_spec_file?(path) }
+        end
+        paths.reject { |p| included_in_other_path?(p, paths) }
+      end
+
+    private
+
+      def should_run_spec_file?(path)
+        (spec_file?(path) || feature_file?(path) || spec_folder?(path)) && !excluded.include?(path)
+      end
+
+      def spec_file?(path)
+        spec_files.include?(path)
+      end
+
+      def feature_file?(path)
+        feature_files.include?(path)
+      end
+
+      def spec_folder?(path)
+        path.match(%r{^(#{spec_paths.join("|")})[^\.]*$})
+      end
+
+      def spec_files
+        @spec_files ||= spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*_spec.rb")] }.flatten
+      end
+
+      def feature_files
+        @feature_files ||= spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*.feature")] }.flatten
+      end
+
+      def clear_spec_files_list_after
+        yield
+        @spec_files = nil
+      end
+
+      def included_in_other_path?(path, paths)
+        (paths - [path]).any? { |p| path.include?(p) && path.sub(p, '').include?('/') }
+      end
+
+    end
+  end
+end

data/lib/guard/motion/runner.rb

@@ -7,6 +7,7 @@ module Guard
         @options = {
           :bundler      => true,
           :binstubs     => false,
+          :env          => {},
           :notification => true,
         }.merge(options)
       end
@@ -43,7 +44,7 @@ module Guard
           type = :success
         end
 
-        Notifier.notify(message, :type => type, :image => type, :title => 'RubyMotion Spec Results', :priority => 2)
+        Notifier.notify(message, :image => type, :title => 'RubyMotion Spec Results', :priority => 2)
       end
 
       def rake_executable
@@ -54,6 +55,11 @@ module Guard
 
       def rake_command(paths)
         cmd_parts = []
+
+        @options[:env].each do |var, value|
+          cmd_parts << "#{var}=#{value}"
+        end
+
         cmd_parts << "bundle exec" if bundle_exec?
         cmd_parts << rake_executable
         cmd_parts << "spec:specific[\"#{paths.join(';')}\"]"

data/lib/guard/motion/tasks.rb

@@ -15,7 +15,7 @@ if Kernel.const_defined?(:Rake)
       spec_files = App.config.spec_files.select{|file_path| !(file_path =~ /_spec.rb$/)}
       spec_files += files.split(';')
       App.config.instance_variable_set("@spec_files", spec_files)
-      Rake::Task["simulator"].invoke
+      Rake::Task["spec"].invoke
     end
   end
 end

data/lib/guard/motion/templates/Guardfile

@@ -2,8 +2,8 @@ guard 'motion' do
   watch(%r{^spec/.+_spec\.rb$})
 
   # RubyMotion App example
-  watch(%r{^app/(.+)\.rb$})     { |m| "./spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
 
   # RubyMotion gem example
-  watch(%r{^lib/[^/]+/(.+)\.rb$})     { |m| "./spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/[^/]+/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
 end

data/lib/guard/motion/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module MotionVersion
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/fixtures/other_spec_path/empty_spec.rb

@@ -0,0 +1 @@
+# Empty file to test spec_paths option

data/spec/guard/motion/inspector_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe Guard::Motion::Inspector do
+
+  describe '.initialize' do
+    it 'accepts an :exclude option that sets @excluded' do
+      inspector1 = described_class.new(:exclude => 'spec/slow/*')
+
+      inspector2 = described_class.new
+      inspector2.excluded = 'spec/slow/*'
+
+      inspector1.excluded.should eq inspector2.excluded
+    end
+
+    it 'accepts a :spec_paths option that sets @spec_paths' do
+      inspector1 = described_class.new(:spec_paths => ['spec/slow'])
+
+      inspector2 = described_class.new
+      inspector2.spec_paths = ['spec/slow']
+
+      inspector1.spec_paths.should eq inspector2.spec_paths
+    end
+  end
+
+  describe '#excluded=' do
+    it 'runs a glob on the given pattern' do
+      subject.excluded = 'spec/slow/*'
+      subject.excluded.should eq Dir['spec/slow/*']
+    end
+  end
+
+  describe '#spec_paths=' do
+    context 'given a string' do
+      before { subject.spec_paths = 'test' }
+
+      it 'returns an array' do
+        subject.spec_paths.should eq ['test']
+      end
+    end
+
+    context 'given an array' do
+      before { subject.spec_paths = ['test'] }
+
+      it 'returns an array' do
+        subject.spec_paths.should eq ['test']
+      end
+    end
+  end
+
+  describe '#clean' do
+    before do
+      subject.excluded = nil
+      subject.spec_paths = ['spec']
+    end
+
+    it 'removes non-spec files' do
+      subject.clean(['spec/guard/motion_spec.rb', 'bob.rb']).
+      should eq ['spec/guard/motion_spec.rb']
+    end
+
+    it 'removes spec-looking but non-existing files' do
+      subject.clean(['spec/guard/motion_spec.rb', 'bob_spec.rb']).
+      should eq ['spec/guard/motion_spec.rb']
+    end
+
+    it 'removes spec-looking but non-existing files (2)' do
+      subject.clean(['spec/guard/rspec/version_spec.rb']).should be_empty
+    end
+
+    it 'keeps spec folder path' do
+      subject.clean(['spec/guard/motion_spec.rb', 'spec/models']).
+      should eq ['spec/guard/motion_spec.rb', 'spec/models']
+    end
+
+    it 'removes duplication' do
+      subject.clean(['spec', 'spec']).should eq ['spec']
+    end
+
+    it 'removes spec folders included in other spec folders' do
+      subject.clean(['spec/models', 'spec']).should eq ['spec']
+    end
+
+    it 'removes spec files included in spec folders' do
+      subject.clean(['spec/guard/motion_spec.rb', 'spec']).should eq ['spec']
+    end
+
+    it 'removes spec files included in spec folders (2)' do
+      subject.clean([
+        'spec/guard/motion_spec.rb', 'spec/guard/rspec/runner_spec.rb',
+        'spec/guard/rspec'
+      ]).should eq ['spec/guard/motion_spec.rb', 'spec/guard/rspec']
+    end
+
+    it 'keeps top-level specs' do
+      subject.spec_paths = ['spec/fixtures/other_spec_path']
+      subject.clean(['spec/fixtures/other_spec_path/empty_spec.rb']).
+      should eq ['spec/fixtures/other_spec_path/empty_spec.rb']
+    end
+
+    it 'keeps spec files in symlink target' do
+      subject.clean(['spec/fixtures/symlink_to_spec/motion_spec.rb']).
+      should eq ['spec/fixtures/symlink_to_spec/motion_spec.rb']
+    end
+
+    describe 'excluded files' do
+      context 'with a path to a single spec' do
+        it 'ignores the one spec' do
+          subject.excluded = 'spec/guard/motion_spec.rb'
+          subject.clean(['spec/guard/motion_spec.rb']).should be_empty
+        end
+      end
+
+      context 'with a glob' do
+        it 'ignores files recursively' do
+          subject.excluded = 'spec/guard/**/*'
+          subject.clean(['spec/guard/motion_spec.rb', 'spec/guard/motion/runner_spec.rb']).should be_empty
+        end
+      end
+    end
+
+    describe 'spec paths' do
+      context 'with an expanded spec path' do
+        before { subject.spec_paths = ['spec', 'spec/fixtures/other_spec_path'] }
+
+        it 'should clean paths not specified' do
+          subject.clean([
+            'clean_me/spec/cleaned_spec.rb', 'spec/guard/motion/runner_spec.rb',
+            'spec/fixtures/other_spec_path/empty_spec.rb'
+          ]).should eq ['spec/guard/motion/runner_spec.rb', 'spec/fixtures/other_spec_path/empty_spec.rb']
+        end
+      end
+    end
+  end
+
+end

data/spec/guard/motion/runner_spec.rb

@@ -54,7 +54,7 @@ module Guard
 
               it "sends a failure notification" do
                 ::Guard::Notifier.should_receive(:notify).with(
-                  'Failed', :title => 'RubyMotion Spec Results', :type => :failed, :image => :failed, :priority => 2
+                  'Failed', :title => 'RubyMotion Spec Results', :image => :failed, :priority => 2
                 )
 
                 subject.run(['spec'])
@@ -66,7 +66,7 @@ module Guard
 
               it "sends a spec failed notification" do
                 ::Guard::Notifier.should_receive(:notify).with(
-                  '31 specs, 2 failures, 0 errors', :title => 'RubyMotion Spec Results', :type => :failed, :image => :failed, :priority => 2)
+                  '31 specs, 2 failures, 0 errors', :title => 'RubyMotion Spec Results', :image => :failed, :priority => 2)
 
                 subject.run(["spec"])
               end
@@ -77,7 +77,7 @@ module Guard
 
               it "sends a success notification" do
                 ::Guard::Notifier.should_receive(:notify).with(
-                  '31 specs, 0 failures, 0 errors', :title => 'RubyMotion Spec Results', :type => :success, :image => :success, :priority => 2
+                  '31 specs, 0 failures, 0 errors', :title => 'RubyMotion Spec Results', :image => :success, :priority => 2
                 )
 
                 subject.run(['spec'])
@@ -86,7 +86,6 @@ module Guard
           end
 
           describe 'options' do
-
             describe ':bundler' do
               context ':bundler => false' do
                 subject { described_class.new(:bundler => false) }
@@ -139,6 +138,18 @@ module Guard
               end
             end
 
+            describe ':env' do
+              subject { described_class.new(:env => { :debug => 1, :output => "test_unit" }) }
+
+              it 'sets environment variables' do
+                PTY.should_receive(:spawn).with(
+                  "debug=1 output=test_unit bundle exec rake spec:specific[\"spec\"]"
+                )
+
+                subject.run(['spec'])
+              end
+            end
+
             describe ':notification' do
               context ':notification => false' do
                 subject { described_class.new(:notification => false) }

metadata

@@ -1,109 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-motion
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - mordaroso
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 10
-        version: "2.10"
+      - !ruby/object:Gem::Version
+        version: '2.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Guard::Motion automatically run your specs (much like autotest).
-email: 
+email:
 - mordaroso@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -114,51 +108,47 @@ files:
 - Rakefile
 - guard-motion.gemspec
 - lib/guard/motion.rb
+- lib/guard/motion/inspector.rb
 - lib/guard/motion/results_parser.rb
 - lib/guard/motion/runner.rb
 - lib/guard/motion/tasks.rb
 - lib/guard/motion/templates/Guardfile
 - lib/guard/motion/version.rb
 - spec/fixtures/bundler/Gemfile
+- spec/fixtures/other_spec_path/empty_spec.rb
+- spec/guard/motion/inspector_spec.rb
 - spec/guard/motion/results_parser_spec.rb
 - spec/guard/motion/runner_spec.rb
 - spec/guard/motion_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/guard-motion
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard gem for RubyMotion
-test_files: 
+test_files:
 - spec/fixtures/bundler/Gemfile
+- spec/fixtures/other_spec_path/empty_spec.rb
+- spec/guard/motion/inspector_spec.rb
 - spec/guard/motion/results_parser_spec.rb
 - spec/guard/motion/runner_spec.rb
 - spec/guard/motion_spec.rb