guard-jasmine 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca4b769bafa5bfe03973a17312eb2a18afebea1
-  data.tar.gz: ae5294a61eaf4f7c5c9694a160a316a66c315ed4
+  metadata.gz: 53193032b63dd7b6271957ed84d4f210e480c555
+  data.tar.gz: 397ee318b045ae2c7afb655bf16024a4e3e05d34
 SHA512:
-  metadata.gz: c75ad5d7f77540d49efd89755a8d7cd7c9c1170bbec5ee1b3f5fac6055874706b956e967e221c1f5f98ca3adf1be144c985535e3e148e03c3f3def5056c4e0f0
-  data.tar.gz: e4f29f936ca7da08c65b4ba2f7f933105dcf1bc60593a79fba941df2d97df8a0183b663ab104fd7d7d459f306d44e3ecc3ad25e4ad34135c387974c019d79760
+  metadata.gz: f6eaa3b8cd54eaa1630ca2725faa439210b717e5716db767f99b0d94c34bb53672e73776404210f6f8d54d73a7d07f38d0491f8f42d8bae3f25a35e193950a6f
+  data.tar.gz: a35aeebd262c0c02d6cbd588bb2d27222986a0e6133ec0cf5907a19c7ad87276e7a1ec606a7de8171e902266f81ef4ae09ed258861fc048522dd0a53f22cc317

data/README.md

@@ -566,14 +566,17 @@ name in opposite to Jasmine).
 #### Jenkins CI integration
 
 You can use the Cobertura format to bring coverage support to Jenkins CI, even that Guard::Jasmine has no built in
-support for it. The trick is to preprocess the coverage data with istanbul after the spec run:
+support for it. The trick is to post-process the coverage data with istanbul after the spec run:
 
 ```ruby
 desc "Run all JavaScript specs with Istanbul"
 task :jscov => :environment do
-  # Run Jasmine tests with code coverage on and generate Jenkins-compatible Jasmine code coverage
-  # report file. For some reason does not work if run as 2 separate exec's, so combine into one.
-  exec('guard-jasmine --coverage --coverage-html --coverage-summary; istanbul report cobertura')
+  # Run Jasmine tests with code coverage on and generate Jenkins-compatible Jasmine code coverage report file.
+  # Must run assets:clean first to force re-compilation.
+  # Make sure to fail this task if there are unit test failures.
+  # For some reason does not work if run as separate exec's, so combine into one.
+  exec('rake assets:clean; guard-jasmine --coverage --coverage-html --coverage-summary; \
+        code=$?; if [ $code != "0" ]; then exit $code; fi; istanbul report cobertura')
 end
 ```
 
@@ -625,45 +628,46 @@ Usage:
   guard-jasmine spec
 
 Options:
-  -s, [--server=SERVER]          # Server to start, either `auto`, `webrick`, `mongrel`, `thin`, `puma`
-                                 # `unicorn`, `jasmine_gem` or `none`
-                                 # Default: auto
-  -p, [--port=N]                 # Server port to use
-                                 # Default: Random free port
-      [--verbose]                # Show the server output in the console
-  -e, [--server-env=SERVER_ENV]  # The server environment to use, for example `development`, `test` etc.
-                                 # Default: test
-      [--server-timeout=N]       # The number of seconds to wait for the Jasmine spec server
-                                 # Default: 15
-  -b, [--bin=BIN]                # The location of the PhantomJS binary
-  -d, [--spec-dir=SPEC_DIR]      # The directory with the Jasmine specs
-                                 # Default: spec/javascripts
-  -u, [--url=URL]                # The url of the Jasmine test runner_options
-                                 # Default: nil
-  -t, [--timeout=N]              # The maximum time in milliseconds to wait for the spec
-                                 # runner to finish
-                                 # Default: 10000
-      [--console=CONSOLE]        # Whether to show console.log statements in the spec runner,
-                                 # either `always`, `never` or `failure`
-                                 # Default: failure
-      [--errors=ERRORS]          # Whether to show errors in the spec runner,
-                                 # either `always`, `never` or `failure`
-                                 # Default: failure
-      [--focus]                  # Specdoc focus to hide successful tests when at least one test fails
-                                 # Default: true
-      [--specdoc=SPECDOC]        # Whether to show successes in the spec runner, either `always`, `never` or `failure`
-                                 # Default: always
-      [--coverage]               # Whether to enable the coverage support or not
-      [--coverage-html]          # Whether to generate html coverage report. Implies --coverage
-      [--coverage-summary]       # Whether to generate html coverage summary. Implies --coverage
-      [--statements-threshold=N] # Statements coverage threshold
-                                 # Default: 0
-      [--functions-threshold=N]  # Functions coverage threshold
-                                 # Default: 0
-      [--branches-threshold=N]   # Branches coverage threshold
-                                 # Default: 0
-      [--lines-threshold=N]      # Lines coverage threshold
-                                 # Default: 0
+  -s, [--server=SERVER]                 # Server to start, either `auto`, `webrick`, `mongrel`, `thin`, `puma`
+                                        # `unicorn`, `jasmine_gem` or `none`
+                                        # Default: auto
+  -p, [--port=N]                        # Server port to use
+                                        # Default: Random free port
+      [--verbose]                       # Show the server output in the console
+  -e, [--server-env=SERVER_ENV]         # The server environment to use, for example `development`, `test` etc.
+                                        # Default: test
+      [--server-timeout=N]              # The number of seconds to wait for the Jasmine spec server
+                                        # Default: 15
+  -b, [--bin=BIN]                       # The location of the PhantomJS binary
+  -d, [--spec-dir=SPEC_DIR]             # The directory with the Jasmine specs
+                                        # Default: spec/javascripts
+  -u, [--url=URL]                       # The url of the Jasmine test runner_options
+                                        # Default: nil
+  -t, [--timeout=N]                     # The maximum time in milliseconds to wait for the spec
+                                        # runner to finish
+                                        # Default: 10000
+      [--console=CONSOLE]               # Whether to show console.log statements in the spec runner,
+                                        # either `always`, `never` or `failure`
+                                        # Default: failure
+      [--errors=ERRORS]                 # Whether to show errors in the spec runner,
+                                        # either `always`, `never` or `failure`
+                                        # Default: failure
+      [--focus]                         # Specdoc focus to hide successful tests when at least one test fails
+                                        # Default: true
+      [--specdoc=SPECDOC]               # Whether to show successes in the spec runner, either `always`, `never` or `failure`
+                                        # Default: always
+      [--coverage]                      # Whether to enable the coverage support or not
+      [--coverage-html]                 # Whether to generate html coverage report. Implies --coverage
+      [--coverage-html-dir=REPORT_DIR]  # Where to save html coverage reports. Defaults to ./coverage. Implies --coverage-html
+      [--coverage-summary]              # Whether to generate html coverage summary. Implies --coverage
+      [--statements-threshold=N]        # Statements coverage threshold
+                                        # Default: 0
+      [--functions-threshold=N]         # Functions coverage threshold
+                                        # Default: 0
+      [--branches-threshold=N]          # Branches coverage threshold
+                                        # Default: 0
+      [--lines-threshold=N]             # Lines coverage threshold
+                                        # Default: 0
 Run the Jasmine spec runner
 ```
 
@@ -760,17 +764,9 @@ Given your configuration, you could also need to set:
 There are many ways to get your Jasmine specs run within a headless environment. If Guard::Jasmine isn't for you,
 I recommend to check out these other brilliant Jasmine runners:
 
-### Guards
-
-* [guard-jasmine-headless-webkit][], a Guard for [jasmine-headless-webkit][], but doesn't run on JRuby.
-* [guard-jasmine-node][] automatically & intelligently executes Jasmine Node.js specs when files are modified.
-* [guard-jessie][] allows to automatically run you Jasmine specs under Node.js using Jessie runner.
-
-### Standalone
-
-* [Evergreen][], runs CoffeeScript specs headless, but has no continuous testing support.
-* [Jezebel][] a Node.js REPL and continuous test runner for [Jessie][], a Node runner for Jasmine, but has no full
-featured browser environment.
+* [guard-konacha][], Automatically run [konacha][] tests through Guard.
+* [guard-teabag][], Guard-Teabag: Run Javascript tests with Guard and all the features of [Teabag][]
+* [Karma][] spectacular Test Runner for JavaScript.
 
 ## How to file an issue
 
@@ -804,6 +800,16 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
 `#guard` (irc.freenode.net).
 
+### Open Commit Bit
+
+Guard has an open commit bit policy: Anyone with an accepted pull request gets added as a repository collaborator.
+Please try to follow these simple rules:
+
+* Commit directly onto the master branch only for typos, improvements to the readme and documentation (please add
+  `[ci skip]` to the commit message).
+* Create a feature branch and open a pull-request early for any new features to get feedback.
+* Make sure you adhere to the general pull request rules above.
+
 ### The guard-jasmine-debug executable
 
 This Guard comes with a small executable `guard-jasmine-debug` that can be used to run the Jasmine test runner on PhantomJS
