guard-jasmine 1.10.0 → 1.10.1

data/README.md

@@ -368,15 +368,14 @@ The server options configures the server environment that is needed to run Guard
                                               # and the config.ru is within the dummy app
 ```
 
-If you're setting the `:server` option to `:none`, you can supply the Jasmine runner url manually:
+If you're setting the `:server` option to `:none` or need to access your specs on a other host than `localhost`, you can
+supply the Jasmine runner url manually:
 
 ```ruby
-:jasmine_url => 'http://192.168.1.5/jasmine'  # URL where Jasmine is served.
-                                              # default: http://127.0.0.1:8888/jasmine
+:jasmine_url => 'http://192.168.1.5:1234/jasmine'  # URL where Jasmine is served.
+                                                   # default: nil
 ```
-
-Detecting the server with the `auto` option does only detect the jasmine gem or webrick. If you want to use mongrel or
-thins, you have to set it explicit in the server option.
+You may want to have also a fixed port instead of the random generated one.
 
 The reason why the Server environment is set to `development` by default is that in development mode
 the asset pipeline doesn't concatenate the JavaScripts and you'll see the line number in the real file,
@@ -543,7 +542,7 @@ Options:
                                  # `unicorn`, `jasmine_gem` or `none`
                                  # Default: auto
   -p, [--port=N]                 # Server port to use
-                                 # Default: 3001
+                                 # Default: Random free port
   -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
@@ -552,7 +551,7 @@ Options:
   -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: http://localhost:3001/jasmine
+                                 # Default: nil
   -t, [--timeout=N]              # The maximum time in milliseconds to wait for the spec
                                  # runner to finish
                                  # Default: 10000

data/lib/guard/jasmine.rb

@@ -26,7 +26,7 @@ module Guard
         :server_timeout   => 15,
         :port             => nil,
         :rackup_config    => nil,
-        :jasmine_url      => 'http://localhost:8888/jasmine',
+        :jasmine_url      => nil,
         :timeout          => 10,
         :spec_dir         => 'spec/javascripts',
         :notification     => true,
@@ -69,7 +69,8 @@ module Guard
     # @option options [Hash] :run_all options overwrite options when run all specs
     #
     def initialize(watchers = [], options = { })
-      options[:jasmine_url] = "http://localhost:#{ options[:port] }/jasmine" if options[:port] && !options[:jasmine_url]
+      options[:port] ||= Jasmine.find_free_server_port
+      options[:jasmine_url] = "http://localhost:#{ options[:port] }/jasmine" unless options[:jasmine_url]
       options = DEFAULT_OPTIONS.merge(options)
       options[:specdoc] = :failure if ![:always, :never, :failure].include? options[:specdoc]
       options[:server] ||= :auto

data/lib/guard/jasmine/cli.rb

@@ -31,7 +31,6 @@ module Guard
       method_option :port,
                     :type => :numeric,
                     :aliases => '-p',
-                    :default => 3001,
                     :desc => 'Server port to use'
 
       method_option :server_env,
@@ -64,7 +63,6 @@ module Guard
       method_option :url,
                     :type => :string,
                     :aliases => '-u',
-                    :default => 'http://localhost:3001/jasmine',
                     :desc => 'The url of the Jasmine test runner'
 
       method_option :timeout,
@@ -103,10 +101,10 @@ module Guard
         paths = [options.spec_dir] if paths.empty?
 
         runner_options = {}
-        runner_options[:jasmine_url] = options.url
+        runner_options[:port] = options.port || CLI.find_free_server_port
+        runner_options[:jasmine_url] = options.url || "http://localhost:#{ runner_options[:port] }/jasmine"
         runner_options[:phantomjs_bin] = options.bin || CLI.which('phantomjs')
         runner_options[:timeout] = options.timeout
-        runner_options[:port] = options.port
         runner_options[:server_env] = options.server_env
         runner_options[:server_timeout] = options.server_timeout
         runner_options[:spec_dir] = options.spec_dir

data/lib/guard/jasmine/server.rb

@@ -28,7 +28,7 @@ module Guard
         def start(options)
           server  = options[:server]
           server  = detect_server(options[:spec_dir]) if server == :auto
-          port    = options[:port] || detect_server_port
+          port    = options[:port]
           timeout = options[:server_timeout]
 
           case server
@@ -141,20 +141,6 @@ module Guard
           end
         end
 
-        # Detect the server port to use
-        #
-        # @return [Integer] a free server port
-        #
-        def detect_server_port
-          server = TCPServer.new('127.0.0.1', 0)
-          port = server.addr[1]
-          server.close
-
-          port
-        rescue Errno::EADDRINUSE
-          retry
-        end
-
         # Wait until the Jasmine test server is running.
         #
         # @param [Number] port the server port

data/lib/guard/jasmine/util.rb

@@ -78,6 +78,20 @@ module Guard
         end
       end
 
+      # Finds a free server port to use
+      #
+      # @return [Integer] a free server port
+      #
+      def find_free_server_port
+        server = TCPServer.new('127.0.0.1', 0)
+        port = server.addr[1]
+        server.close
+
+        port
+      rescue Errno::EADDRINUSE
+        retry
+      end
+
       # Cross-platform way of finding an executable in the $PATH.
       # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
       #

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.10.0'
+    VERSION = '1.10.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard