awestruct 0.4.8 → 0.5.0.cr

data/lib/awestruct/deploy/base_deploy.rb

@@ -18,11 +18,11 @@ module Awestruct
       end
 
       def publish_site
-        $stderr.puts( "#{self.class.name}#publish_site not implemented." )
+        $LOG.error( "#{self.class.name}#publish_site not implemented." ) if $LOG.error?
       end
 
       def existing_changes
-        $stderr.puts UNCOMMITTED_CHANGES
+        $LOG.error UNCOMMITTED_CHANGES if $LOG.error?
       end
     end
   end

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -29,7 +29,7 @@ module Awestruct
           begin
             git.commit("Published #{@branch} to GitHub pages.")
           rescue ::Git::GitExecuteError => e
-            $stderr.puts "Can't commit. #{e}."
+            $LOG.error "Can't commit. #{e}." if $LOG.error?
           end
         end
         git.reset_hard

data/lib/awestruct/deploy/rsync_deploy.rb

@@ -14,16 +14,12 @@ module Awestruct
       end
 
       def publish_site
-        exclude_option = ""
-        if ! (@exclude.nil? or @exclude.empty?)
-          exclude_option = "--exclude=#{@exclude}"
-        end
-        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+sx,ug+rw --delete #{exclude_option} #{@site_path} #{@host}:#{@path}"
+        exclude_option = (!@exclude.nil? and !@exclude.empty?) ? "--exclude=" + Shellwords.escape(@exclude) : nil
+        site_path = Shellwords.escape(@site_path)
+        host = Shellwords.escape(@host)
+        path = Shellwords.escape(@path)
 
-        # Shellwords mangles windows  rsync command so we need to skip shell words
-        if(RUBY_PLATFORM !~ /mingw/)
-          cmd = Shellwords.escape(cmd)
-        end
+        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+sx,ug+rw --delete #{exclude_option} #{site_path} #{host}:#{path}"
 
         Open3.popen3( cmd ) do |stdin, stdout, stderr|
           stdin.close
@@ -33,23 +29,23 @@ module Awestruct
               line = i.readline
               case line[0,9]
               when '<f.sT....'
-                puts " updating #{line[10..-1]}"
+                $LOG.info " updating #{line[10..-1]}" if $LOG.info?
               when 'cd+++++++'
-                puts " creating #{line[10..-1]}"
+                $LOG.info " creating #{line[10..-1]}" if $LOG.info?
               when '<f+++++++'
-                puts " adding #{line[10..-1]}"
+                $LOG.info " adding #{line[10..-1]}" if $LOG.info?
               when '<f..T....'
                 # ignoring unchanged files
-                # puts " no change to #{line[10..-1]}"
+                $LOG.debug " no change to #{line[10..-1]}" if $LOG.debug?
               else
-                puts line
+                $LOG.info line if $LOG.info
               end
             end
           end
           threads << Thread.new(stderr) do |i|
             while ( ! i.eof? )
               line = i.readline
-              puts line
+              $LOG.info line if $LOG.info?
             end
           end
           threads.each{|t|t.join}

data/lib/awestruct/deploy/s3_deploy.rb

@@ -1,10 +1,19 @@
 require 'awestruct/deploy/base_deploy'
+require 'ruby-s3cmd'
 
 module Awestruct
   module Deploy
     class S3Deploy < Base
       def initialize( site_config, deploy_config )
         @site_path = site_config.output_dir
+        @bucket = deploy_config['bucket']
+      end
+
+      def publish_site
+        $LOG.info "Syncing #{@site_path} to bucket #{@bucket}" if $LOG.info?
+        s3cmd = RubyS3Cmd::S3Cmd.new
+        s3cmd.sync("#{@site_path}/", @bucket)
+        $LOG.info "DONE" if $LOG.info?
       end
     end
   end

data/lib/awestruct/engine.rb

@@ -46,16 +46,29 @@ module Awestruct
     end
 
     def run(profile, base_url, default_base_url, force=false)
+      $LOG.debug "adjust_load_path" if $LOG.debug?
       adjust_load_path
+      $LOG.debug "load_default_site_yaml" if $LOG.debug?
+      load_default_site_yaml
+      $LOG.debug "load_site_yaml -- profile" if $LOG.debug?
       load_site_yaml(profile)
+      $LOG.debug "set_base_url" if $LOG.debug?
       set_base_url( base_url, default_base_url )
+      $LOG.debug "load_yamls" if $LOG.debug?
       load_yamls
+      $LOG.debug "load_pipeline" if $LOG.debug?
       load_pipeline
+      $LOG.debug "load_pages" if $LOG.debug?
       load_pages
+      $LOG.debug "execute_pipeline" if $LOG.debug?
       execute_pipeline
+      $LOG.debug "configure_compass" if $LOG.debug?
       configure_compass
+      $LOG.debug "set_urls" if $LOG.debug?
       set_urls( site.pages )
+      $LOG.debug "build_page_index" if $LOG.debug?
       build_page_index
+      $LOG.debug "generate_output" if $LOG.debug?
       generate_output
     end
 
@@ -90,6 +103,16 @@ module Awestruct
 
     end
 
+    def load_default_site_yaml
+      default_site_yaml = File.join( File.dirname( __FILE__ ), 'config', 'default-site.yml' )
+      if ( File.exist?( default_site_yaml ) )
+        data = YAML.load( File.read( default_site_yaml ) )
+        data.each do |k,v|
+          site.send( "#{k}=", v )
+        end if data
+      end
+    end
+
     def load_site_yaml(profile)
       site_yaml = File.join( site.config.config_dir, 'site.yml' )
       if ( File.exist?( site_yaml ) )
@@ -100,13 +123,13 @@ module Awestruct
           if ( ( k == 'profiles' ) && ( ! profile.nil? ) )
             profile_data = ( v[profile] || {} )
           else
-            site.send( "#{k}=", v )
+            site.send( "#{k}=", merge_data( site.send( "#{k}" ), v ) )
           end
         end if data
         site.profile = profile
 
         profile_data.each do |k,v|
-          site.send( "#{k}=", v )
+          site.send( "#{k}=", merge_data( site.send( "#{k}" ), v ) )
         end
       end
     end
@@ -123,6 +146,25 @@ module Awestruct
       site.send( "#{name}=", massage_yaml( data ) )
     end
 
+    def merge_data(existing, new)
+      if existing.kind_of? Hash
+        existing.inject({}) do |merged, (k,v)|
+          if new.has_key? k
+            if v.kind_of? Hash
+              merged[k] = v.merge new[k]
+            else
+              merged[k] = new[k]
+            end
+          else
+            merged[k] = v
+          end
+          merged
+        end
+      else
+        new
+      end
+    end
+
     def massage_yaml(obj)
       result = obj
       case ( obj )
@@ -150,7 +192,7 @@ module Awestruct
 
     def set_urls(pages)
       pages.each do |page|