@@ -885,14 +891,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [CoffeeScript]: http://jashkenas.github.com/coffee-script/
 [Rails 3.1 asset pipeline]: http://guides.rubyonrails.org/asset_pipeline.html
 [Homebrew]: http://mxcl.github.com/homebrew/
-[Jezebel]: https://github.com/benrady/jezebel
-[Jessie]: https://github.com/futuresimple/jessie
-[guard-jasmine-headless-webkit]: https://github.com/johnbintz/guard-jasmine-headless-webkit
-[jasmine-headless-webkit]: https://github.com/johnbintz/jasmine-headless-webkit/
-[Evergreen]: https://github.com/jnicklas/evergreen
 [PhantomJS script]: https://github.com/netzpirat/guard-jasmine/blob/master/lib/guard/jasmine/phantomjs/guard-jasmine.coffee
 [Guard::CoffeeScript]: https://github.com/guard/guard-coffeescript
 [Sinon.JS]: http://sinonjs.org
-[guard-jasmine-node]: https://github.com/guard/guard-jasmine-node
-[guard-jessie]: https://github.com/guard/guard-jessie
 [Rails asset pipeline]: http://guides.rubyonrails.org/asset_pipeline.html
+[guard-konacha]: https://github.com/alexgb/guard-konacha
+[konacha]: https://github.com/jfirebaugh/konacha
+[Karma]: https://github.com/karma-runner/karma
+[guard-teabag]: https://github.com/modeset/guard-teabag
+[Teabag]: https://github.com/modeset/teabag

data/lib/guard/jasmine.rb

@@ -22,32 +22,33 @@ module Guard
     attr_accessor :last_run_failed, :last_failed_paths, :run_all_options
 
     DEFAULT_OPTIONS = {
-      server:               :auto,
-      server_env:           ENV['RAILS_ENV'] || 'development',
-      server_timeout:       60,
-      port:                 nil,
-      rackup_config:        nil,
-      jasmine_url:          nil,
-      timeout:              60,
-      spec_dir:             nil,
-      notification:         true,
-      hide_success:         false,
-      all_on_start:         true,
-      keep_failed:          true,
-      clean:                true,
-      all_after_pass:       true,
-      max_error_notify:     3,
-      specdoc:              :failure,
-      console:              :failure,
-      errors:               :failure,
-      focus:                true,
-      coverage:             false,
-      coverage_html:        false,
-      coverage_summary:     false,
-      statements_threshold: 0,
-      functions_threshold:  0,
-      branches_threshold:   0,
-      lines_threshold:      0
+      server:                   :auto,
+      server_env:               ENV['RAILS_ENV'] || 'development',
+      server_timeout:           60,
+      port:                     nil,
+      rackup_config:            nil,
+      jasmine_url:              nil,
+      timeout:                  60,
+      spec_dir:                 nil,
+      notification:             true,
+      hide_success:             false,
+      all_on_start:             true,
+      keep_failed:              true,
+      clean:                    true,
+      all_after_pass:           true,
+      max_error_notify:         3,
+      specdoc:                  :failure,
+      console:                  :failure,
+      errors:                   :failure,
+      focus:                    true,
+      coverage:                 false,
+      coverage_html:            false,
+      coverage_html_dir:        "./coverage",
+      coverage_summary:         false,
+      statements_threshold:     0,
+      functions_threshold:      0,
+      branches_threshold:       0,
+      lines_threshold:          0
     }
 
     # Initialize Guard::Jasmine.

data/lib/guard/jasmine/cli.rb

@@ -107,6 +107,11 @@ module Guard
                     default: false,
                     desc:    'Whether to generate html coverage report. Implies --coverage'
 
+      method_option :coverage_html_dir,
+                    type:    :string,
+                    default: "./coverage",
+                    desc:    'Where to save html coverage reports. Defaults to ./coverage. Implies --coverage-html'
+
       method_option :coverage_summary,
                     type:    :boolean,
                     default: false,
@@ -138,31 +143,32 @@ module Guard
       # @param [Array<String>] paths the name of the specs to run
       #
       def spec(*paths)
-        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[:server]               = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(runner_options[:spec_dir]) : options.server.to_sym
-        runner_options[:jasmine_url]          = options.url || "http://localhost:#{ runner_options[:port] }#{ options.server.to_sym == :jasmine_gem ? '/' : '/jasmine' }"
-        runner_options[:phantomjs_bin]        = options.bin || CLI.which('phantomjs')
-        runner_options[:timeout]              = options.timeout
-        runner_options[:verbose]              = options.verbose
-        runner_options[:server_env]           = options.server_env
-        runner_options[:server_timeout]       = options.server_timeout
-        runner_options[:rackup_config]        = options.rackup_config
-        runner_options[:console]              = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
-        runner_options[:errors]               = [:always, :never, :failure].include?(options.errors.to_sym) ? options.errors.to_sym : :failure
-        runner_options[:specdoc]              = [:always, :never, :failure].include?(options.specdoc.to_sym) ? options.specdoc.to_sym : :always
-        runner_options[:focus]                = options.focus
-        runner_options[:coverage]             = options.coverage || options.coverage_html || options.coverage_summary
-        runner_options[:coverage_html]        = options.coverage_html
-        runner_options[:coverage_summary]     = options.coverage_summary
-        runner_options[:statements_threshold] = options.statements_threshold
-        runner_options[:functions_threshold]  = options.functions_threshold
-        runner_options[:branches_threshold]   = options.branches_threshold
-        runner_options[:lines_threshold]      = options.lines_threshold
-        runner_options[:notification]         = false
-        runner_options[:hide_success]         = true
-        runner_options[:max_error_notify]     = 0
+        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[:server]                   = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(runner_options[:spec_dir]) : options.server.to_sym
+        runner_options[:jasmine_url]              = options.url || "http://localhost:#{ runner_options[:port] }#{ options.server.to_sym == :jasmine_gem ? '/' : '/jasmine' }"
+        runner_options[:phantomjs_bin]            = options.bin || CLI.which('phantomjs')
+        runner_options[:timeout]                  = options.timeout
+        runner_options[:verbose]                  = options.verbose
+        runner_options[:server_env]               = options.server_env
+        runner_options[:server_timeout]           = options.server_timeout
+        runner_options[:rackup_config]            = options.rackup_config
+        runner_options[:console]                  = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
+        runner_options[:errors]                   = [:always, :never, :failure].include?(options.errors.to_sym) ? options.errors.to_sym : :failure
+        runner_options[:specdoc]                  = [:always, :never, :failure].include?(options.specdoc.to_sym) ? options.specdoc.to_sym : :always
+        runner_options[:focus]                    = options.focus
+        runner_options[:coverage]                 = options.coverage || options.coverage_html || options.coverage_summary || options.coverage_html_dir != "./coverage"
+        runner_options[:coverage_html]            = options.coverage_html || options.coverage_html_dir != "./coverage"
+        runner_options[:coverage_html_dir]        = options.coverage_html_dir
+        runner_options[:coverage_summary]         = options.coverage_summary
+        runner_options[:statements_threshold]     = options.statements_threshold
+        runner_options[:functions_threshold]      = options.functions_threshold
+        runner_options[:branches_threshold]       = options.branches_threshold
+        runner_options[:lines_threshold]          = options.lines_threshold
+        runner_options[:notification]             = false
+        runner_options[:hide_success]             = true
+        runner_options[:max_error_notify]         = 0
 
         paths = [runner_options[:spec_dir]] if paths.empty?
 

data/lib/guard/jasmine/runner.rb

@@ -265,7 +265,7 @@ module Guard
           check_coverage(options)
 
           if options[:coverage_html]
-            generate_html_report
+            generate_html_report(options)
           end
         end
 
@@ -318,9 +318,12 @@ module Guard
         # Uses the Istanbul text reported to output the result of the
         # last coverage run.
         #
-        def generate_html_report
-          `#{ which('istanbul') } report --root #{ coverage_root } html #{ coverage_file }`
-          Formatter.info "Updated HTML report available at: #{ File.join('coverage', 'index.html') }"
+        # @param [Hash] options for the HTML report
+        #
+        def generate_html_report(options)
+          report_directory = coverage_report_directory(options)
+          `#{ which('istanbul') } report --dir #{ report_directory } --root #{ coverage_root } html #{ coverage_file }`
+          Formatter.info "Updated HTML report available at: #{ report_directory }/index.html"
         end
 
         # Uses the Istanbul text-summary reporter to output the
@@ -628,6 +631,15 @@ module Guard
         def coverage_root
           File.expand_path(File.join('tmp', 'coverage'))
         end
+
+        # Creates and returns the coverage report directory.
+        #
+        # @param [Hash] options for the coverage report directory
+        # @return [String] the coverage report directory
+        #
+        def coverage_report_directory(options)
+          File.expand_path(options[:coverage_html_dir])
+        end
       end
     end
   end

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.15.1'
+    VERSION = '1.16.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !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