nanoc-cli 4.11.20 → 4.12.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f23854c65a6a1b97f3afe107c6562da6829ac8eb3ac5689269683640cc20eb5a
4
- data.tar.gz: 5cb6a6f88f6f35284c1f4787aa76992bcf4a1d9d0c562805a2e24cfef71630a7
3
+ metadata.gz: 9d5a799c008340791d94c5e37eb15d38f6ed571a13fd9e341e8ac8fc47ba2d76
4
+ data.tar.gz: ce4f61ba1095823cd9f9257ad73842055abb3e908745fc8840fe983f463081bc
5
5
  SHA512:
6
- metadata.gz: '04876783fe378736b298e89aa88e7f41ca2f39465a1b46908789e0bb1e77d8f1a59ae9675c04d5fa51562f7ab6fa71c3435fac6fc0b26335280695abad983a5d'
7
- data.tar.gz: 38e11e3d7cd2753b503e2bc09c8c5b68011fcf65217d43b2a5a4abb25ab64c57beeb51c226af3357b298462358b272e42f6c189c668df32ac76fbf06c6dc29dd
6
+ metadata.gz: 2bd59730dd8d63734eb850c31eacbba8d49bbba0f1f4c78b7b3ff987003c45d492529d5620695d08f33cb856bcd5decedc50042027e6933aa878e9561a27c6b7
7
+ data.tar.gz: 6f2f6a7253fa17e608d82e90f12a257c494bb3d7445bb87daa3633baf659f53704cc944606bb085d394bdde317211a55b1b8c1f69bc386d9c188772110cdf971
@@ -8,9 +8,7 @@ EOS
8
8
  no_params
9
9
 
10
10
  flag nil, :diff, 'generate diff'
11
- if Nanoc::Core::Feature.enabled?(Nanoc::Core::Feature::LIVE_CMD)
12
- flag :w, :watch, 'watch for changes and recompile when needed'
13
- end
11
+ flag :W, :watch, 'watch for changes and recompile when needed'
14
12
 
15
13
  module Nanoc::CLI::Commands
16
14
  class Compile < ::Nanoc::CLI::CommandRunner
@@ -114,15 +114,9 @@ module Nanoc::CLI
114
114
  stream.puts
115
115
  stream.puts 'Captain! We’ve been hit!'
116
116
 
117
- if forwards_stack_trace?
118
- write_stack_trace(stream, error)
119
- write_error_message(stream, error)
120
- write_item_rep(stream, error)
121
- else
122
- write_error_message(stream, error)
123
- write_item_rep(stream, error)
124
- write_stack_trace(stream, error)
125
- end
117
+ write_error_message(stream, error)
118
+ write_item_rep(stream, error)
119
+ write_stack_trace(stream, error)
126
120
 
127
121
  stream.puts
128
122
  stream.puts 'A detailed crash log has been written to ./crash.log.'
@@ -148,11 +142,6 @@ module Nanoc::CLI
148
142
  write_load_paths(stream, verbose: true)
149
143
  end
150
144
 
151
- # @api private
152
- def forwards_stack_trace?
153
- ruby_version.start_with?('2.5')
154
- end
155
-
156
145
  # @api private
157
146
  def trivial?(error)
158
147
  case error
@@ -316,7 +305,7 @@ module Nanoc::CLI
316
305
  def write_stack_trace(stream, error, verbose: false)
317
306
  write_section_header(stream, 'Stack trace', verbose: verbose)
318
307
 
319
- writer = Nanoc::CLI::StackTraceWriter.new(stream, forwards: forwards_stack_trace?)
308
+ writer = Nanoc::CLI::StackTraceWriter.new(stream)
320
309
  writer.write(unwrap_error(error), verbose: verbose)
321
310
  end
322
311
 
@@ -3,22 +3,11 @@
3
3
  module Nanoc
4
4
  module CLI
5
5
  class StackTraceWriter
6
- def initialize(stream, forwards:)
6
+ def initialize(stream)
7
7
  @stream = stream
8
- @forwards = forwards
9
8
  end
10
9
 
11
10
  def write(error, verbose:)
12
- if @forwards
13
- write_forwards(error, verbose: verbose)
14
- else
15
- write_backwards(error, verbose: verbose)
16
- end
17
- end
18
-
19
- private
20
-
21
- def write_backwards(error, verbose:)
22
11
  count = verbose ? -1 : 10
23
12
 
24
13
  error.backtrace[0...count].each_with_index do |item, index|
@@ -29,23 +18,6 @@ module Nanoc
29
18
  @stream.puts " ... #{error.backtrace.size - count} lines omitted (see crash.log for details)"
30
19
  end
31
20
  end
32
-
33
- def write_forwards(error, verbose:)
34
- count = 10
35
- backtrace = verbose ? error.backtrace : error.backtrace.take(count)
36
-
37
- if !verbose && error.backtrace.size > count
38
- @stream.puts " ... #{error.backtrace.size - count} lines omitted (see crash.log for details)"
39
- end
40
-
41
- backtrace.each_with_index.to_a.reverse_each do |(item, index)|
42
- if index.zero?
43
- @stream.puts " #{item}"
44
- else
45
- @stream.puts " #{index}. from #{item}"
46
- end
47
- end
48
- end
49
21
  end
50
22
  end
51
23
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Nanoc
4
4
  module CLI
5
- VERSION = '4.11.20'
5
+ VERSION = '4.12.1'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nanoc-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.11.20
4
+ version: 4.12.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denis Defreyne
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-18 00:00:00.000000000 Z
11
+ date: 2021-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cri
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 4.11.20
47
+ version: 4.12.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 4.11.20
54
+ version: 4.12.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: zeitwerk
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -105,23 +105,23 @@ homepage: https://nanoc.ws/
105
105
  licenses:
106
106
  - MIT
107
107
  metadata: {}
108
- post_install_message:
108
+ post_install_message:
109
109
  rdoc_options: []
110
110
  require_paths:
111
111
  - lib
112
112
  required_ruby_version: !ruby/object:Gem::Requirement
113
113
  requirements:
114
- - - "~>"
114
+ - - ">="
115
115
  - !ruby/object:Gem::Version
116
- version: '2.4'
116
+ version: '2.5'
117
117
  required_rubygems_version: !ruby/object:Gem::Requirement
118
118
  requirements:
119
119
  - - ">="
120
120
  - !ruby/object:Gem::Version
121
121
  version: '0'
122
122
  requirements: []
123
- rubygems_version: 3.2.2
124
- signing_key:
123
+ rubygems_version: 3.2.15
124
+ signing_key:
125
125
  specification_version: 4
126
126
  summary: CLI for Nanoc
127
127
  test_files: []