-        #puts "relative_source_path #{page.relative_source_path}"
+        $LOG.debug "relative_source_path #{page.relative_source_path}" if $LOG.debug?
         page_path = page.output_path
         if ( page_path =~ /^\// )
           page.url = page_path
@@ -192,21 +234,30 @@ module Awestruct
       Compass.configuration.sass_dir        = 'stylesheets'
       
       site.images_dir      = File.join( site.config.output_dir, 'images' )
+      site.fonts_dir       = File.join( site.config.output_dir, 'fonts' )
       site.stylesheets_dir = File.join( site.config.output_dir, 'stylesheets' )
       site.javascripts_dir = File.join( site.config.output_dir, 'javascripts' )
 
       Compass.configuration.css_dir         = site.css_dir
       Compass.configuration.javascripts_dir = 'javascripts'
       Compass.configuration.images_dir      = 'images'
+      Compass.configuration.fonts_dir       = 'fonts'
       Compass.configuration.line_comments   = include_line_comments?
+      Compass.configuration.output_style    = compress_css?
     end
 
     def include_line_comments?
       site.key?(:compass_line_comments) ? !!site.compass_line_comments : !site.profile.eql?('production')
     end
 
+    def compress_css?
+      site.key?(:compass_output_style) ? site.compass_output_style.to_sym : site.profile.eql?('production') ? :compressed : :expanded
+    end
+
     def load_pages
+      $LOG.debug "layout_page_loader.load_all :post" if $LOG.debug?
       @layout_page_loader.load_all( :post )
+      $LOG.debug "site_page_loader.load_all :inline" if $LOG.debug?
       @site_page_loader.load_all( :inline )
     end
 
@@ -224,7 +275,7 @@ module Awestruct
 
     def generate_page(page, generated_path, produce_output=true)
       if ( produce_output )
-        puts "Generating: #{generated_path}"
+        $LOG.debug "Generating: #{generated_path}" if $LOG.debug?
         FileUtils.mkdir_p( File.dirname( generated_path ) )
 
         c = page.rendered_content
@@ -235,9 +286,9 @@ module Awestruct
         end
       elsif ( site.config.track_dependencies )
         if page.dependencies.load!
-          puts "Cached:     #{generated_path}"
+          $LOG.debug "Cached:     #{generated_path}" if $LOG.debug?
         else
-          puts "Analyzing:  #{generated_path}"
+          $LOG.debug "Analyzing:  #{generated_path}" if $LOG.debug?
           page.rendered_content
         end
       end
@@ -256,19 +307,19 @@ module Awestruct
       pages = [] << page
 
       pages.each{|page|
-        puts "--------------------"
-        puts "Page: #{page.output_path} #{page.relative_source_path} #{page.__is_layout ? 'Layout':''}"
-        puts "Detected change in content (#{page.dependencies.content_hash})" if page.dependencies.has_changed_content
-        puts "!! Detected change in front matter. To fully reflect the change you'll need to restart Awestruct (#{page.dependencies.key_hash})" if page.dependencies.has_changed_keys
-        puts "No changes detected" unless page.dependencies.has_changed_content or page.dependencies.has_changed_keys
-        puts "Dependencies Matrix: (non unique source path)"
-        puts "\t Outgoing dependencies:"
-        puts "\t\t Content -> #{page.dependencies.dependencies.size}"
-        puts "\t\t Key     -> #{page.dependencies.key_dependencies.size}"
-        puts "\t Incoming dependencies:"
-        puts "\t\t Content <- #{page.dependencies.dependents.size}"
-        puts "\t\t Key     <- #{page.dependencies.key_dependents.size}"
-        puts "--------------------"
+        $LOG.debug "--------------------" if $LOG.debug?
+        $LOG.debug "Page: #{page.output_path} #{page.relative_source_path} #{page.__is_layout ? 'Layout':''}" if $LOG.debug?
+        $LOG.debug "Detected change in content (#{page.dependencies.content_hash})" if page.dependencies.has_changed_content if $LOG.debug?
+        $LOG.debug "!! Detected change in front matter. To fully reflect the change you'll need to restart Awestruct (#{page.dependencies.key_hash})" if page.dependencies.has_changed_keys if $LOG.debug?
+        $LOG.debug "No changes detected" unless page.dependencies.has_changed_content or page.dependencies.has_changed_keys if $LOG.debug?
+        $LOG.debug "Dependencies Matrix: (non unique source path)" if $LOG.debug?
+        $LOG.debug "\t Outgoing dependencies:" if $LOG.debug?
+        $LOG.debug "\t\t Content -> #{page.dependencies.dependencies.size}" if $LOG.debug?
+        $LOG.debug "\t\t Key     -> #{page.dependencies.key_dependencies.size}" if $LOG.debug?
+        $LOG.debug "\t Incoming dependencies:" if $LOG.debug?
+        $LOG.debug "\t\t Content <- #{page.dependencies.dependents.size}" if $LOG.debug?
+        $LOG.debug "\t\t Key     <- #{page.dependencies.key_dependents.size}" if $LOG.debug?
+        $LOG.debug "--------------------" if $LOG.debug?
       }
 
       regen_pages = Set.new
@@ -286,8 +337,8 @@ module Awestruct
         yt <=> xt
       end
 
-      puts "Starting regeneration of content dependent pages:" if regen_pages.size > 0
-      regen_pages.each{|x| puts x.output_path}
+      $LOG.debug "Starting regeneration of content dependent pages:" if regen_pages.size > 0 && $LOG.debug?
+      regen_pages.each{|x| $LOG.info x.output_path if $LOG.info?}
 
       regen_pages.each do |p|
         generate_page_internal(p)

data/lib/awestruct/extensions/minify.rb

@@ -1,16 +1,16 @@
 require 'shellwords'
 require 'fileutils'
 require 'htmlcompressor'
-require 'yui/compressor'
+require 'uglifier'
 
 ##
 # Awestruct:Extensions:Minify is a transformer that minimizes JavaScript, CSS and HTML files.
 # The transform runs on the rendered stream before it's written to the output path.
 #
-# Minification is performed by the following three libraries:
+# Minification is performed by the following libraries:
 #
 #   htmlcompressor (minifies HTML): http://code.google.com/p/htmlcompressor/
-#   yuicompressor (minifies JavaScript and CSS): http://developer.yahoo.com/yui/compressor/
+#   uglifier (minifies javascript): http://github.com/lautis/uglifier
 #   pngcrush (minifies PNG): http://pmt.sourceforge.net/pngcrush/
 #
 # These commands must be available on your PATH in order to use them.
@@ -22,12 +22,11 @@ require 'yui/compressor'
 #
 # This transform recognizes the following symbols:
 #
-#   :css - CSS files with extension .css
 #   :js - JavaScript files with extension .js
 #   :html - HTML files with extension .html
 #   :png - PNG files with extension .png
 #
-# If no types are specified, the default value [:css, :js] is used.
+# If no types are specified, the default value [:js] is used.
 # 
 # In addition to registering the transformer in the pipeline, it must be enabled
 # by setting the following site property in _ext/config.yml:
@@ -46,7 +45,6 @@ require 'yui/compressor'
 #   minify_html_opts:
 #     remove_intertag_spaces: true
 #     compress_js: true
-#     compress_css: true
 # 
 # Note that any hypen (-) must be represented as an underscore (_) in the configuration.
 
@@ -54,7 +52,7 @@ module Awestruct
   module Extensions
     class Minify
 
-      def initialize(types = [ :css, :js ])
+      def initialize(types = [ :js ])
         @types = types
       end
 
@@ -69,11 +67,12 @@ module Awestruct
                 print "minifying html #{page.output_path}"
                 input = htmlcompressor(page, input, site.minify_html_opts)
               when :css
-                print "minifying css #{page.output_path}"
-                input = yuicompressor_css(page, input)
+                # TODO: Figure out how to do this is sass / less and document it
+                #print "minifying css #{page.output_path}"
+                #input = yuicompressor_css(page, input)
               when :js
                 print "minifying js #{page.output_path}"
-                input = yuicompressor_js(page, input)
+                input = js_compressor(page, input)
               when :png
                 print "minifying png #{page.output_path}"
                 input = pngcrush(page, input)
@@ -86,17 +85,19 @@ module Awestruct
 
       private
 
+      class JSCompressor
+        def compress( input )
+          Uglifier.new(:mangle => false).compile(input)
+        end
+      end
+
       def htmlcompressor(page, input, minify_html_opts)
         opts = minify_html_opts.nil? ? {}:minify_html_opts
         compressor(page, input, HtmlCompressor::Compressor.new(opts))
       end
 
-      def yuicompressor_css(page, input)
-        compressor(page, input, YUI::CssCompressor.new)
-      end
-
-      def yuicompressor_js(page, input)
-        compressor(page, input, YUI::JavaScriptCompressor.new)
+      def js_compressor(page, input)
+        compressor(page, input, JSCompressor.new)
       end
 
       def compressor(page, input, compressor)
@@ -106,10 +107,10 @@ module Awestruct
         output_len = output.length
 
         if input_len > output_len
-          puts " %d bytes -> %d bytes = %.1f%%" % [ input_len, output_len, 100 * output_len/input_len ]
+          $LOG.debug " %d bytes -> %d bytes = %.1f%%" % [ input_len, output_len, 100 * output_len/input_len ] if $LOG.debug?
           output
         else
-          puts " no gain"
+          $LOG.debug " no gain" if $LOG.debug?
           input
         end
       end
@@ -127,10 +128,10 @@ module Awestruct
         output_len = output.length
 
         if input_len > output_len
-          puts " %d bytes -> %d bytes = %.1f%%" % [ input_len, output_len, 100 * output_len/input_len ]
+          $LOG.debug " %d bytes -> %d bytes = %.1f%%" % [ input_len, output_len, 100 * output_len/input_len ] if $LOG.debug?
           output
         else
-          puts " no gain"
+          $LOG.debug " no gain" if $LOG.debug?
           input
         end
       end

data/lib/awestruct/extensions/paginator.rb

@@ -13,7 +13,7 @@ module Awestruct
         def links
           html = %Q(<div class="pagination-links">)
           unless ( previous_page.nil? )
-            html += %Q(<a href="#{site.base_url}#{previous_page.url}" class="previous-link">Previous</a> )
+            html += %Q(<a href="#{previous_page.url}" class="previous-link">Previous</a> )
           end
           first_skip = false
           second_skip = false
@@ -21,7 +21,7 @@ module Awestruct
             if ( i == current_page_index )
               html += %Q(<span class="current-page">#{i+1}</span> )
             elsif ( i <= window )
-              html += %Q(<a href="#{site.base_url}#{page.url}" class="page-link">#{i+1}</a> )
+              html += %Q(<a href="#{page.url}" class="page-link">#{i+1}</a> )
             elsif ( ( i > window ) && ( i < ( current_page_index - window ) ) && ! first_skip  )
               html += %Q(<span class="skip">...</span>)
               first_skip = true
@@ -29,13 +29,13 @@ module Awestruct
               html += %Q(<span class="skip">...</span>)
               second_skip = true
             elsif ( ( i >= ( current_page_index - window ) ) && ( i <= ( current_page_index + window ) ) )
-              html += %Q(<a href="#{site.base_url}#{page.url}" class="page-link">#{i+1}</a> )
+              html += %Q(<a href="#{page.url}" class="page-link">#{i+1}</a> )
             elsif ( i >= ( ( pages.size - window ) - 1 ) )
-              html += %Q(<a href="#{site.base_url}#{page.url}" class="page-link">#{i+1}</a> )
+              html += %Q(<a href="#{page.url}" class="page-link">#{i+1}</a> )
             end
           end
           unless ( next_page.nil? )
-            html += %Q(<a href="#{site.base_url}#{next_page.url}" class="next-link">Next</a> )
+            html += %Q(<a href="#{next_page.url}" class="next-link">Next</a> )
           end
           html += %Q(</div>)
           html

data/lib/awestruct/extensions/partial.rb

@@ -6,7 +6,7 @@ module Awestruct
         filename = File.join( '_partials', path )
 
         if !File.exists?( filename )
-          puts "Could not find #{filename}"
+          $LOG.error "Could not find #{filename}" if $LOG.error?
           return nil
         end