guard-jasmine 1.18.3 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23bb53cca2e5b5ce98b0b78b80f5bc7562efead1
-  data.tar.gz: 0a7e7b695bc1e37873951d24e851512598eab59a
+  metadata.gz: 0d2c707960fcbd14e19cf91a60bf45ff6d7a4cdd
+  data.tar.gz: c57544a68c99bd17d8504421ceb167b7d0096ebe
 SHA512:
-  metadata.gz: a7f629189012aba7a3668d774b51b499e356d87714bca03abe83dc3604875eb4e8d4c03c1c760b80d5395e6412c49777b53647432b232a409006c6d2fede7a81
-  data.tar.gz: a6799461e50bf9cf5971256f38d91585da535af35df17233c93e6f0a83235e5c27df67bfdaf3585d8f8fc347cff572cd88c6afeb60e2b0ef42c7f54878daa598
+  metadata.gz: 933c8df094af29fdbf81a565112fd0d064e02630aee67091ebe8a8bfa4c566dbab3d548aabc4efbeb31ed7556058ee39990a6bb9dce4e191e55b81abc4321651
+  data.tar.gz: 297af7cc9c7563040174b72a036ddc278ba02dc1135af5734017209ada53253304a5a5a727575efed81a9af96c5ed701dbbf1b3efb4ed551bcdb421568f65c3e

data/README.md

@@ -2,7 +2,7 @@
 
 Guard::Jasmine automatically tests your Jasmine specs when files are modified.
 
-Tested on MRI Ruby 1.9.2, 1.9.3, 2.0.0 and the latest version of JRuby.
+Tested on MRI Ruby 1.9.3, 2.0.0 and the latest version of JRuby.
 
 If you have any questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard`
 (irc.freenode.net).
@@ -158,7 +158,7 @@ Now you can access `/jasmine` when you start your Rails server normally.
 2. Configure a mount point in your application's `routes.rb` (please refer to the [jasmine-rails][] documentation for more details):
 
     ```ruby
-    mount JasmineRails::Engine => '/spec' if defined?(JasmineRails)
+    mount JasmineRails::Engine => '/specs' if defined?(JasmineRails)
     ```
     
 3. Configure **Guard::Jasmine** to reference the mount point in your `Guardfile`:
@@ -672,6 +672,7 @@ Options:
   -b, [--bin=BIN]                       # The location of the PhantomJS binary
   -d, [--spec-dir=SPEC_DIR]             # The directory with the Jasmine specs
                                         # Default: spec/javascripts
+  -l, [--line-number=N]                 # The line which identifies the spec to be run
   -u, [--url=URL]                       # The url of the Jasmine test runner_options
                                         # Default: nil
   -t, [--timeout=N]                     # The maximum time in seconds to wait for the spec

data/lib/guard/jasmine.rb

@@ -1,15 +1,14 @@
 require 'net/http'
 
 require 'guard'
-require 'guard/guard'
-require 'guard/watcher'
+require 'guard/plugin'
 
 module Guard
 
   # The Jasmine guard that gets notifications about the following
-  # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_change`.
+  # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_modifications`.
   #
-  class Jasmine < Guard
+  class Jasmine < Plugin
 
     require 'guard/jasmine/coverage'
     require 'guard/jasmine/inspector'
@@ -57,7 +56,6 @@ module Guard
 
     # Initialize Guard::Jasmine.
     #
-    # @param [Array<Guard::Watcher>] watchers the watchers in the Guard block
     # @param [Hash] options the options for the Guard
     # @option options [String] :server the server to use, either :auto, :none, :webrick, :mongrel, :thin, :jasmine_gem, or a custom rake task
     # @option options [String] :server_env the server environment to use, for example :development, :test
@@ -89,7 +87,7 @@ module Guard
     # @option options [Symbol] :lines_threshold options for the statement lines threshold
     # @option options [Hash] :run_all options overwrite options when run all specs
     #
-    def initialize(watchers = [], options = { })
+    def initialize(options = { })
       options[:server_mount] ||= defined?(JasmineRails) ? '/specs' : '/jasmine'
 
       options = DEFAULT_OPTIONS.merge(options)
@@ -104,7 +102,7 @@ module Guard
 
       self.run_all_options = options.delete(:run_all) || { }
 
-      super(watchers, options)
+      super(options)
 
       self.last_run_failed   = false
       self.last_failed_paths = []
@@ -112,7 +110,7 @@ module Guard
 
     # Gets called once when Guard starts.
     #
-    # @raise [:task_has_failed] when run_on_change has failed
+    # @raise [:task_has_failed] when start has failed
     #
     def start
       if Jasmine.phantomjs_bin_valid?(options[:phantomjs_bin])
@@ -137,7 +135,7 @@ module Guard
 
     # Gets called when the Guard should reload itself.
     #
-    # @raise [:task_has_failed] when run_on_change has failed
+    # @raise [:task_has_failed] when reload has failed
     #
     def reload
       self.last_run_failed   = false
@@ -146,7 +144,7 @@ module Guard
 
     # Gets called when all specs should be run.
     #
-    # @raise [:task_has_failed] when run_on_change has failed
+    # @raise [:task_has_failed] when run_all has failed
     #
     def run_all
       passed, failed_specs = Runner.run([options[:spec_dir]], options.merge(self.run_all_options))
@@ -160,9 +158,9 @@ module Guard
     # Gets called when watched paths and files have changes.
     #
     # @param [Array<String>] paths the changed paths and files
-    # @raise [:task_has_failed] when run_on_change has failed
+    # @raise [:task_has_failed] when run_on_modifications has failed
     #
