nanoc 2.1.6 → 2.2

data/lib/nanoc/base/layout.rb

@@ -55,11 +55,7 @@ module Nanoc
 
     # Returns the filter class needed for this layout.
     def filter_class
-      if attribute_named(:extension).nil?
-        Nanoc::Filter.named(attribute_named(:filter))
-      else
-        Nanoc::Filter.with_extension(attribute_named(:extension))
-      end
+      Nanoc::Filter.named(attribute_named(:filter))
     end
 
     # Saves the layout in the database, creating it if it doesn't exist yet or

data/lib/nanoc/base/page_rep.rb

@@ -290,7 +290,7 @@ module Nanoc
       # Create filter
       klass = layout.filter_class
       raise Nanoc::Errors::CannotDetermineFilterError.new(layout.path) if klass.nil?
-      filter = klass.new(self)
+      filter = klass.new(self, :layout => layout.to_proxy)
 
       # Layout
       Nanoc::NotificationCenter.post(:filtering_started, self, klass.identifier)

data/lib/nanoc/base/proxies.rb

@@ -0,0 +1,5 @@
+require 'nanoc/base/proxies/asset_proxy'
+require 'nanoc/base/proxies/asset_rep_proxy'
+require 'nanoc/base/proxies/layout_proxy'
+require 'nanoc/base/proxies/page_proxy'
+require 'nanoc/base/proxies/page_rep_proxy'

data/lib/nanoc/base/site.rb

@@ -262,8 +262,10 @@ module Nanoc
     # Raises a warning about an outdated data source method.
     def warn_data_source(class_name, method_name, is_array)
       warn(
-        "In nanoc 2.1, DataSource##{method_name} should return #{is_array ? 'an array of' : 'a' } Nanoc::#{class_name} object#{is_array ? 's' : ''}. Future versions will not support these outdated data sources.",
-        'DEPRECATION WARNING'
+        "DEPRECATION WARNING: In nanoc 2.1, DataSource##{method_name} " +
+        "should return #{is_array ? 'an array of' : 'a' } " +
+        "Nanoc::#{class_name} object#{is_array ? 's' : ''}. Future " +
+        "versions will not support these outdated data sources."
       )
     end
 

data/lib/nanoc/binary_filters.rb

@@ -0,0 +1 @@
+require 'nanoc/binary_filters/image_science_thumbnail'

data/lib/nanoc/cli.rb

@@ -1 +1,9 @@
-Nanoc.load('cli', '*.rb')
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../../vendor/cri/lib'))
+require 'cri'
+
+module Nanoc::CLI # :nodoc:
+end
+
+require 'nanoc/cli/base'
+require 'nanoc/cli/commands'
+require 'nanoc/cli/logger'

data/lib/nanoc/cli/base.rb

@@ -2,118 +2,28 @@ module Nanoc::CLI
 
   # Nanoc::CLI::Base is the central class representing a commandline nanoc
   # tool. It has a list of commands, and is linked to a specific nanoc site.
-  class Base
+  class Base < Cri::Base
 
     attr_reader :commands, :site
 
     # Creates a new instance of the commandline nanoc tool.
     def initialize
