guard-jasmine 0.9.3 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/guard/jasmine/server.rb +17 -16
  2. data/lib/guard/jasmine/version.rb +1 -1
  3. metadata +34 -34
data/lib/guard/jasmine/server.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  # coding: utf-8
2
2
 
3
+ require 'childprocess'
4
+
3
5
  module Guard
4
6
  class Jasmine
5
7
 
@@ -9,7 +11,7 @@ module Guard
9
11
  module Server
10
12
  class << self
11
13
 
12
- attr_accessor :thread
14
+ attr_accessor :process
13
15
 
14
16
  # Start the internal test server for getting the Jasmine runner.
15
17
  #
@@ -33,7 +35,13 @@ module Guard
33
35
  # Stop the server thread.
34
36
  #
35
37
  def stop
36
- self.thread.kill if self.thread && self.thread.alive?
38
+ ::Guard::UI.info "Guard::Jasmine stops server."
39
+
40
+ begin
41
+ self.process.poll_for_exit(5)
42
+ rescue ChildProcess::TimeoutError
43
+ self.process.stop
44
+ end
37
45
  end
38
46
 
39
47
  private
@@ -47,14 +55,11 @@ module Guard
47
55
  # @param [Symbol] server the rack server to use
48
56
  #
49
57
  def start_rack_server(port, environment, server)
50
- require 'rack'
51
-
52
58
  ::Guard::UI.info "Guard::Jasmine starts #{ server } test server on port #{ port } in #{ environment } environment."
53
59
 
54
- self.thread = Thread.new {
55
- ENV['RAILS_ENV'] = environment.to_s
56
- Rack::Server.start(:config => 'config.ru', :Port => port, :server => server, :AccessLog => [])
57
- }
60
+ self.process = ChildProcess.build('rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s)
61
+ self.process.io.inherit! if ::Guard.respond_to?(:options) && ::Guard.options[:verbose]
62
+ self.process.start
58
63
 
59
64
  rescue Exception => e
60
65
  ::Guard::UI.error "Cannot start Rack server: #{ e.message }"
@@ -65,15 +70,11 @@ module Guard
65
70
  # @param [Number] port the server port
66
71
  #
67
72
  def start_jasmine_gem_server(port)
68
- require 'jasmine'
69
- require 'jasmine/config'
70
-
71
- jasmine_config_overrides = File.join(::Jasmine::Config.new.project_root, 'spec', 'javascripts' ,'support' ,'jasmine_config.rb')
72
- require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
73
-
74
73
  ::Guard::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
75
74
 
76
- self.thread = Thread.new { ::Jasmine::Config.new.start_server(port) }
75
+ self.process = ChildProcess.build('rake', 'jasmine', "JASMINE_PORT=#{ port }")
76
+ self.process.io.inherit! if ::Guard.respond_to?(:options) && ::Guard.options[:verbose]
77
+ self.process.start
77
78
 
78
79
  rescue Exception => e
79
80
  ::Guard::UI.error "Cannot start Jasmine Gem server: #{ e.message }"
@@ -103,7 +104,7 @@ module Guard
103
104
  while true
104
105
  begin
105
106
  ::TCPSocket.new('127.0.0.1', port).close
106
- return
107
+ break
107
108
  rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
108
109
  # Ignore, server still not available
109
110
  end
data/lib/guard/jasmine/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Guard
2
2
  module JasmineVersion
3
3
  # Guard::Jasmine version that is used for the Gem specification
4
- VERSION = '0.9.3'
4
+ VERSION = '0.9.4'
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: guard-jasmine
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-09 00:00:00.000000000Z
12
+ date: 2012-01-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: guard
16
- requirement: &70215148963540 !ruby/object:Gem::Requirement
16
+ requirement: &70357077274560 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.8.3
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70215148963540
24
+ version_requirements: *70357077274560
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: multi_json
27
- requirement: &70215148936820 !ruby/object:Gem::Requirement
27
+ requirement: &70357077274100 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: 1.0.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70215148936820
35
+ version_requirements: *70357077274100
36
36
  - !ruby/object:Gem::Dependency
37
- name: thor
38
- requirement: &70215148933180 !ruby/object:Gem::Requirement
37
+ name: childprocess
38
+ requirement: &70357077273640 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
- - - ! '>='
41
+ - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: '0'
43
+ version: 0.2.8
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70215148933180
46
+ version_requirements: *70357077273640
47
47
  - !ruby/object:Gem::Dependency
48
- name: rack
49
- requirement: &70215148916480 !ruby/object:Gem::Requirement
48
+ name: thor
49
+ requirement: &70357077273260 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70215148916480
57
+ version_requirements: *70357077273260
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70215148887860 !ruby/object:Gem::Requirement
60
+ requirement: &70357077272720 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,62 +65,62 @@ dependencies:
65
65
  version: '1.0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70215148887860
68
+ version_requirements: *70357077272720
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: guard-rspec
71
- requirement: &70215148882100 !ruby/object:Gem::Requirement
71
+ requirement: &70357077272220 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
75
75
  - !ruby/object:Gem::Version
76
- version: '0.5'
76
+ version: '0.6'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70215148882100
79
+ version_requirements: *70357077272220
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &70215148879600 !ruby/object:Gem::Requirement
82
+ requirement: &70357077271760 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
86
86
  - !ruby/object:Gem::Version
87
- version: '2.7'
87
+ version: '2.8'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70215148879600
90
+ version_requirements: *70357077271760
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: yard
93
- requirement: &70215148873900 !ruby/object:Gem::Requirement
93
+ requirement: &70357077271380 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
- - - ~>
96
+ - - ! '>='
97
97
  - !ruby/object:Gem::Version
98
- version: 0.7.3
98
+ version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70215148873900
101
+ version_requirements: *70357077271380
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: redcarpet
104
- requirement: &70215148872060 !ruby/object:Gem::Requirement
104
+ requirement: &70357077270920 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
- - - ~>
107
+ - - ! '>='
108
108
  - !ruby/object:Gem::Version
109
- version: 1.17.2
109
+ version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70215148872060
112
+ version_requirements: *70357077270920
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: pry
115
- requirement: &70215148870400 !ruby/object:Gem::Requirement
115
+ requirement: &70357077270500 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
- - - ~>
118
+ - - ! '>='
119
119
  - !ruby/object:Gem::Version
120
- version: 0.9.6.2
120
+ version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70215148870400
123
+ version_requirements: *70357077270500
124
124
  description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
125
125
  email:
126
126
  - michi@netzpiraten.ch