guard-teaspoon 0.0.4 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWUzODM3NGUyNzYwNjhmMmI3YjRiOGUxNWRiMmQwMTE5ZmVmNjE5ZQ==
-  data.tar.gz: !binary |-
-    YmY1YzE0ODJhOGUyYTE2NDU1NWVmYmMzOTZiOTRhNmQ3M2RjMjEyMg==
+SHA1:
+  metadata.gz: 69c18f3e864be05f8ddadb2097fa4550b2d6fd34
+  data.tar.gz: c0528925c70edd7a86dccf686d75bbae84902ac3
 SHA512:
-  metadata.gz: !binary |-
-    YzBmNzMxOGJjMjI0NWQ1OWUzYmEwMGUxODA3YjI5MTU1MzA4ZDk2Zjk3NmNh
-    Mzk4MGJlNDE2YWYyY2IxYWFkMDgwZTYyMTM4MDkxOWY3OTk2YjVmYzFhMDI5
-    MTFkMWYyNjU4NWIwZjUwOGU1MTI5NzRkZDJjNmU2MjM1MDM3ZGU=
-  data.tar.gz: !binary |-
-    NzBiZWZhMTYwNzQwNDEzMjYwZTgzZDg0MzNmYmQwYzhmNDRmNjgxZTEzMTY2
-    MjAxNjY3ODRkZDQzMDM1ZTQ4NjYxOTExODY4ZWY2YThmYmU1Y2VhZmY0ODM5
-    OWEyYTA4ZWMzZTllMTE0N2I3Mzc0ODNhNmNmMzNkNWEzMzZlMjM=
+  metadata.gz: 26ac6b05ec51caef3784ba4f3465891d15c8161d63d8a4e75940021ebd53210111ad3b076524743a0c020fc6f5411c307f3350906bccc6eda961b4bb7fb3e97a
+  data.tar.gz: 3c15d06f873a92df801fec7a62e2fdf30871f77a0cf461251bb096a1e694d9b75dc090dada22a724cb6a72201da0a5d08bfe1c0fc3e51f442bab27b6003a3798

data/README.md

@@ -1,15 +1,27 @@
-Guard Teaspoon
+Guard-Teaspoon
 ==============
