nanoc 2.1 → 2.1.1

data/ChangeLog

@@ -1,6 +1,11 @@
 nanoc Release Notes
 ===================
 
+2.1.1
+-----
+
+* Fixed issue which would cause files not to be required in the right order
+
 2.1
 ---
 

data/lib/nanoc.rb

@@ -1,7 +1,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '2.1'
+  VERSION = '2.1.1'
 
   # Generic error. Superclass for all nanoc-specific errors.
   class Error < RuntimeError ; end
@@ -63,7 +63,7 @@ module Nanoc
   #          directory this file (nanoc.rb) is in. Can contain wildcards.
   def self.load(*path)
     full_path = [ File.dirname(__FILE__), 'nanoc' ] + path
-    Dir[File.join(full_path)].each { |f| require f }
+    Dir[File.join(full_path)].sort.each { |f| require f }
   end
 
 end

data/lib/nanoc/cli/commands/info.rb

@@ -52,7 +52,9 @@ module Nanoc::CLI
       # Find longest name
       max_length = plugins.values.map { |k| k.values }.flatten.map { |k| k.identifiers.join(', ').length }.max + 2
 
-      plugins.each_pair do |superclass, structured_plugins|
+      PLUGIN_CLASS_ORDER.each do |superclass|
+        structured_plugins = plugins[superclass]
+
         # Print kind
         kind = name_for_plugin_class(superclass)
         puts "#{kind}:"
@@ -88,11 +90,20 @@ module Nanoc::CLI
 
   private
 
+    PLUGIN_CLASS_ORDER = [
+      Nanoc::Filter,
+      Nanoc::BinaryFilter,
+      Nanoc::Router,
+      Nanoc::Extra::VCS,
+      Nanoc::DataSource
+    ]
+
     PLUGIN_CLASSES = {
-      Nanoc::Filter     => 'Filters',
-      Nanoc::DataSource => 'Data Sources',
-      Nanoc::Router     => 'Routers',
-      Nanoc::Extra::VCS => 'VCSes'
+      Nanoc::BinaryFilter => 'Binary Filters',
+      Nanoc::Filter       => 'Filters',
+      Nanoc::DataSource   => 'Data Sources',
+      Nanoc::Router       => 'Routers',
+      Nanoc::Extra::VCS   => 'VCSes'
     }
 
     def find_all_plugins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: "2.1"
+  version: 2.1.1
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 +02:00
+date: 2008-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: []