-      create_commands
-    end
-
-    # Parses the given commandline arguments and executes the requested
-    # command.
-    def run(args)
-      # Check arguments
-      if args.length == 0
-        @help_command.run([], [])
-        exit 1
-      end
-
-      # Find version or help options
-      if args.length == 1
-        # Parse arguments
-        begin
-          parsed_arguments = Nanoc::CLI::OptionParser.parse(args[0..1], global_option_definitions)
-        rescue Nanoc::CLI::OptionParser::IllegalOptionError => e
-          $stderr.puts "illegal option -- #{e}"
-          exit 1
-        end
-
-        # Handle version option
-        if parsed_arguments[:options].has_key?(:version)
-          puts "nanoc #{Nanoc::VERSION} (c) 2007-2009 Denis Defreyne."
-          puts "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) running on #{RUBY_PLATFORM}"
-          exit 1
-        # Handle help option
-        elsif parsed_arguments[:options].has_key?(:help)
-          show_help
-          exit 1
-        end
-      end
-
-      # Find command
-      command = command_named(args[0])
-
-      # Get extended option definitions (with help)
-      extended_option_definitions = command.option_definitions + [
-        # --help
-        {
-          :long => 'help', :short => 'h', :argument => :forbidden,
-          :desc => 'show this help message and quit'
-        },
-        # --verbose
-        {
-          :long => 'verbose', :short => 'V', :argument => :forbidden,
-          :desc => 'enable more detailed output'
-        }
-      ]
-
-      # Parse arguments
-      begin
-        parsed_arguments = Nanoc::CLI::OptionParser.parse(args[1..-1], extended_option_definitions)
-      rescue Nanoc::CLI::OptionParser::IllegalOptionError => e
-        $stderr.puts "illegal option -- #{e}"
-        exit 1
-      rescue Nanoc::CLI::OptionParser::OptionRequiresAnArgumentError => e
-        $stderr.puts "option requires an argument -- #{e}"
-        exit 1
-      end
-
-      # Check help option
-      if parsed_arguments[:options].has_key?(:help)
-        show_help(command)
-        exit 1
-      end
-
-      # Check verbose option
-      if parsed_arguments[:options].has_key?(:verbose)
-        Nanoc::CLI::Logger.instance.level = :low
-      end
-
-      # Find and run command
-      command.run(parsed_arguments[:options], parsed_arguments[:arguments])
-    end
-
-    # Returns the command with the given name.
-    def command_named(name)
-      # Find by exact name or alias
-      command = @commands.find { |c| c.name == name or c.aliases.include?(name) }
-      return command unless command.nil?
-
-      # Find by approximation
-      commands = @commands.select { |c| c.name[0, name.length] == name }
-      if commands.length > 1
-        $stderr.puts "nanoc: '#{name}' is ambiguous:"
-        $stderr.puts "  #{commands.map { |c| c.name }.join(' ') }"
-        exit 1
-      elsif commands.length == 0
-        $stderr.puts "nanoc: unknown command '#{name}'\n"
-        show_help
-        exit 1
-      else
-        return commands[0]
-      end
-    end
-
-    # Shows the help text for the given command, or shows the general help
-    # text if no command is given.
-    def show_help(command=nil)
-      if command.nil?
-        @help_command.run([], [])
-      else
-        @help_command.run([], [ command.name ])
-      end
+      super('nanoc')
+
+      # Add help command
+      self.help_command = Nanoc::CLI::HelpCommand.new
+      add_command(self.help_command)
+
+      # Add other commands
+      add_command(Nanoc::CLI::AutocompileCommand.new)
+      add_command(Nanoc::CLI::CompileCommand.new)
+      add_command(Nanoc::CLI::CreateLayoutCommand.new)
+      add_command(Nanoc::CLI::CreatePageCommand.new)
+      add_command(Nanoc::CLI::CreateSiteCommand.new)
+      add_command(Nanoc::CLI::CreateTemplateCommand.new)
+      add_command(Nanoc::CLI::InfoCommand.new)
+      add_command(Nanoc::CLI::SwitchCommand.new)
+      add_command(Nanoc::CLI::UpdateCommand.new)
     end
 
     # Helper function which can be called when a command is executed that
@@ -183,6 +93,14 @@ module Nanoc::CLI
           :long => 'help', :short => 'h', :argument => :forbidden,
           :desc => 'show this help message and quit'
         },
+        {
+          :long => 'no-color', :short => 'C', :argument => :forbidden,
+          :desc => 'disable color'
+        },
+        {
+          :long => 'verbose', :short => 'V', :argument => :forbidden,
+          :desc => 'make nanoc output more detailed'
+        },
         {
           :long => 'version', :short => 'v', :argument => :forbidden,
           :desc => 'show version information and quit'
@@ -190,29 +108,23 @@ module Nanoc::CLI
       ]
     end
 
-  protected
-
-    def create_commands
-      @commands = []
-
-      # Find all command classes
-      command_classes = []
-      ObjectSpace.each_object(Class) do |klass|
-        command_classes << klass if klass < Nanoc::CLI::Command
-      end
-
-      # Create commands
-      command_classes.each do |klass|
-        if klass.to_s == 'Nanoc::CLI::HelpCommand'
-          @help_command = HelpCommand.new
-          @commands << @help_command
-        else
-          @commands << klass.new
-        end
+    def handle_option(option)
+      # Handle no-color option
+      if option == :'no-color'
+        Nanoc::CLI::Logger.instance.color = false
+      # Handle verbose option
+      elsif option == :verbose
+        Nanoc::CLI::Logger.instance.level = :low
+      # Handle version option
+      elsif option == :version
+        puts "nanoc #{Nanoc::VERSION} (c) 2007-2009 Denis Defreyne."
+        puts "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) running on #{RUBY_PLATFORM}"
+        exit 0
+      # Handle help option
+      elsif option == :help
+        show_help
+        exit 0
       end
-
-      # Set base
-      @commands.each { |c| c.base = self }
     end
 
   end

data/lib/nanoc/cli/commands.rb

@@ -0,0 +1,10 @@
+require 'nanoc/cli/commands/autocompile'
+require 'nanoc/cli/commands/compile'
+require 'nanoc/cli/commands/create_layout'
+require 'nanoc/cli/commands/create_page'
+require 'nanoc/cli/commands/create_site'
+require 'nanoc/cli/commands/create_template'
+require 'nanoc/cli/commands/help'
+require 'nanoc/cli/commands/info'
+require 'nanoc/cli/commands/switch'
+require 'nanoc/cli/commands/update'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class AutocompileCommand < Command # :nodoc:
+  class AutocompileCommand < Cri::Command # :nodoc:
 
     def name
       'autocompile'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class CompileCommand < Command # :nodoc:
+  class CompileCommand < Cri::Command # :nodoc:
 
     def name
       'compile'
@@ -31,7 +31,22 @@ module Nanoc::CLI
         {
           :long => 'all', :short => 'a', :argument => :forbidden,
           :desc => 'compile all pages and assets, even those that aren\'t outdated'
-        }
+        },
+        # --pages
+        {
+          :long => 'pages', :short => 'P', :argument => :forbidden,
+          :desc => 'only compile pages (no assets)'
+        },
+        # --assets
+        {
+          :long => 'assets', :short => 'A', :argument => :forbidden,
+          :desc => 'only compile assets (no pages)'
+        },
+        # --only-outdated
+        {
+          :long => 'only-outdated', :short => 'o', :argument => :forbidden,
+          :desc => 'only compile outdated pages and assets'
+        },
       ]
     end
 
@@ -41,7 +56,14 @@ module Nanoc::CLI
 
       # Find object with given path
       if arguments.size == 0
-        objs = nil
+        # Find all pages and/or assets
+        if options.has_key?(:pages)
+          objs = @base.site.pages
+        elsif options.has_key?(:assets)
+          objs = @base.site.assets
+        else
+          objs = nil
+        end
       else
         objs = arguments.map do |path|
           # Find object
@@ -70,10 +92,18 @@ module Nanoc::CLI
         @times_stack  ||= []
         setup_notifications
 
+        # Parse all/only-outdated options
+        if options.has_key?(:all)
+          warn "WARNING: The --all option is no longer necessary as nanoc " +
+               "2.2 compiles all pages and assets by default. To change this " +
+               "behaviour, use the --only-outdated option."
+        end
+        compile_all = options.has_key?(:'only-outdated') ? false : true
+
         # Compile
         @base.site.compiler.run(
           objs,
-          :even_when_not_outdated => options.has_key?(:all)
+          :even_when_not_outdated => compile_all
         )
 
         # Find reps
@@ -87,6 +117,12 @@ module Nanoc::CLI
           Nanoc::CLI::Logger.instance.file(:low, :skip, rep.disk_path, duration)
         end
 
+        # Show non-written reps
+        reps.select { |r| r.compiled? && r.attribute_named(:skip_output) }.each do |rep|
+          duration = @rep_times[rep.disk_path]
+          Nanoc::CLI::Logger.instance.file(:low, :'not written', rep.disk_path, duration)
+        end
+
         # Give general feedback
         puts
         puts "No objects were modified." unless reps.any? { |r| r.modified? }
@@ -122,18 +158,20 @@ module Nanoc::CLI
 
     def print_state_feedback(reps)
       # Categorise reps
-      rest            = reps
-      created, rest   = *rest.partition { |r| r.created? }
-      modified, rest  = *rest.partition { |r| r.modified? }
-      skipped, rest   = *rest.partition { |r| !r.compiled? }
-      identical       = rest
+      rest              = reps
+      created,     rest = *rest.partition { |r| r.created? }
+      modified,    rest = *rest.partition { |r| r.modified? }
+      skipped,     rest = *rest.partition { |r| !r.compiled? }
+      not_written, rest = *rest.partition { |r| r.compiled? && r.attribute_named(:skip_output) }
+      identical         = rest
 
       # Print
       puts
-      puts format('  %4d  created',   created.size)
-      puts format('  %4d  modified',  modified.size)
-      puts format('  %4d  skipped',   skipped.size)
-      puts format('  %4d  identical', identical.size)
+      puts format('  %4d  created',     created.size)
+      puts format('  %4d  modified',    modified.size)
+      puts format('  %4d  skipped',     skipped.size)
+      puts format('  %4d  not written', not_written.size)
+      puts format('  %4d  identical',   identical.size)
     end
 
     def print_profiling_feedback(reps)

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class CreateLayoutCommand < Command # :nodoc:
+  class CreateLayoutCommand < Cri::Command # :nodoc:
 
     def name
       'create_layout'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class CreatePageCommand < Command # :nodoc:
+  class CreatePageCommand < Cri::Command # :nodoc:
 
     def name
       'create_page'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class CreateSiteCommand < Command # :nodoc:
+  class CreateSiteCommand < Cri::Command # :nodoc:
 
     DEFAULT_PAGE = <<EOS
 <h1>A Brand New nanoc Site</h1>

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class CreateTemplateCommand < Command # :nodoc:
+  class CreateTemplateCommand < Cri::Command # :nodoc:
 
     def name
       'create_template'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class HelpCommand < Command # :nodoc:
+  class HelpCommand < Cri::Command # :nodoc:
 
     def name
       'help'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class InfoCommand < Command # :nodoc:
+  class InfoCommand < Cri::Command # :nodoc:
 
     def name
       'info'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class SwitchCommand < Command # :nodoc:
+  class SwitchCommand < Cri::Command # :nodoc:
 
     def name
       'switch'

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

@@ -1,6 +1,6 @@
 module Nanoc::CLI
 
-  class UpdateCommand < Command # :nodoc:
+  class UpdateCommand < Cri::Command # :nodoc:
 
     def name
       'update'