nanoc 2.1 → 2.1.1

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.
data/ChangeLog CHANGED
@@ -1,6 +1,11 @@
1
1
  nanoc Release Notes
2
2
  ===================
3
3
 
4
+ 2.1.1
5
+ -----
6
+
7
+ * Fixed issue which would cause files not to be required in the right order
8
+
4
9
  2.1
5
10
  ---
6
11
 
data/lib/nanoc.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Nanoc
2
2
 
3
3
  # The current nanoc version.
4
- VERSION = '2.1'
4
+ VERSION = '2.1.1'
5
5
 
6
6
  # Generic error. Superclass for all nanoc-specific errors.
7
7
  class Error < RuntimeError ; end
@@ -63,7 +63,7 @@ module Nanoc
63
63
  # directory this file (nanoc.rb) is in. Can contain wildcards.
64
64
  def self.load(*path)
65
65
  full_path = [ File.dirname(__FILE__), 'nanoc' ] + path
66
- Dir[File.join(full_path)].each { |f| require f }
66
+ Dir[File.join(full_path)].sort.each { |f| require f }
67
67
  end
68
68
 
69
69
  end
@@ -52,7 +52,9 @@ module Nanoc::CLI
52
52
  # Find longest name
53
53
  max_length = plugins.values.map { |k| k.values }.flatten.map { |k| k.identifiers.join(', ').length }.max + 2
54
54
 
55
- plugins.each_pair do |superclass, structured_plugins|
55
+ PLUGIN_CLASS_ORDER.each do |superclass|
56
+ structured_plugins = plugins[superclass]
57
+
56
58
  # Print kind
57
59
  kind = name_for_plugin_class(superclass)
58
60
  puts "#{kind}:"
@@ -88,11 +90,20 @@ module Nanoc::CLI
88
90
 
89
91
  private
90
92
 
93
+ PLUGIN_CLASS_ORDER = [
94
+ Nanoc::Filter,
95
+ Nanoc::BinaryFilter,
96
+ Nanoc::Router,
97
+ Nanoc::Extra::VCS,
98
+ Nanoc::DataSource
99
+ ]
100
+
91
101
  PLUGIN_CLASSES = {
92
- Nanoc::Filter => 'Filters',
93
- Nanoc::DataSource => 'Data Sources',
94
- Nanoc::Router => 'Routers',
95
- Nanoc::Extra::VCS => 'VCSes'
102
+ Nanoc::BinaryFilter => 'Binary Filters',
103
+ Nanoc::Filter => 'Filters',
104
+ Nanoc::DataSource => 'Data Sources',
105
+ Nanoc::Router => 'Routers',
106
+ Nanoc::Extra::VCS => 'VCSes'
96
107
  }
97
108
 
98
109
  def find_all_plugins
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nanoc
3
3
  version: !ruby/object:Gem::Version
4
- version: "2.1"
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-08-17 00:00:00 +02:00
12
+ date: 2008-08-18 00:00:00 +02:00
13
13
  default_executable:
14
14
  dependencies: []
15
15