guard-jasmine 0.9.13 → 0.9.14

data/README.md

@@ -190,9 +190,9 @@ Guard::Jasmine can be adapted to all kind of projects. Please read the
 
 ```ruby
 guard 'jasmine' do
-  watch(%r{app/assets/javascripts/(.+)\.(js\.coffee|js)}) { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
-  watch(%r{spec/javascripts/(.+)_spec\.(js\.coffee|js)})  { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
-  watch(%r{spec/javascripts/spec\.(js\.coffee|js)})       { "spec/javascripts" }
+  watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$})         { "spec/javascripts" }
+  watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+  watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)$})  { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
 end
 ```
 
@@ -207,9 +207,9 @@ guard 'jasmine', :all_on_start => false, :specdoc => :always do
 end
 ```
 
-### General options
+### Server options
 
-The general options configures the environment that is needed to run Guard::Jasmine:
+The server options configures the server environment that is needed to run Guard::Jasmine:
 
 ```ruby
 :server => :jasmine_gem                       # Jasmine server to use, either :auto, :none,
@@ -235,9 +235,6 @@ If you're setting the `:server` option to `:none`, you can supply the Jasmine ru
 ```ruby
 :jasmine_url => 'http://192.168.1.5/jasmine'  # URL where Jasmine is served.
                                               # default: http://127.0.0.1:8888/jasmine
-
-:clean => false                               # Clean the spec list by only keep Jasmine specs within the project.
-                                              # default: true
 ```
 
 Detecting the server with the `auto` option does only detect the jasmine gem or webrick. If you want to use mongrel or
@@ -247,15 +244,28 @@ The reason why the Server environment is set to `development` by default is that
 the asset pipeline doesn't concatenate the JavaScripts and you'll see the line number in the real file,
 instead of a ridiculous high line number in a single, very large JavaScript.
 
