gumdrop 0.7.0 → 0.7.1

data/ChangeLog.md

@@ -1,5 +1,10 @@
+# v0.7.1
+- Ignore/skip (greylist/blacklist) will now include/skip generated content too.
+- Quiet mode will actually be quiet.
+- Made build log output more consistent.
+
 # v0.7.0
-- Initial support for sprockets js generator
+- Initial support for sprockets js generator.
 
 # v0.6.4
 - Callbacks are cleared on each `Site#rescan()` to prevent duplicates.

data/lib/gumdrop.rb

@@ -31,7 +31,7 @@ module Gumdrop
         
         Dir.chdir old
   
-        puts "Done."
+        puts "Done." unless opts[:quiet] or opts[:quiet_given]
       else
         puts "Not in a valid Gumdrop site directory."
       end

data/lib/gumdrop/cli.rb

@@ -11,8 +11,8 @@ EOS
 opts = Trollop::options do
   banner banner_text
 
-  opt :verbose,"Verbose output"
-  opt :debug,  "Enable debugging output"
+  # opt :verbose,"Verbose output"
+  # opt :debug,  "Enable debugging output"
   opt :quiet,  "No console output"
 
   if Gumdrop.in_site_folder?

data/lib/gumdrop/content.rb

@@ -58,7 +58,7 @@ module Gumdrop
     
     def renderTo(context, output_path, filters=[], opts={})
       return copyTo(output_path, opts) unless useLayout?
-      @site.report " Rendering: #{@uri}", :warning
+      @site.report " rendering: #{@uri}", :warning
       output= render(context)
       filters.each {|f| output= f.call(output, self) }
       File.open output_path, 'w' do |f|
@@ -74,7 +74,7 @@ module Gumdrop
         true
       end
       if do_copy
-        @site.report "   Copying: #{@uri}", :warning
+        @site.report "   copying: #{@uri}", :warning
         FileUtils.cp_r @full_path, output, opts
       else
         @site.report "    (same): #{@uri}", :info

data/lib/gumdrop/generator.rb

@@ -58,7 +58,11 @@ module Gumdrop
           @site.layouts[ "#{opts[:template]}.template" ]
         end.template
       end
-      @site.report "-generated: #{content.uri}", :info
+      content.ignored= site.greylist.any? {|pattern| site.path_match name, pattern }
+      unless content.ignored
+        content.ignored= site.blacklist.any? {|pattern| site.path_match name, pattern }
+      end      
+      @site.report " generated: #{content.uri}", :info
       @site.node_tree[content.uri]= content
     end
 

data/lib/gumdrop/site.rb

@@ -114,6 +114,10 @@ module Gumdrop
       @context
     end
 
+    # Match a path using a glob-like file pattern
+    def path_match(path, pattern)
+      File.fnmatch pattern, path, File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_CASEFOLD
+    end
 
   private
 
@@ -161,8 +165,13 @@ module Gumdrop
       begin
         @log = Logger.new @config.log, 'daily'
       rescue
-        @log = Logger.new STDOUT
-        report "Using STDOUT for logging because of exception: #{ $! }"
+        target= if @opts[:quiet] or @opts[:quiet_given]
+          nil
+        else
+          STDOUT
+        end
+        @log = Logger.new target
+        report "Using STDOUT for logging because of exception: #{ $! }" unless target.nil?
       end
       @log.formatter = proc do |severity, datetime, progname, msg|
         "#{datetime}: #{msg}\n"
@@ -247,17 +256,13 @@ module Gumdrop
             FileUtils.mkdir_p File.dirname(output_path)
             node.renderTo render_context, output_path, content_filters
           else
-            report " -ignoring: #{node.to_s}", :info
+            report "  ignoring: #{node.to_s}", :info
           end
         end
         on_render(self)
       end
     end
 
-    # Match a path using a glob-like file pattern
-    def path_match(path, pattern)
-      File.fnmatch pattern, path, File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_CASEFOLD
-    end
   end
 
   class Sitefile

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.7.0" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.7.1" unless defined?(::Gumdrop::VERSION)
   
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Matt McCray