-    def run_on_changes(paths)
+    def run_on_modifications(paths)
       specs = options[:keep_failed] ? paths + self.last_failed_paths : paths
       specs = Inspector.clean(specs, options) if options[:clean]
       return false if specs.empty?

data/lib/guard/jasmine/cli.rb

@@ -65,6 +65,11 @@ module Guard
                     aliases: '-d',
                     desc:    'The directory with the Jasmine specs'
 
+      method_option :line_number,
+                    type:    :numeric,
+                    aliases: '-l',
+                    desc:    'The line which identifies the spec to be run'
+
       method_option :url,
                     type:    :string,
                     aliases: '-u',
@@ -166,6 +171,7 @@ module Guard
         runner_options                            = {}
         runner_options[:port]                     = options.port || CLI.find_free_server_port
         runner_options[:spec_dir]                 = options.spec_dir || (File.exists?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec')
+        runner_options[:line_number]              = options.line_number
         runner_options[:server]                   = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(runner_options[:spec_dir]) : options.server.to_sym
         runner_options[:server_mount]             = options.mount || (defined?(JasmineRails) ? '/specs' : '/jasmine')
         runner_options[:jasmine_url]              = options.url || "http://localhost:#{ runner_options[:port] }#{ options.server.to_sym == :jasmine_gem ? '/' : runner_options[:server_mount] }"

data/lib/guard/jasmine/runner.rb

@@ -41,7 +41,7 @@ module Guard
           notify_start_message(paths, options)
 
           results = paths.inject([]) do |results, file|
-            results << evaluate_response(run_jasmine_spec(file, options), file, options) if File.exist?(file)
+            results << evaluate_response(run_jasmine_spec(file, options), file, options) if File.exist?(file_and_line_number_parts(file)[0])
 
             results
           end.compact
@@ -141,9 +141,7 @@ module Guard
         end
 
         # The suite name must be extracted from the spec that
-        # will be run. This is done by parsing from the head of
-        # the spec file until the first `describe` function is
-        # found.
+        # will be run.
         #
         # @param [String] file the spec file
         # @param [Hash] options the options for the execution
@@ -153,16 +151,97 @@ module Guard
         def query_string_for_suite(file, options)
           return '' if file == options[:spec_dir]
 
-          query_string = ''
+          query_string = query_string_for_suite_from_line_number(file, options)
+
+          unless query_string
+            query_string = query_string_for_suite_from_first_describe(file, options)
+          end
+
+          query_string = query_string ? "?spec=#{ query_string }" : ''
+
+          URI.encode(query_string)
+        end
+
+        # When providing a line number by either the option or by
+        # a number directly after the file name the suite is extracted
+        # fromt the corresponding line number in the file.
+        #
+        # @param [String] file the spec file
+        # @param [Hash] options the options for the execution
+        # @option options [Fixnum] :line_number the line number to run
+        # @return [String] the suite name
+        #
+        def query_string_for_suite_from_line_number(file, options)
+          file_name, line_number = file_and_line_number_parts(file)
+          line_number ||= options[:line_number]
+
+          if line_number
+            lines = it_and_describe_lines(file_name, 0, line_number)
+            last = lines.pop
+
+            last_indentation = last[/^\s*/].length
+            # keep only lines with lower indentation
+            lines.delete_if { |x| x[/^\s*/].length >= last_indentation }
+            # remove all 'it'
+            lines.delete_if { |x| x =~ /^\s*it/ }
 
+            lines << last
+            lines.map { |x| spec_title(x) }.join(' ')
+          end
+        end
+
+        # The suite name must be extracted from the spec that
+        # will be run. This is done by parsing from the head of
+        # the spec file until the first `describe` function is
+        # found.
+        #
+        # @param [String] file the spec file
+        # @param [Hash] options the options for the execution
+        # @return [String] the suite name
+        #
+        def query_string_for_suite_from_first_describe(file, options)
           File.foreach(file) do |line|
             if line =~ /describe\s*[("']+(.*?)["')]+/
-              query_string = "?spec=#{ $1 }"
-              break
+              return $1
             end
           end
+        end
 
-          URI.encode(query_string)
+        # Splits the file name into the physical file name
+        # and the line number if present. E.g.:
+        # 'some_spec.js.coffee:10' -> ['some_spec.js.coffee', 10].
+        #
+        # If the line number is missing the second part of the
+        # returned array is `nil`.
+        #
+        # @param [String] file the spec file
+        # @return [Array] `[file_name, line_number]`
+        #
+        def file_and_line_number_parts(file)
+          match = file.match(/^(.+?)(?::(\d+))?$/)
+          [match[1], match[2].nil? ? nil : match[2].to_i]
+        end
+
+        # Returns all lines of the file that are either a
+        # 'describe' or a 'it' declaration.
+        #
+        # @param [String] file the spec file
+        # @param [Numeric] from the first line in the range
+        # @param [Numeric] to the last line in the range
+        # @Return [Array] the line contents
+        #
+        def it_and_describe_lines(file, from, to)
+          File.readlines(file)[from, to].
+            select { |x| x =~ /^\s*(it|describe)/ }
+        end
+
+        # Extracts the title of a 'description' or a 'it' declaration.
+        #
+        # @param [String] the line content
+        # @return [String] the extracted title
+        #
+        def spec_title(line)
+          line[/['"](.+?)['"]/, 1]
         end
 
         # Evaluates the JSON response that the PhantomJS script

data/lib/guard/jasmine/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module JasmineVersion
     # Guard::Jasmine version that is used for the Gem specification
-    VERSION = '1.18.3'
+    VERSION = '1.19.0'
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.19.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
@@ -140,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Guard gem for headless testing with Jasmine