guard-spork 2.0.2 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/guard/spork.rb +1 -2
  3. data/lib/guard/spork/runner.rb +9 -11
  4. data/lib/guard/spork/spork_instance.rb +1 -1
  5. data/lib/guard/spork/version.rb +1 -1
  6. metadata +35 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e597137975cc3abbe88da7c48d26a32638e52917
4
- data.tar.gz: 237acfca0c7ab1b07cc5a15aeeaafb7db11caa8e
3
+ metadata.gz: ca7e3d860997ef1d30b375028d63454aeeff487d
4
+ data.tar.gz: eca757553e4d2d6e56bef08eef5d1a24f0b296f0
5
5
  SHA512:
6
- metadata.gz: c505e69d8c420fccb68a386ed842ed02e75833f1093d738d0dbba7a7c3b5abc6e2b8d6c82b12753c8b9c6f3ccc8669a2d1d2fe8154f68c4cb5d6a5260f4ac5b9
7
- data.tar.gz: 0559d74c7e3b172a16c923c899745b173924cb2ae49ac0bda92f5e1f2dd02d86be43042c2f4e055e98d4ecbf2a3534693d2a78ece85d3e903592757c6f243b66
6
+ metadata.gz: cde372e6ed05015e5b1eeaab9e8982721a8ec6de2bfc9c5351f330bed2bc72279893036c85c61cd4d0d3a11aed14016e106a43fa96baeaea3b2775fa38104259
7
+ data.tar.gz: 7e275df1af21d6a153fefa2662a2ae816ce18721514bcfe20163ee7edf21bba6cf23709084d590ec632549753080978f7363bedc7e355725bda678be713f14ed
data/lib/guard/spork.rb CHANGED
@@ -1,5 +1,4 @@
1
- require 'guard'
2
- require 'guard/plugin'
1
+ require 'guard/compat/plugin'
3
2
  require 'childprocess'
4
3
 
5
4
  module Guard
data/lib/guard/spork/runner.rb CHANGED
@@ -27,7 +27,7 @@ module Guard
27
27
 
28
28
  def launch_sporks(action, type = nil)
29
29
  instances = find_instances(type)
30
- UI.info "#{action.capitalize}ing Spork for #{instances.join(', ')}", :reset => true
30
+ Compat::UI.info "#{action.capitalize}ing Spork for #{instances.join(', ')}", :reset => true
31
31
  if options[:notify_on_start]
32
32
  Notifier.notify "#{action.capitalize}ing #{instances.join(', ')}", :title => "Spork", :image => :success
33
33
  end
@@ -37,7 +37,7 @@ module Guard
37
37
 
38
38
  def kill_sporks(type = nil)
39
39
  alive = find_instances(type).select(&:alive?)
40
- UI.debug "Killing Spork servers with PID: #{alive.map(&:pid).join(', ')}"
40
+ Compat::UI.debug "Killing Spork servers with PID: #{alive.map(&:pid).join(', ')}"
41
41
  alive.each(&:stop)
42
42
  end
43
43
 
@@ -66,7 +66,7 @@ module Guard
66
66
  end
67
67
 
68
68
  def kill_pids(pids)
69
- UI.debug "Killing Spork servers with PID: #{pids.join(', ')}"
69
+ Compat::UI.debug "Killing Spork servers with PID: #{pids.join(', ')}"
70
70
  pids.each { |pid| ::Process.kill("KILL", pid) rescue nil }
71
71
  end
72
72
 
@@ -83,20 +83,18 @@ module Guard
83
83
  names = instances.join(', ')
84
84
 
85
85
  if wait_for_launch(instances, options[:wait])
86
- UI.info "Spork server for #{names} successfully #{action}ed", :reset => true
87
- Notifier.notify "#{names} successfully #{action}ed", :title => "Spork", :image => :success
86
+ Compat::UI.info "Spork server for #{names} successfully #{action}ed", :reset => true
87
+ Compat::UI.notify "#{names} successfully #{action}ed", :title => "Spork", :image => :success
88
88
  else
89
- UI.reset_line # workaround before Guard::UI update
90
- UI.error "Could not #{action} Spork server for #{names} after #{options[:wait]} seconds. I will continue waiting for a further #{options[:retry_delay]} seconds."
91
- Notifier.notify "#{names} NOT #{action}ed. Continuing to wait for #{options[:retry_delay]} seconds.", :title => "Spork", :image => :failed
89
+ Compat::UI.error "Could not #{action} Spork server for #{names} after #{options[:wait]} seconds. I will continue waiting for a further #{options[:retry_delay]} seconds."
90
+ Compat::UI.notify "#{names} NOT #{action}ed. Continuing to wait for #{options[:retry_delay]} seconds.", :title => "Spork", :image => :failed
92
91
  if wait_for_launch(instances, options[:retry_delay])
93
92
  total_time = Time.now - start_time
94
93
  UI.info "Spork server for #{names} eventually #{action}ed after #{total_time.to_i} seconds. Consider adjusting your :wait option beyond this time.", :reset => true
95
94
  Notifier.notify "#{names} eventually #{action}ed after #{total_time.to_i} seconds", :title => "Spork", :image => :success
96
95
  else
97
- UI.reset_line # workaround before Guard::UI update
98
- UI.error "Could not #{action} Spork server for #{names}. Make sure you can use it manually first."
99
- Notifier.notify "#{names} NOT #{action}ed", :title => "Spork", :image => :failed
96
+ Compat::UI.error "Could not #{action} Spork server for #{names}. Make sure you can use it manually first."
97
+ Compat::UI.notify "#{names} NOT #{action}ed", :title => "Spork", :image => :failed
100
98
  throw :task_has_failed
101
99
  end
102
100
  end
data/lib/guard/spork/spork_instance.rb CHANGED
@@ -30,7 +30,7 @@ module Guard
30
30
  def start
31
31
  executable, *cmd = command
32
32
 
33
- ::Guard::UI.debug "guard-spork command execution: #{cmd}"
33
+ Compat::UI.debug "guard-spork command execution: #{cmd}"
34
34
 
35
35
  @process = ChildProcess.build(executable, *cmd)
36
36
  @process.environment.merge!(env) unless env.empty?
data/lib/guard/spork/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Guard
2
2
  module SporkVersion
3
- VERSION = "2.0.2"
3
+ VERSION = "2.1.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: guard-spork
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thibaud Guillaume-Gentil
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-30 00:00:00.000000000 Z
11
+ date: 2014-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: guard
@@ -17,9 +17,6 @@ dependencies:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '2.0'
20
- - - <=
21
- - !ruby/object:Gem::Version
22
- version: 2.9.0
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,20 @@ dependencies:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
29
26
  version: '2.0'
30
- - - <=
27
+ - !ruby/object:Gem::Dependency
28
+ name: guard-compat
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: '1.0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
31
39
  - !ruby/object:Gem::Version
32
- version: 2.9.0
40
+ version: '1.0'
33
41
  - !ruby/object:Gem::Dependency
34
42
  name: spork
35
43
  requirement: !ruby/object:Gem::Requirement
@@ -76,30 +84,44 @@ dependencies:
76
84
  name: rspec
77
85
  requirement: !ruby/object:Gem::Requirement
78
86
  requirements:
79
- - - '='
87
+ - - ~>
88
+ - !ruby/object:Gem::Version
89
+ version: '3.1'
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: '3.1'
97
+ - !ruby/object:Gem::Dependency
98
+ name: transpec
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - '>='
80
102
  - !ruby/object:Gem::Version
81
- version: '2.10'
103
+ version: '0'
82
104
  type: :development
83
105
  prerelease: false
84
106
  version_requirements: !ruby/object:Gem::Requirement
85
107
  requirements:
86
- - - '='
108
+ - - '>='
87
109
  - !ruby/object:Gem::Version
88
- version: '2.10'
110
+ version: '0'
89
111
  - !ruby/object:Gem::Dependency
90
112
  name: guard-rspec
91
113
  requirement: !ruby/object:Gem::Requirement
92
114
  requirements:
93
115
  - - ~>
94
116
  - !ruby/object:Gem::Version
95
- version: '1.0'
117
+ version: '4.4'
96
118
  type: :development
97
119
  prerelease: false
98
120
  version_requirements: !ruby/object:Gem::Requirement
99
121
  requirements:
100
122
  - - ~>
101
123
  - !ruby/object:Gem::Version
102
- version: '1.0'
124
+ version: '4.4'
103
125
  - !ruby/object:Gem::Dependency
104
126
  name: pry
105
127
  requirement: !ruby/object:Gem::Requirement