+
+[![Gem Version](https://badge.fury.io/rb/guard-teaspoon.png)](http://badge.fury.io/rb/guard-teaspoon)
+[![Dependency Status](https://gemnasium.com/modeset/guard-teaspoon.png)](https://gemnasium.com/modeset/guard-teaspoon)
 [![Build Status](https://travis-ci.org/modeset/guard-teaspoon.png?branch=master)](https://travis-ci.org/modeset/guard-teaspoon)
 [![Code Climate](https://codeclimate.com/github/modeset/guard-teaspoon.png)](https://codeclimate.com/github/modeset/guard-teaspoon)
+[![Coverage Status](https://coveralls.io/repos/modeset/guard-teaspoon/badge.png?branch=master)](https://coveralls.io/r/modeset/guard-teaspoon?branch=master)
+
+<img src="https://raw.github.com/modeset/teaspoon/master/screenshots/logo_big.png" alt="Logo by Morgan Keys" align="right" />
+<sup>Logo by [Morgan Keys](http://www.morganrkeys.com/)</sup>
 
 Guard-Teaspoon allows you to run [Teaspoon](https://github.com/modeset/teaspoon) using [Guard](https://github.com/guard/guard).
 
-Teaspoon is a Javascript test runner built on top of Rails. It can run tests in the browser, or headlessly using PhantomJS or with Selenium WebDriver. We recommend you check out the [installation steps for Teaspoon](https://github.com/modeset/teaspoon#installation), and [read about configuration](https://github.com/modeset/teaspoon#configuration).
+Teaspoon is a Javascript test runner built for Rails. It runs test in the browser or headless using PhantomJS or Selenium WebDriver. We recommend you check out the [installation steps for Teaspoon](https://github.com/modeset/teaspoon#installation), and [read about the configuration](https://github.com/modeset/teaspoon#configuration).
 
 With Guard-Teaspoon you can start up Guard, make changes to your tests or implementation files, and the specs will be run automatically using Teaspoon. It behaves very similarly to guard-rspec.
 
-This project is still experimental...
+This project is still experimental, but is being worked on.
+
+
+## Developer Notice
+
+The version of guard-teaspoon will be bumped up to 0.8 to match what is current in teaspoon. The versions will stay in sync (at least in terms of a minor version) from now on so that it's clear which versions work together well.
 
 
 ## Table of Contents
@@ -21,13 +33,12 @@ This project is still experimental...
 
 ## Installation
 
-Add it to your Gemfile. Like Teaspoon, in most cases you'll want to restrict it to the `:asset`, or `:development, :test` groups. You may also want to include one of the filesystem gems that [Guard suggests](https://github.com/guard/guard#efficient-filesystem-handling), and in our example we included `rb-fsevent`.
+Add it to your Gemfile. Like Teaspoon, in most cases you'll want to restrict it to the `:development, :test` groups.
 
 ```ruby
-group :assets do
+group :development, :test do
   gem "teaspoon"
   gem "guard-teaspoon"
-  gem "rb-fsevent" # used by guard
 end
 ```
 
@@ -59,13 +70,13 @@ Make changes to your javascript specs or implementation files and the appropriat
 
 In general this isn't very complicated, but if you have multiple suites setup in Teaspoon this can get a little complicated -- there's an expectation that you understand what you're doing in regards to using Guard.
 
-The default Guardfile will watch for any file changes within your `app/assets/javascripts` path and will attempt to resolve those file to a spec. If you're using QUnit, you can change this to be _test instead of _spec, or use js.coffee or coffee for file extensions, and you can use a more advanced regexp for other needs.
+The default Guardfile will watch for any file changes within your `app/assets/javascripts` path and will attempt to resolve those file to a spec. If you're using QUnit, you can change this to be `_test` instead of `_spec`, or use js.coffee or coffee for file extensions, and you can use a more advanced regexp for other needs.
 
 Guardfile
 ```ruby
 guard :teaspoon do
-  watch(%r{app/assets/javascripts/(.+).js}) { |m| "#{m[1]}_spec" }
-  watch(%r{/spec/javascripts/(.*)})
+  watch(%r{^app/assets/javascripts/(.+).js}) { |m| "#{m[1]}_spec" }
+  watch(%r{^spec/javascripts/(.*)})
 end
 ```
 
@@ -88,7 +99,7 @@ end
 
 Licensed under the [MIT License](http://creativecommons.org/licenses/MIT/)
 
-Copyright 2012 [Mode Set](https://github.com/modeset)
+Copyright 2014 [Mode Set](https://github.com/modeset)
 
 
 ## Make Code Not War

data/lib/guard/teaspoon.rb

@@ -1,31 +1,30 @@
 require "guard"
-require "guard/guard"
+require "guard/plugin"
 
 module Guard
-  class Teaspoon < Guard
-    autoload :Runner,   "guard/teaspoon/runner"
-    autoload :Resolver, "guard/teaspoon/resolver"
+  class Teaspoon < Plugin
+    require "guard/teaspoon/resolver"
+    require "guard/teaspoon/runner"
 
-    attr_accessor :runner, :failed_paths, :last_failed
+    attr_accessor :runner, :resolver, :failed_paths, :last_failed
 
-    def initialize(watchers = [], options = {})
+    def initialize(options = {})
       super
       @options = {
-        focus_on_failed: false,
-        all_after_pass:  true,
-        all_on_start:    true,
-        keep_failed:     true,
-        formatters:      "clean",
-        run_all:         {},
-        run_on_changes:  {}
+        focus_on_failed:      false,
+        all_after_pass:       true,
+        all_on_start:         true,
+        keep_failed:          true,
+        formatters:           'clean',
+        run_all:              {},
+        run_on_modifications: {}
       }.merge(options)
-      reload
-
-      @resolver = Resolver.new(@options)
-      @runner = Runner.new(@options)
     end
 
     def start
+      reload
+      @resolver = Resolver.new(@options)
+      @runner = Runner.new(@options)
       UI.info "Guard::Teaspoon is running"
       run_all if @options[:all_on_start]
     end
@@ -33,9 +32,11 @@ module Guard
     def run_all
       passed = @runner.run_all(@options[:run_all])
 
-      unless @last_failed = !passed
-        @failed_paths = []
+      if passed
+        reload
+        true
       else
+        @last_failed = true
         throw :task_has_failed
       end
     end
@@ -45,73 +46,22 @@ module Guard
       @failed_paths = []
     end
 
-    def run_on_changes(original_paths)
+    def run_on_modifications(original_paths)
       @resolver.resolve(original_paths)
 
       failed = false
       @resolver.suites.each do |suite, files|
-        failed = @runner.run(files, @options[:run_on_changes].merge(suite: suite))
+        failed = true unless @runner.run(files, @options[:run_on_modifications].merge(suite: suite))
       end
 
       if failed
         @last_failed = true
         Notifier.notify("Failed", title: "Teaspoon Guard", image: :failed)
+        throw :task_has_failed
       else
         Notifier.notify("Success", title: "Teaspoon Guard", image: :success)
+        run_all if @last_failed
       end
-
-      #original_paths = paths.dup
-      #
-      #focused = false
-      #if last_failed && @options[:focus_on_failed]
-      #  path = './tmp/teaspoon_guard_result'
-      #  if File.exist?(path)
-      #    # todo: this should ask a "resolver" to see if it's a spec or not
-      #    single_spec = paths && paths.length == 1 && paths[0].include?("_spec") ? paths[0] : nil
-      #    failed_specs = File.open(path) { |file| file.read.split("\n") }
-      #
-      #    File.delete(path)
-      #
-      #    if single_spec && @inspector.clean([single_spec]).length == 1
-      #      failed_specs = failed_specs.select{|p| p.include? single_spec}
-      #    end
-      #
-      #    if failed_specs.any?
-      #      # some sane limit, stuff will explode if all tests fail
-      #      #   ... cap at 10
-      #
-      #      paths = failed_specs[0..10]
-      #      focused = true
-      #    end
-      #
-      #    # switch focus to the single spec
-      #    focused = true if single_spec and failed_specs.length > 0
-      #  end
-      #end
-      #
-      #if focused
-      #  add_failed(original_paths)
-      #  add_failed(paths.map{|p| p.split(":")[0]})
-      #else
-      #  paths += failed_paths if @options[:keep_failed]
-      #  paths = @inspector.clean(paths)
-      #end
-      #
-      #if @runner.run(paths)
-      #  remove_failed(paths) unless focused
-      #
-      #  if last_failed && focused
-      #    run_on_changes(failed_paths)
-      #  elsif last_failed && @options[:all_after_pass]
-      #    @last_failed = false
-      #    run_all
-      #  end
-      #else
-      #  @last_failed = true
-      #  add_failed(paths) unless focused
-      #
-      #  throw :task_has_failed
-      #end
     end
 
     private

data/lib/guard/teaspoon/resolver.rb

@@ -19,7 +19,6 @@ module Guard
           end
         end
       end
-
     end
   end
 end

data/lib/guard/teaspoon/runner.rb

@@ -23,7 +23,7 @@ module Guard
 
       def run(files = [], options = {})
         return false if files.empty?
-        @console.execute(@options.merge(options), files)
+        @console.execute(@options.merge(options).merge(files: files))
       end
 
       private

data/lib/guard/teaspoon/templates/Guardfile

@@ -1,7 +1,7 @@
 guard :teaspoon do
   # Implementation files
-  watch(%r{app/assets/javascripts/(.+).js}) { |m| "#{m[1]}_spec" }
+  watch(%r{^app/assets/javascripts/(.+).js}) { |m| "#{m[1]}_spec" }
 
   # Specs / Helpers
-  watch(%r{spec/javascripts/(.*)})
+  watch(%r{^spec/javascripts/(.*)})
 end

data/lib/guard/teaspoon/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module TeaspoonVersion
-    VERSION = "0.0.4"
+    VERSION = "0.8.0"
   end
 end

data/spec/dummy/spec/teaspoon_env.rb

@@ -1,28 +1,15 @@
-# This file allows you to override various Teaspoon configuration directives when running from the command line. It is not
-# required from within the Rails environment, so overriding directives that have been defined within the initializer
-# is not possible.
-#
-# Set RAILS_ROOT and load the environment.
-ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
-require File.expand_path("../../config/environment", __FILE__)
-
-# Provide default configuration.
-#
-# You can override various configuration directives defined here by using arguments with the teaspoon command.
-#
-# teaspoon --driver=selenium --suppress-log
-# rake teaspoon DRIVER=selenium SUPPRESS_LOG=false
-Teaspoon.setup do |config|
-  # Driver
-  #config.driver         = "phantomjs" # available: phantomjs, selenium
-  #config.phantomjs_bin  = nil
+# Set RAILS_ROOT and load the environment if it's not already loaded.
+unless defined?(Rails)
+  ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
+  require File.expand_path("../../config/environment", __FILE__)
+end
 
-  # Behaviors
-  #config.server_timeout = 20 # timeout for starting the server
-  #config.fail_fast      = true # abort after the first failing suite
+Teaspoon.configure do |config|
+  config.suite do |suite|
+    suite.use_framework :jasmine, "1.3.1"
+  end
 
-  # Output
-  #config.formatters     = "dot" # available: dot, tap_y, swayze_or_oprah
-  #config.suppress_log   = false # suppress logs coming from console[log/error/debug]
-  #config.color          = true
+  config.suite :targeted do |suite|
+    suite.matcher = "spec/javascripts/**/*_tspec.{js,js.coffee,coffee}"
+  end
 end

data/spec/features/guard_teaspoon_spec.rb

@@ -14,7 +14,6 @@ feature "Full setup of an app that can run guard-teaspoon", aruba: true do
 
   scenario "installing Teaspoon and generating the Guardfile" do
     run_simple("bundle exec rails g teaspoon:install")
-    check_file_presence(["config/initializers/teaspoon.rb"], true)
     check_file_presence(["spec/teaspoon_env.rb"], true)
     check_file_presence(["spec/javascripts/spec_helper.js"], true)
 
@@ -25,7 +24,7 @@ feature "Full setup of an app that can run guard-teaspoon", aruba: true do
 
   scenario "allows running guard and will notice file changes" do
     pending "seems broken in rails 4"
-    pending if ENV['SKIP_SOME_FEATURES']
+    pending if ENV['CI']
     run_simple("bundle exec rails g teaspoon:install")
     run_simple("bundle exec guard init")
 

data/spec/guard/teaspoon/runner_spec.rb

@@ -52,7 +52,7 @@ describe Guard::Teaspoon::Runner do
 
     it "calls execute on console" do
       files = ["file1", "file2"]
-      console.should_receive(:execute).with({foo: "bar", baz: "teaspoon"}, files)
+      console.should_receive(:execute).with({foo: "bar", baz: "teaspoon", files: files})
       subject.run(files, baz: "teaspoon")
     end
 

data/spec/guard/teaspoon_spec.rb

@@ -3,7 +3,7 @@ require "guard/teaspoon"
 
 describe Guard::Teaspoon do
 
-  subject { Guard::Teaspoon.new([], {}) }
+  subject { Guard::Teaspoon.new({}) }
 
   before do
     Guard::Teaspoon::Resolver.stub(:new)
@@ -11,40 +11,37 @@ describe Guard::Teaspoon do
   end
 
   describe "#initialize" do
-
     it "merges the options" do
-      options = {focus_on_failed: true, other_option: "foo"}
-      subject = Guard::Teaspoon.new([], options)
+      options = { focus_on_failed: true, other_option: 'foo' }
+      subject = Guard::Teaspoon.new(options)
       expect(subject.instance_variable_get(:@options)).to eql({
-        focus_on_failed: true,
-        all_after_pass:  true,
-        all_on_start:    true,
-        keep_failed:     true,
-        formatters:      "clean",
-        run_all:         {},
-        run_on_changes:  {},
-        other_option:    "foo"
+        focus_on_failed:      true,
+        all_after_pass:       true,
+        all_on_start:         true,
+        keep_failed:          true,
+        formatters:           'clean',
+        run_all:              {},
+        run_on_modifications: {},
+        other_option:         'foo'
       })
     end
+  end
+
+  describe "#start" do
+    before do
+      subject.stub(:run_all)
+      Guard::UI.stub(:info)
+    end
 
     it "calls reload" do
       Guard::Teaspoon.any_instance.should_receive(:reload)
-      Guard::Teaspoon.new
+      subject.start
     end
 
     it "creates a resolver, and a runner" do
       Guard::Teaspoon::Resolver.should_receive(:new)
       Guard::Teaspoon::Runner.should_receive(:new)
-      Guard::Teaspoon.new
-    end
-
-  end
-
-  describe "#start" do
-
-    before do
-      subject.stub(:run_all)
-      Guard::UI.stub(:info)
+      subject.start
     end
 
     it "logs that we're starting" do
@@ -66,7 +63,6 @@ describe Guard::Teaspoon do
   end
 
   describe "#run_all" do
-
     let(:runner) { double(run_all: nil) }
 
     before do
@@ -104,9 +100,60 @@ describe Guard::Teaspoon do
 
   end
 
-  describe "#run_on_changes" do
+  describe "#run_on_modifications" do
+    let(:resolver) { double() }
+    let(:runner) { double() }
+    let(:original_paths) { ["a_spec"] }
+
+    before do
+      subject.resolver = resolver
+      subject.runner = runner
+    end
+
+    it "does nothing if the spec paths cant be resolved" do
+      subject.last_failed = false
+
+      resolver.should_receive(:resolve).with(original_paths)
+      resolver.should_receive(:suites).and_return([])
+
+      subject.run_on_modifications(original_paths)
+    end
+
+    it "runs every suite that is resolved to a spec" do
+      subject.last_failed = false
+
+      resolver.should_receive(:resolve).with(original_paths)
+      resolver.should_receive(:suites).and_return({"default" => ["foo", "bar"], "another_suite" => ["a_spec"]})
+
+      runner.should_receive(:run).with(["foo", "bar"], {suite: "default"}).and_return(true)
+      runner.should_receive(:run).with(["a_spec"], {suite: "another_suite"}).and_return(true)
+
+      subject.run_on_modifications(original_paths)
+    end
+
+    it "sets last_failed to false and throws :task_has_failed if a spec fails" do
+      subject.last_failed = false
+
+      resolver.should_receive(:resolve)
+      resolver.should_receive(:suites).and_return({"default" => ["foo", "bar"]})
+
+      runner.should_receive(:run).and_return(false)
 
-    it "needs to be written out fully and tested"
+      expect { subject.run_on_modifications(original_paths) }.to throw_symbol(:task_has_failed)
+      expect(subject.last_failed).to eq(true)
+    end
+
+    it "if all specs pass, it calls run_all if the previous run was unsuccessful" do
+      subject.last_failed = true
+
+      resolver.should_receive(:resolve)
+      resolver.should_receive(:suites).and_return({"default" => ["foo", "bar"]})
+
+      runner.should_receive(:run).and_return(true)
+      runner.should_receive(:run_all).and_return(true)
+
+      subject.run_on_modifications(original_paths)
+    end
 
   end