-In general you want to leave the `:clean` flag on, which ensures that only Jasmine specs (files ending with `_spec.js`,
-`_spec.coffee` and `_spec.js.coffee` inside your project are passed to the runner. If you have a custom project
-structure or spec naming convention, you can set `:clean` to false to skip that file filter.
+#### Use a custom server
+
+If you supply an unknown server name as the `:server` option, then Guard::Jasmine will execute
+a `rake` task with the given server name as task in a child process. For example, if you configure
+`:server => 'start_my_server'`, then the command `rake start_my_server` will be executed and
+you have to make sure the server starts on the port that you can get from the `JASMINE_PORT`
+environment variable.
 
 ### Spec runner options
 
 The spec runner options configures the behavior driven development (or BDD) cycle:
 
 ```ruby
+:spec_dir => false                            # Directory with the Jasmine specs.
+                                              # default: 'spec/javascripts'
+
+:clean => false                               # Clean the spec list by only keep Jasmine specs within the project.
+                                              # default: true
+
+:all_on_start => false                        # Run all suites on start.
+                                              # default: true
+
 :all_on_start => false                        # Run all suites on start.
                                               # default: true
 
@@ -271,6 +281,10 @@ The `:keep_failed` failed option remembers failed suites and not failed specs. T
 avoid additional round trip time to request the Jasmine test runner for each single spec, which is mostly more expensive
 than running a whole suite.
 
+In general you want to leave the `:clean` flag on, which ensures that only Jasmine specs (files ending with `_spec.js`,
+`_spec.coffee` and `_spec.js.coffee` inside your project are passed to the runner. If you have a custom project
+structure or spec naming convention, you can set `:clean` to false to skip that file filter.
+
 ### Specdoc options
 
 Guard::Jasmine can generate an RSpec like specdoc in the console after running the specs and you can set when it will

data/lib/guard/jasmine.rb

@@ -26,6 +26,7 @@ module Guard
         :port             => 8888,
         :jasmine_url      => 'http://localhost:8888/jasmine',
         :timeout          => 10000,
+        :spec_dir         => 'spec/javascripts',
         :notification     => true,
         :hide_success     => false,
         :all_on_start     => true,
@@ -48,6 +49,7 @@ module Guard
     # @option options [String] :jasmine_url the url of the Jasmine test runner
     # @option options [String] :phantomjs_bin the location of the PhantomJS binary
     # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish
+    # @option options [String] :spec_dir the directory with the Jasmine specs
     # @option options [Boolean] :notification show notifications
     # @option options [Boolean] :hide_success hide success message notification
     # @option options [Integer] :max_error_notify maximum error notifications to show
@@ -79,7 +81,7 @@ module Guard
     def start
       if Jasmine.phantomjs_bin_valid?(options[:phantomjs_bin])
 
-        Server.start(options[:server], options[:port], options[:server_env]) unless options[:server] == :none
+        Server.start(options[:server], options[:port], options[:server_env], options[:spec_dir]) unless options[:server] == :none
 
         if Jasmine.runner_available?(options[:jasmine_url])
           run_all if options[:all_on_start]
@@ -111,7 +113,7 @@ module Guard
     # @raise [:task_has_failed] when run_on_change has failed
     #
     def run_all
-      passed, failed_specs = Runner.run(['spec/javascripts'], options)
+      passed, failed_specs = Runner.run([options[:spec_dir]], options)
 
       self.last_failed_paths = failed_specs
       self.last_run_failed   = !passed
@@ -126,7 +128,7 @@ module Guard
     #
     def run_on_change(paths)
       specs = options[:keep_failed] ? paths + self.last_failed_paths : paths
-      specs = Inspector.clean(specs) if options[:clean]
+      specs = Inspector.clean(specs, options) if options[:clean]
       return false if specs.empty?
 
       passed, failed_specs = Runner.run(specs, options)

data/lib/guard/jasmine/cli.rb

@@ -63,13 +63,19 @@ module Guard
                     :default => 'test',
                     :desc => 'The server environment to use, for example `development`, `test` etc.'
 
+      method_option :spec_dir,
+                    :type => :string,
+                    :aliases => '-d',
+                    :default => 'spec/javascripts',
+                    :desc => 'The directory with the Jasmine specs'
+
       # Run the Guard::Jasmine::Runner with options from
       # the command line.
       #
       # @param [Array<String>] paths the name of the specs to run
       #
       def spec(*paths)
-        paths = ['spec/javascripts'] if paths.empty?
+        paths = [options.spec_dir] if paths.empty?
 
         runner = {}
         runner[:jasmine_url] = options.url
@@ -77,8 +83,9 @@ module Guard
         runner[:timeout] = options.timeout
         runner[:port] = options.port
         runner[:server_env] = options.server_env
+        runner[:spec_dir] = options.spec_dir
         runner[:console] = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
-        runner[:server] = [:auto, :none, :webrick, :mongrel, :thin, :jasmine_gem].include?(options.server.to_sym) ? options.server.to_sym : :auto
+        runner[:server] = options.server.to_sym
 
         runner[:notification] = false
         runner[:hide_success] = true
@@ -86,7 +93,7 @@ module Guard
         runner[:specdoc] = :always
 
         if CLI.phantomjs_bin_valid?(runner[:phantomjs_bin])
-          ::Guard::Jasmine::Server.start(runner[:server], runner[:port], runner[:server_env]) unless runner[:server] == :none
+          ::Guard::Jasmine::Server.start(runner[:server], runner[:port], runner[:server_env], runner[:spec_dir]) unless runner[:server] == :none
 
           if CLI.runner_available?(runner[:jasmine_url])
             result = ::Guard::Jasmine::Runner.run(paths, runner)
@@ -101,9 +108,7 @@ module Guard
           Process.exit 2
         end
 
-      rescue Exception => e
-        raise e if e.is_a?(SystemExit)
-
+      rescue => e
         ::Guard::UI.error e.message
         Process.exit 2
       end

data/lib/guard/jasmine/inspector.rb

@@ -13,14 +13,16 @@ module Guard
         # Jasmine specs in either JavaScript or CoffeeScript.
         #
         # @param [Array<String>] paths the changed paths
+        # @param [Hash] options the options for the Guard
+        # @option options [String] :spec_dir the directory with the Jasmine specs
         # @return [Array<String>] the valid spec files
         #
-        def clean(paths)
+        def clean(paths, options)
           paths.uniq!
           paths.compact!
 
-          if paths.include?('spec/javascripts')
-            paths = ['spec/javascripts']
+          if paths.include?(options[:spec_dir])
+            paths = [options[:spec_dir]]
           else
             paths = paths.select { |p| jasmine_spec?(p) }
           end

data/lib/guard/jasmine/runner.rb

@@ -19,17 +19,19 @@ module Guard
         # @option options [String] :jasmine_url the url of the Jasmine test runner
         # @option options [String] :phantomjs_bin the location of the PhantomJS binary
         # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish
+        # @option options [String] :spec_dir the directory with the Jasmine specs
         # @option options [Boolean] :notification show notifications
         # @option options [Boolean] :hide_success hide success message notification
         # @option options [Integer] :max_error_notify maximum error notifications to show
         # @option options [Symbol] :specdoc options for the specdoc output, either :always, :never
         # @option options [Symbol] :console options for the console.log output, either :always, :never or :failure
+        # @option options [String] :spec_dir the directory with the Jasmine specs
         # @return [Boolean, Array<String>] the status of the run and the failed files
         #
         def run(paths, options = { })
           return [false, []] if paths.empty?
 
-          notify_start_message(paths)
+          notify_start_message(paths, options)
 
           results = paths.inject([]) do |results, file|
             results << evaluate_response(run_jasmine_spec(file, options), file, options)
@@ -45,9 +47,11 @@ module Guard
         # Shows a notification in the console that the runner starts.
         #
         # @param [Array<String>] paths the spec files or directories
+        # @param [Hash] options the options for the execution
+        # @option options [String] :spec_dir the directory with the Jasmine specs
         #
-        def notify_start_message(paths)
-          message = if paths == ['spec/javascripts']
+        def notify_start_message(paths, options)
+          message = if paths == [options[:spec_dir]]
                       'Run all Jasmine suites'
                     else
                       "Run Jasmine suite#{ paths.size == 1 ? '' : 's' } #{ paths.join(' ') }"
@@ -99,12 +103,13 @@ module Guard
         # Get the Jasmine test runner URL with the appended suite name
         # that acts as the spec filter.
         #
+        # @param [String] file the spec file
         # @param [Hash] options the options for the execution
         # @option options [String] :jasmine_url the url of the Jasmine test runner
         # @return [String] the Jasmine url
         #
         def jasmine_suite(file, options)
-          options[:jasmine_url] + query_string_for_suite(file)
+          options[:jasmine_url] + query_string_for_suite(file, options)
         end
 
         # Get the PhantomJS script that executes the spec and extracts
@@ -122,10 +127,12 @@ module Guard
         # found.
         #
         # @param [String] file the spec file
+        # @param [Hash] options the options for the execution
+        # @option options [String] :spec_dir the directory with the Jasmine specs
         # @return [String] the suite name
         #
-        def query_string_for_suite(file)
-          return '' if file == 'spec/javascripts'
+        def query_string_for_suite(file, options)
+          return '' if file == options[:spec_dir]
 
           query_string = ''
 
@@ -163,7 +170,7 @@ module Guard
 
             result
 
-          rescue Exception => e
+          rescue => e
             if json == ''
               Formatter.error("No response from the Jasmine runner!")
             else

data/lib/guard/jasmine/server.rb

@@ -18,15 +18,18 @@ module Guard
         # @param [String] strategy the server strategy to use
         # @param [Number] port the server port
         # @param [String] environment the Rails environment
+        # @param [String] spec_dir the spec directory
         #
-        def start(strategy, port, environment)
-          strategy = detect_server if strategy == :auto
+        def start(strategy, port, environment, spec_dir)
+          strategy = detect_server(spec_dir) if strategy == :auto
 
           case strategy
           when :webrick, :mongrel, :thin
             start_rack_server(port, environment, strategy)
           when :jasmine_gem
-            start_jasmine_gem_server(port)
+            start_rake_server(port, 'jasmine')
+          else
+            start_rake_server(port, strategy.to_s) unless strategy == :none
           end
 
           wait_for_server(port) unless strategy == :none
@@ -56,33 +59,35 @@ module Guard
           self.process.io.inherit! if ::Guard.respond_to?(:options) && ::Guard.options[:verbose]
           self.process.start
 
-        rescue Exception => e
+        rescue => e
           ::Guard::UI.error "Cannot start Rack server: #{ e.message }"
         end
 
         # Start the Jasmine gem server of the current project.
         #
         # @param [Number] port the server port
+        # @param [String] task the rake task name
         #
-        def start_jasmine_gem_server(port)
+        def start_rake_server(port, task)
           ::Guard::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
 
-          self.process = ChildProcess.build('rake', 'jasmine', "JASMINE_PORT=#{ port }")
+          self.process = ChildProcess.build('rake', task, "JASMINE_PORT=#{ port }")
           self.process.io.inherit! if ::Guard.respond_to?(:options) && ::Guard.options[:verbose]
           self.process.start
 
-        rescue Exception => e
+        rescue => e
           ::Guard::UI.error "Cannot start Jasmine Gem server: #{ e.message }"
         end
 
         # Detect the server to use
         #
+        # @param [String] spec_dir the spec directory
         # @return [Symbol] the server strategy
         #
-        def detect_server
+        def detect_server(spec_dir)
           if File.exists?('config.ru')
             :webrick
-          elsif File.exists?(File.join('spec', 'javascripts', 'support', 'jasmine.yml'))
+          elsif File.exists?(File.join(spec_dir, 'support', 'jasmine.yml'))
             :jasmine_gem
           else
             :none

data/lib/guard/jasmine/templates/Guardfile

@@ -1,5 +1,5 @@
 guard 'jasmine' do
-  watch(%r{app/assets/javascripts/(.+)\.(js\.coffee|js|coffee)$}) { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
-  watch(%r{spec/javascripts/(.+)_spec\.(js\.coffee|js|coffee)$})  { |m| puts m.inspect; "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
-  watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$})       { "spec/javascripts" }
+  watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$})         { "spec/javascripts" }
+  watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+  watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)$})  { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
 end

data/lib/guard/jasmine/util.rb

@@ -29,7 +29,7 @@ module Guard
             response.code.to_i == 200
           end
 
-        rescue Exception => e
+        rescue => e
           ::Guard::Jasmine::Formatter.error "Jasmine test runner isn't available at #{ url }: #{ e.message }"
 
           false

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 = '0.9.13'
+    VERSION = '0.9.14'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70365361675340 !ruby/object:Gem::Requirement
+  requirement: &70306138105320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70365361675340
+  version_requirements: *70306138105320
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70365361674960 !ruby/object:Gem::Requirement
+  requirement: &70306138104940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365361674960
+  version_requirements: *70306138104940
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &70365361674500 !ruby/object:Gem::Requirement
+  requirement: &70306138104480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365361674500
+  version_requirements: *70306138104480
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70365361674080 !ruby/object:Gem::Requirement
+  requirement: &70306138104060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365361674080
+  version_requirements: *70306138104060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365361673660 !ruby/object:Gem::Requirement
+  requirement: &70306138103640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361673660
+  version_requirements: *70306138103640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70365361673240 !ruby/object:Gem::Requirement
+  requirement: &70306138103220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361673240
+  version_requirements: *70306138103220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365361703020 !ruby/object:Gem::Requirement
+  requirement: &70306138102800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361703020
+  version_requirements: *70306138102800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70365361702600 !ruby/object:Gem::Requirement
+  requirement: &70306138102380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361702600
+  version_requirements: *70306138102380
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70365361702180 !ruby/object:Gem::Requirement
+  requirement: &70306138101960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361702180
+  version_requirements: *70306138101960
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70365361701760 !ruby/object:Gem::Requirement
+  requirement: &70306138101540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365361701760
+  version_requirements: *70306138101540
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70306138101120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70306138101120
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch
@@ -133,23 +144,16 @@ files:
 - bin/guard-jasmine
 - bin/guard-jasmine-debug
 - lib/guard/jasmine/cli.rb
-- lib/guard/jasmine/cli.rbc
 - lib/guard/jasmine/formatter.rb
-- lib/guard/jasmine/formatter.rbc
 - lib/guard/jasmine/inspector.rb
-- lib/guard/jasmine/inspector.rbc
 - lib/guard/jasmine/phantomjs/run-jasmine.coffee
 - lib/guard/jasmine/runner.rb
-- lib/guard/jasmine/runner.rbc
 - lib/guard/jasmine/server.rb
-- lib/guard/jasmine/server.rbc
 - lib/guard/jasmine/task.rb
 - lib/guard/jasmine/templates/Guardfile
 - lib/guard/jasmine/util.rb
 - lib/guard/jasmine/version.rb
-- lib/guard/jasmine/version.rbc
 - lib/guard/jasmine.rb
-- lib/guard/jasmine.rbc
 - LICENSE
 - README.md
 homepage: https://github.com/netzpirat/guard-jasmine