jasmine-rails 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c01585e228cf041c994942883a3aca24edc12d
-  data.tar.gz: bce2ef04774ed788dc7cc33303d4881bf111c754
+  metadata.gz: 379cc6c1cc1307c4875ca1772008b75f4e37e668
+  data.tar.gz: d32d427c74cabf24bd342c0a9350d90c81186f62
 SHA512:
-  metadata.gz: da4d89dbb47926b4ab19b6a0351820d3fcb029cc3c5a3aed8402f57b3a8a4653b7d58178f43458823cc9248fc4ff548b785bfe555505b62481807aede5809608
-  data.tar.gz: f69cc3335a776e693577126f9893332aade157c4c58cd360143bc62643f6635bd5f7cc1f40e7973efe2a6afd4e59db1454fa5202f2cb2f417fb7fc608b5b560a
+  metadata.gz: 9d8555f9e0f3eabd033d8c4ecd19952e6b33b47ea80e1d3645d8cb1450f1e9cfb01291bcf3d5143213c9235293d5a6604e2353770190b762da5f81282749d324
+  data.tar.gz: 54cc1b4c3fd1f3b6b778e4d7b1aa87b60075be16b07253ebfbdac1c2deba4e6ebf45d9bc006ab8f6f34151196c54d18b0d2f48f19dd8318bf5f51866b9c1d190

data/README.md

@@ -237,3 +237,16 @@ default, and you can explicitly use it by the name `console`.
 See [jasmine-junitreporter][j-junit] for an example with JUnit output.
 
 [j-junit]: https://github.com/shepmaster/jasmine-junitreporter-gem
+
+## PhantomJS binary
+
+By default the [PhantomJS gem](https://github.com/colszowka/phantomjs-gem) will
+be responsible for finding and using an appropriate version of PhantomJS. If
+however, you wish to manage your own phantom executable you can set:
+
+```yml
+use_phantom_gem: false
+```
+
+This will then try and use the `phantom` executable on the current `PATH`.
+

data/lib/jasmine-rails.rb

@@ -91,6 +91,11 @@ module JasmineRails
       jasmine_config['force_ssl'] || false
     end
 
+    # use the phantom command from the phantom gem. Set to false if you want to manage your own phantom executable
+    def use_phantom_gem?
+      jasmine_config['use_phantom_gem'].nil? || jasmine_config['use_phantom_gem'] == true
+    end
+
     private
 
     def css_dir

data/lib/jasmine_rails/runner.rb

@@ -7,7 +7,7 @@ module JasmineRails
       # raises an exception if any errors are encountered while running the testsuite
       def run(spec_filter = nil, reporters = 'console')
         override_rails_config do
-          require 'phantomjs'
+          require 'phantomjs' if JasmineRails.use_phantom_gem?
           require 'fileutils'
 
           include_offline_asset_paths_helper
@@ -18,7 +18,8 @@ module JasmineRails
           File.open(runner_path, 'w') {|f| f << html.gsub("/#{asset_prefix}", "./#{asset_prefix}")}
 
           phantomjs_runner_path = File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts', 'jasmine-runner.js')
-          run_cmd %{"#{Phantomjs.path}" "#{phantomjs_runner_path}" "#{runner_path.to_s}?spec=#{spec_filter}"}
+          phantomjs_cmd = JasmineRails.use_phantom_gem? ? Phantomjs.path : 'phantomjs'
+          run_cmd %{"#{phantomjs_cmd}" "#{phantomjs_runner_path}" "#{runner_path.to_s}?spec=#{spec_filter}"}
         end
       end
 

data/lib/jasmine_rails/version.rb

@@ -1,3 +1,3 @@
 module JasmineRails
-  VERSION = "0.10.5"
+  VERSION = "0.10.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-rails
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Justin Searls
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties