marv 0.7.2 → 0.8.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 209e4109aa6fc946ab1fd735f344b63ed9b066667d9ab8874f36dc7a2b80eaf5
4
- data.tar.gz: 00d538ced0256b14674dda07cf179ed700c76ffd9341a64ba3b130784fdf0364
3
+ metadata.gz: f688391a518904f1daddeaa4c3ee8e1ea002b7cb4b7c46c972b673c85bddfaf1
4
+ data.tar.gz: 37087265e8e33181260038170e10e05f36cc11a596d738e27c2a556f99eb408d
5
5
  SHA512:
6
- metadata.gz: 408c437bad71f061a6fdc68cf46a002259bcf3acab84e2c00f0db94d2895466fdbeed5f3cd77b5328ad71bf0ac4f63dfae59f8725d86e381142e17c5cf3b71ad
7
- data.tar.gz: 8dac33f09a0d74133e5e49541fb208d823c3dd085c3196ff1ebe2a13e273a175ec0affa200446a97cf3483f9fbe7c464f1291965caeaa41e8ade6d62d8dfd16d
6
+ metadata.gz: 46857004306117b311d80d4082a250f3c70439f999bedcd196b67be932a0241d96e25a9a46b32f07b1a7cf2abec610c8d6961b75c710ff62e2e07a15644ddc5e
7
+ data.tar.gz: 8e7113d994369a9f0c98a9c53dc64065718b4f580f7024c4c04cc1ce03fc426a3ed5b8450658410faf38750211ce8dd770ea52de87f60fbcb60e9bb5386d98bb
data/Gemfile.lock CHANGED
@@ -1,15 +1,15 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- marv (0.7.0)
5
- autoprefixer-rails (~> 9.3)
4
+ marv (0.8.1)
5
+ autoprefixer-rails (~> 10.4)
6
6
  childprocess (~> 0.5)
7
7
  coffee-script (~> 2.3)
8
8
  guard (~> 2.8, < 2.9)
9
9
  guard-livereload (~> 2.4)
10
10
  less (~> 2.6)
11
- mini_racer (~> 0.2)
12
11
  mysql2 (~> 0.3)
12
+ pry (>= 0.13)
13
13
  rubyzip (~> 1.1)
14
14
  sass (~> 3.4)
15
15
  sprockets (~> 3.7)
@@ -20,27 +20,27 @@ PATH
20
20
  GEM
21
21
  remote: https://rubygems.org/
22
22
  specs:
23
- autoprefixer-rails (9.3.1)
24
- execjs
23
+ autoprefixer-rails (10.4.2.0)
24
+ execjs (~> 2)
25
25
  celluloid (0.16.0)
26
26
  timers (~> 4.0.0)
27
27
  childprocess (0.9.0)
28
28
  ffi (~> 1.0, >= 1.0.11)
29
- coderay (1.1.2)
29
+ coderay (1.1.3)
30
30
  coffee-script (2.4.1)
31
31
  coffee-script-source
32
32
  execjs
33
33
  coffee-script-source (1.12.2)
34
34
  commonjs (0.2.7)
35
- concurrent-ruby (1.1.3)
36
- diff-lcs (1.3)
37
- em-websocket (0.5.1)
35
+ concurrent-ruby (1.1.10)
36
+ diff-lcs (1.5.0)
37
+ em-websocket (0.5.3)
38
38
  eventmachine (>= 0.12.9)
39
- http_parser.rb (~> 0.6.0)
39
+ http_parser.rb (~> 0)
40
40
  eventmachine (1.2.7)
41
- execjs (2.7.0)
42
- ffi (1.9.25)
43
- formatador (0.2.5)
41
+ execjs (2.8.1)
42
+ ffi (1.15.5)
43
+ formatador (1.1.0)
44
44
  guard (2.8.2)
45
45
  formatador (>= 0.2.4)
46
46
  listen (~> 2.7)
@@ -53,44 +53,41 @@ GEM
53
53
  guard (~> 2.8)
54
54
  guard-compat (~> 1.0)
55
55
  multi_json (~> 1.8)
56
- hitimes (1.3.0)
57
- http_parser.rb (0.6.0)
56
+ hitimes (2.0.0)
57
+ http_parser.rb (0.8.0)
58
58
  less (2.6.0)
59
59
  commonjs (~> 0.2.7)
60
- libv8 (6.7.288.46.1-x86_64-linux)
61
60
  listen (2.10.1)
62
61
  celluloid (~> 0.16.0)
63
62
  rb-fsevent (>= 0.9.3)
64
63
  rb-inotify (>= 0.9)
65
- lumberjack (1.0.13)
66
- method_source (0.9.2)
67
- mini_racer (0.2.4)
68
- libv8 (>= 6.3)
69
- multi_json (1.13.1)
70
- mysql2 (0.5.2)
71
- pry (0.12.2)
72
- coderay (~> 1.1.0)
73
- method_source (~> 0.9.0)
74
- rack (2.0.6)
75
- rake (12.3.1)
76
- rb-fsevent (0.10.3)
77
- rb-inotify (0.9.10)
78
- ffi (>= 0.5.0, < 2)
79
- rspec (3.8.0)
80
- rspec-core (~> 3.8.0)
81
- rspec-expectations (~> 3.8.0)
82
- rspec-mocks (~> 3.8.0)
83
- rspec-core (3.8.0)
84
- rspec-support (~> 3.8.0)
85
- rspec-expectations (3.8.2)
64
+ lumberjack (1.2.8)
65
+ method_source (1.0.0)
66
+ multi_json (1.15.0)
67
+ mysql2 (0.5.3)
68
+ pry (0.14.1)
69
+ coderay (~> 1.1)
70
+ method_source (~> 1.0)
71
+ rack (2.2.3)
72
+ rake (13.0.6)
73
+ rb-fsevent (0.11.1)
74
+ rb-inotify (0.10.1)
75
+ ffi (~> 1.0)
76
+ rspec (3.11.0)
77
+ rspec-core (~> 3.11.0)
78
+ rspec-expectations (~> 3.11.0)
79
+ rspec-mocks (~> 3.11.0)
80
+ rspec-core (3.11.0)
81
+ rspec-support (~> 3.11.0)
82
+ rspec-expectations (3.11.0)
86
83
  diff-lcs (>= 1.2.0, < 2.0)
87
- rspec-support (~> 3.8.0)
88
- rspec-mocks (3.8.0)
84
+ rspec-support (~> 3.11.0)
85
+ rspec-mocks (3.11.1)
89
86
  diff-lcs (>= 1.2.0, < 2.0)
90
- rspec-support (~> 3.8.0)
91
- rspec-support (3.8.0)
92
- rubyzip (1.2.2)
93
- sass (3.7.2)
87
+ rspec-support (~> 3.11.0)
88
+ rspec-support (3.11.0)
89
+ rubyzip (1.3.0)
90
+ sass (3.7.4)
94
91
  sass-listen (~> 4.0.0)
95
92
  sass-listen (4.0.0)
96
93
  rb-fsevent (~> 0.9, >= 0.9.4)
@@ -102,17 +99,17 @@ GEM
102
99
  tilt (1.4.1)
103
100
  timers (4.0.4)
104
101
  hitimes
105
- uglifier (4.1.20)
102
+ uglifier (4.2.0)
106
103
  execjs (>= 0.3.0, < 3)
107
104
 
108
105
  PLATFORMS
109
106
  ruby
110
107
 
111
108
  DEPENDENCIES
112
- bundler (~> 1.15)
109
+ bundler (~> 2.0)
113
110
  marv!
114
- rake (~> 12.3)
115
- rspec (~> 3.0)
111
+ rake (~> 13.0)
112
+ rspec (~> 3.11)
116
113
 
117
114
  BUNDLED WITH
118
- 1.17.1
115
+ 2.1.4
@@ -82,6 +82,11 @@ module Marv
82
82
 
83
83
  # Init sprockets
84
84
  def init_sprockets
85
+ if ExecJS::Runtimes.runtimes.none?(&:available?)
86
+ @task.say_error "No execjs runtime found! Aborting..."
87
+ abort
88
+ end
89
+
85
90
  @sprockets = ::Sprockets::Environment.new
86
91
  autoprefixer = @config[:autoprefixer]
87
92
 
@@ -108,7 +113,14 @@ module Marv
108
113
  end
109
114
 
110
115
  unless autoprefixer == false
111
- AutoprefixerRails.install(@sprockets, Hash(autoprefixer))
116
+ runtimes = AutoprefixerRails::Processor::SUPPORTED_RUNTIMES
117
+
118
+ if runtimes.any?(&:available?)
119
+ AutoprefixerRails.install(@sprockets, Hash(autoprefixer))
120
+ else
121
+ names = runtimes.map(&:name).join(', ')
122
+ @task.say_warning "Autoprefixer disabled: no supported runtime found [ #{names} ]"
123
+ end
112
124
  end
113
125
  end
114
126
 
@@ -1,11 +1,42 @@
1
+ require 'guard/jobs/base'
2
+
1
3
  module Guard
2
4
  module Jobs
3
5
  class PryWrapper < Base
4
6
 
7
+ def _setup(options)
8
+ Pry.config.should_load_rc = false
9
+ Pry.config.should_load_local_rc = false
10
+ history_file_path = options[:history_file] || HISTORY_FILE
11
+
12
+ if legacy_pry?
13
+ Pry.config.history.file = File.expand_path(history_file_path)
14
+ else
15
+ Pry.config.history_file = File.expand_path(history_file_path)
16
+ end
17
+
18
+ _add_hooks(options)
19
+
20
+ ::Guard::Commands::All.import
21
+ ::Guard::Commands::Change.import
22
+ ::Guard::Commands::Notification.import
23
+ ::Guard::Commands::Pause.import
24
+ ::Guard::Commands::Reload.import
25
+ ::Guard::Commands::Show.import
26
+ ::Guard::Commands::Scope.import
27
+
28
+ _setup_commands
29
+ _configure_prompt
30
+ end
31
+
5
32
  private
6
33
 
7
34
  attr_reader :thread
8
35
 
36
+ def legacy_pry?
37
+ Gem::Version.new(Pry::VERSION) < Gem::Version.new('0.13')
38
+ end
39
+
9
40
  # Colorizes message using Thor Color Util
10
41
  #
11
42
  def _colorize(text, color)
@@ -16,7 +47,22 @@ module Guard
16
47
  # `pry`.
17
48
  #
18
49
  def _configure_prompt
19
- Pry.config.prompt = [_prompt(_colorize("\u00BB", :green)), _prompt(_colorize("*", :yellow))]
50
+ prompt_procs = [
51
+ _prompt(_colorize("\u00BB", :green)),
52
+ _prompt(_colorize("*", :yellow))
53
+ ]
54
+
55
+ if legacy_pry?
56
+ Pry.config.prompt = prompt_procs
57
+ else
58
+ prompt_args = [:marv, 'Marv prompt for guard watcher', prompt_procs]
59
+
60
+ Pry::Prompt.add(*prompt_args) do |context, nesting, pry_instance, sep|
61
+ sep.call(context, nesting, pry_instance)
62
+ end
63
+
64
+ Pry.config.prompt = Pry::Prompt[:marv]
65
+ end
20
66
  end
21
67
 
22
68
  # Returns a proc that will return itself a string ending with the given
@@ -30,7 +76,7 @@ module Guard
30
76
  hist_text = _colorize("[#{history}]", :yellow)
31
77
  clip_text = _colorize("(#{_clip_name(target_self)})", :cyan)
32
78
  level_text = _colorize("#{level}", :cyan)
33
- path_text = _colorize(Dir.pwd.sub(Dir.home, '~'), :magenta)
79
+ path_text = _colorize(File.basename(Dir.pwd), :magenta)
34
80
 
35
81
  "#{hist_text} #{_scope_for_prompt}#{process} #{path_text} #{clip_text}#{level_text} #{ending_char} "
36
82
  end
data/lib/marv/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Marv
2
- VERSION = "0.7.2"
2
+ VERSION = "0.8.2"
3
3
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marv
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2
4
+ version: 0.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonian Guveli
8
8
  - Olibia Tsati
9
- autorequire:
9
+ autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2018-12-19 00:00:00.000000000 Z
12
+ date: 2022-04-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: guard
@@ -157,20 +157,6 @@ dependencies:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: '2.3'
160
- - !ruby/object:Gem::Dependency
161
- name: mini_racer
162
- requirement: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - "~>"
165
- - !ruby/object:Gem::Version
166
- version: '0.2'
167
- type: :runtime
168
- prerelease: false
169
- version_requirements: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - "~>"
172
- - !ruby/object:Gem::Version
173
- version: '0.2'
174
160
  - !ruby/object:Gem::Dependency
175
161
  name: rubyzip
176
162
  requirement: !ruby/object:Gem::Requirement
@@ -191,14 +177,14 @@ dependencies:
191
177
  requirements:
192
178
  - - "~>"
193
179
  - !ruby/object:Gem::Version
194
- version: '9.3'
180
+ version: '10.4'
195
181
  type: :runtime
196
182
  prerelease: false
197
183
  version_requirements: !ruby/object:Gem::Requirement
198
184
  requirements:
199
185
  - - "~>"
200
186
  - !ruby/object:Gem::Version
201
- version: '9.3'
187
+ version: '10.4'
202
188
  - !ruby/object:Gem::Dependency
203
189
  name: tilt
204
190
  requirement: !ruby/object:Gem::Requirement
@@ -219,48 +205,62 @@ dependencies:
219
205
  - - "~>"
220
206
  - !ruby/object:Gem::Version
221
207
  version: '1.1'
208
+ - !ruby/object:Gem::Dependency
209
+ name: pry
210
+ requirement: !ruby/object:Gem::Requirement
211
+ requirements:
212
+ - - ">="
213
+ - !ruby/object:Gem::Version
214
+ version: '0.13'
215
+ type: :runtime
216
+ prerelease: false
217
+ version_requirements: !ruby/object:Gem::Requirement
218
+ requirements:
219
+ - - ">="
220
+ - !ruby/object:Gem::Version
221
+ version: '0.13'
222
222
  - !ruby/object:Gem::Dependency
223
223
  name: bundler
224
224
  requirement: !ruby/object:Gem::Requirement
225
225
  requirements:
226
226
  - - "~>"
227
227
  - !ruby/object:Gem::Version
228
- version: '1.15'
228
+ version: '2.0'
229
229
  type: :development
230
230
  prerelease: false
231
231
  version_requirements: !ruby/object:Gem::Requirement
232
232
  requirements:
233
233
  - - "~>"
234
234
  - !ruby/object:Gem::Version
235
- version: '1.15'
235
+ version: '2.0'
236
236
  - !ruby/object:Gem::Dependency
237
237
  name: rake
238
238
  requirement: !ruby/object:Gem::Requirement
239
239
  requirements:
240
240
  - - "~>"
241
241
  - !ruby/object:Gem::Version
242
- version: '12.3'
242
+ version: '13.0'
243
243
  type: :development
244
244
  prerelease: false
245
245
  version_requirements: !ruby/object:Gem::Requirement
246
246
  requirements:
247
247
  - - "~>"
248
248
  - !ruby/object:Gem::Version
249
- version: '12.3'
249
+ version: '13.0'
250
250
  - !ruby/object:Gem::Dependency
251
251
  name: rspec
252
252
  requirement: !ruby/object:Gem::Requirement
253
253
  requirements:
254
254
  - - "~>"
255
255
  - !ruby/object:Gem::Version
256
- version: '3.0'
256
+ version: '3.11'
257
257
  type: :development
258
258
  prerelease: false
259
259
  version_requirements: !ruby/object:Gem::Requirement
260
260
  requirements:
261
261
  - - "~>"
262
262
  - !ruby/object:Gem::Version
263
- version: '3.0'
263
+ version: '3.11'
264
264
  description: A toolkit for bootstrapping and developing WordPress themes and plugins
265
265
  using Sass, LESS, and CoffeeScript.
266
266
  email:
@@ -347,7 +347,7 @@ homepage: https://hardpixel.github.io/marv
347
347
  licenses:
348
348
  - MIT
349
349
  metadata: {}
350
- post_install_message:
350
+ post_install_message:
351
351
  rdoc_options: []
352
352
  require_paths:
353
353
  - lib
@@ -362,9 +362,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
362
362
  - !ruby/object:Gem::Version
363
363
  version: '0'
364
364
  requirements: []
365
- rubyforge_project:
366
- rubygems_version: 2.7.7
367
- signing_key:
365
+ rubygems_version: 3.1.6
366
+ signing_key:
368
367
  specification_version: 4
369
368
  summary: Toolkit for developing WordPress themes and plugins
370
369
  test_files: []