awestruct 0.5.4.rc3 → 0.5.4

data/lib/awestruct/compass/default_configuration.rb

@@ -0,0 +1,108 @@
+require 'compass/configuration/defaults'
+
+module Awestruct
+  module Compass
+    class DefaultConfiguration
+      #include ::Compass::Configuration::Defaults
+
+      attr_reader :site
+
+      def initialize site
+        @site = site
+      end
+
+      #def top_level
+        #self
+      #end
+
+      def project_type
+        :stand_alone
+      end
+
+      def environment
+        site.profile
+      end
+
+      def project_path
+        site.config.dir
+      end
+
+      def sass_dir
+        File.join site.config.dir, 'stylesheets'
+      end
+
+      def http_path
+        site.base_url
+      end
+
+      def css_dir
+        site.css_dir
+      end
+
+      def javascripts_dir
+        File.join site.config.dir, 'javascripts'
+      end
+
+      def http_javascripts_dir
+        File.join http_path, 'javascripts' 
+      end
+
+      def http_stylesheets_dir
+        File.join http_path, 'stylesheets'
+      end
+
+      def images_dir
+        File.join site.config.dir, 'images'
+      end
+
+      def generated_images_dir
+        File.join site.output_path, 'images'
+      end
+
+      def http_generated_images_dir
+        File.join http_path, 'images'
+      end
+
+      def sprite_load_path
+        [images_path]
+      end
+
+      def images_path
+        File.join project_path, 'images'
+      end
+
+      def http_images_dir
+        File.join http_path, 'images'
+      end
+
+      def fonts_dir
+        File.join site.config.dir, 'fonts'
+      end
+
+      def http_fonts_dir
+        File.join http_path, 'fonts'
+      end
+
+      def line_comments
+        site.key?(:compass_line_comments) ? !!site.compass_line_comments : !site.profile.eql?('production') 
+      end
+
+      def output_style
+        site.key?(:compass_output_style) ? site.compass_output_style.to_sym : site.profile.eql?('production') ? :compressed : :expanded 
+      end
+
+      def relative_assets
+        false
+      end
+
+      def cache_dir
+        File.join site.config.dir, '.sass-cache'
+      end
+
+      def inherit_from! data
+        return
+      end
+    end 
+  end
+end
+

data/lib/awestruct/config.rb

@@ -19,20 +19,21 @@ module Awestruct
     attr_accessor :stylesheets_dir
 
     attr_accessor :verbose
+    attr_accessor :quiet
     attr_accessor :options
 
     def initialize(opts = Awestruct::CLI::Options.new)
-      @dir            = Pathname.new( opts.source_dir )
-      @layouts_dir    = Pathname.new( File.join(@dir, '_layouts') )
-      @config_dir     = Pathname.new( File.join(@dir, '_config') )
-      @input_dir      = Pathname.new( File.join(@dir, '') )
-      @output_dir     = Pathname.new( opts.output_dir )
-      @extension_dir  = Pathname.new( File.join(@dir, '_ext') )
-      @skin_dir       = Pathname.new( File.join(@dir, '_skin') )
-      @tmp_dir        = Pathname.new( File.join(@dir, '_tmp') )
-
+      @dir             = Pathname.new( opts.source_dir )
+      @layouts_dir     = Pathname.new( File.join(@dir, '_layouts') )
+      @config_dir      = Pathname.new( File.join(@dir, '_config') )
+      @input_dir       = @dir
+      @output_dir      = Pathname.new( opts.output_dir )
+      @extension_dir   = Pathname.new( File.join(@dir, '_ext') )
+      @skin_dir        = Pathname.new( File.join(@dir, '_skin') )
+      @tmp_dir         = Pathname.new( File.join(@dir, '_tmp') )
       @images_dir      = Pathname.new( File.join(@dir, 'images') )
       @stylesheets_dir = Pathname.new( File.join(@dir, 'stylesheets') )
+
       @options = opts
 
       # Dir[] doesn't like empty list
@@ -41,7 +42,7 @@ module Awestruct
         ignore_stmts = IO.read(ignore_file).each_line.map(&:strip)
       end
 
-      @ignore         = (!ignore_stmts.nil? and ignore_stmts.size > 0) ? Dir[*ignore_stmts] : []
+      @ignore = (!ignore_stmts.nil? and ignore_stmts.size > 0) ? Dir[*ignore_stmts] : []
 
       @track_dependencies = false
     end

data/lib/awestruct/config/default-site.yml

@@ -1,4 +1,5 @@
 encoding: UTF-8
+interpolate: false
 
 content_syntax:
   coffee: coffeescript

data/lib/awestruct/context.rb

@@ -1,4 +1,3 @@
-
 require 'awestruct/astruct'
 
 module Awestruct

data/lib/awestruct/dependencies.rb

@@ -1,4 +1,3 @@
-
 module Awestruct
   class Dependencies
 
@@ -48,7 +47,7 @@ module Awestruct
 
 
     def self.track_dependency(dep)
-      return if top_page.nil? 
+      return if top_page.nil?
       return if top_page == dep
       $LOG.debug "dep #{top_page.relative_source_path} - #{dep.relative_source_path}" if $LOG.debug?
       top_page.dependencies.add_dependency(dep)
@@ -139,12 +138,12 @@ module Awestruct
 
     def clear
       @dependencies.clear
-      @dependents.each do |d| 
-        if (d.instance_of? Awestruct::Dependencies) 
-          d.remove_dependent( page ) 
-        else 
-          d.dependencies.remove_dependent( page ) 
-        end 
+      @dependents.each do |d|
+        if (d.instance_of? Awestruct::Dependencies)
+          d.remove_dependent( page )
+        else
+          d.dependencies.remove_dependent( page )
+        end
       end
     end
 
@@ -196,6 +195,5 @@ module Awestruct
       page.site.pages_by_relative_source_path[ path ]
     end
 
-
   end
 end

data/lib/awestruct/deploy/base_deploy.rb

@@ -27,6 +27,11 @@ module Awestruct
       end
 
       def run
+        if ExceptionHelper.build_failed?
+          ExceptionHelper.log_message 'Not running deploy due to build failure'
+          return
+        end
+
         if @ignore_uncommitted == true
           compress_site
           publish_site
@@ -98,6 +103,7 @@ module Awestruct
           @scm = clazz.new
         rescue
           ExceptionHelper.log_message( "Could not resolve class for scm type: #{type}" )
+          ExceptionHelper.mark_failed
         end
       end
     end

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -45,6 +45,7 @@ module Awestruct
             git.commit("Published #{@branch} to GitHub pages.")
           rescue ::Git::GitExecuteError => e
             ExceptionHelper.log_message "Can't commit. #{e}."
+            ExceptionHelper.mark_failed
           end
         end
         git.reset_hard

data/lib/awestruct/deploy/rsync_deploy.rb

@@ -27,25 +27,29 @@ module Awestruct
           threads << Thread.new(stdout) do |i|
             while ( ! i.eof? )
               line = i.readline
-              case line[0,9]
+              head = line[0,9]
+              file = line[10..-1].chomp
+              case head
               when '<f.sT....'
-                $LOG.info " updating #{line[10..-1]}" if $LOG.info?
+                $LOG.info " updating #{file}" if $LOG.info?
               when 'cd+++++++'
-                $LOG.info " creating #{line[10..-1]}" if $LOG.info?
+                $LOG.info " creating #{file}" if $LOG.info?
               when '<f+++++++'
-                $LOG.info " adding #{line[10..-1]}" if $LOG.info?
+                $LOG.info " adding #{file}" if $LOG.info?
               when '<f..T....'
                 # ignoring unchanged files
-                $LOG.debug " no change to #{line[10..-1]}" if $LOG.debug?
+                $LOG.debug " no change to #{file}" if $LOG.debug?
+              when '*deleting'
+                $LOG.info " deleting #{file}" if $LOG.info?
               else
-                $LOG.info line if $LOG.info
+                $LOG.debug line if $LOG.debug
               end
             end
           end
           threads << Thread.new(stderr) do |i|
             while ( ! i.eof? )
               line = i.readline
-              $LOG.info line if $LOG.info?
+              $LOG.error line if $LOG.error?
             end
           end
           threads.each{|t|t.join}

data/lib/awestruct/deployers.rb

@@ -1,4 +1,3 @@
-
 module Awestruct
 
   class Deployers < Hash

data/lib/awestruct/engine.rb

@@ -2,6 +2,7 @@ require 'awestruct/util/inflector'
 require 'awestruct/util/default_inflections'
 
 require 'awestruct/config'
+require 'awestruct/compass/default_configuration'
 require 'awestruct/site'
 require 'awestruct/pipeline'
 require 'awestruct/page'
@@ -12,6 +13,8 @@ require 'awestruct/extensions/pipeline'
 require 'fileutils'
 require 'set'
 
+require 'compass'
+
 class OpenStruct
   def inspect
     "OpenStruct{...}"
@@ -123,9 +126,10 @@ module Awestruct
 
     def load_site_yaml(yaml_path, profile = nil)
       if ( File.exist?( yaml_path ) )
-        data = YAML.load( File.read( yaml_path ) )
+        data = YAML.load( File.read( yaml_path, :encoding => 'bom|utf-8' ) )
         if ( profile )
-          site.interpolate = true
+          # JP: Interpolation now turned off by default, turn it per page if needed
+          site.interpolate = false
           profile_data = {}
           data.each do |k,v|
             if ( ( k == 'profiles' ) && ( ! profile.nil? ) )
@@ -235,24 +239,21 @@ module Awestruct
       pipeline.execute( site )
     end
 
-    def configure_compass
-      Compass.configuration.project_type    = :standalone
-      Compass.configuration.project_path    = site.config.dir
-      Compass.configuration.sass_dir        = 'stylesheets'
-      Compass.configuration.http_path       = site.base_url
-      
+    def configure_compass 
       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?
-      Compass.configuration.relative_assets = false
+      compass_config_file = File.join(site.config.config_dir, 'compass.rb')
+      if (File.exists? compass_config_file)
+        compass_configuration = ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
+        compass_configuration.inherit_from! ::Awestruct::Compass::DefaultConfiguration.new(site) 
+        ::Compass.add_configuration compass_configuration
+      else
+        ::Compass.configuration.inherit_from! ::Awestruct::Compass::DefaultConfiguration.new(site)
+      end 
+
       # TODO: Should we add an on_stylesheet_error block?
 
       # port old style configuration to new Tilt-based configuration
@@ -266,23 +267,15 @@ module Awestruct
         end
 
         if !sass_config.has_key?(:line_numbers) || site.profile.eql?('production')
-          sass_config[:line_numbers] = Compass.configuration.line_comments
+          sass_config[:line_numbers] = ::Compass.configuration.line_comments
         end
 
         if !sass_config.has_key?(:style) || site.profile.eql?('production')
-          sass_config[:style] = Compass.configuration.output_style
+          sass_config[:style] = ::Compass.configuration.output_style
         end
       end
     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 )
@@ -304,7 +297,7 @@ module Awestruct
 
     def generate_page(page, generated_path, produce_output=true)
       if ( produce_output )
-        $LOG.debug "Generating: #{generated_path}" if $LOG.debug?
+        $LOG.info "Generating: #{generated_path}" if $LOG.info? && !config.quiet
         FileUtils.mkdir_p( File.dirname( generated_path ) )
 
         c = page.rendered_content
@@ -323,19 +316,28 @@ module Awestruct
       end
     end
 
-    def generate_page_by_output_path(path)
-      full_path = File.join( '', path )
-      page = site.pages.find{ |p| p.relative_source_path.to_s == full_path } ||
-             site.layouts.find{ |p| p.relative_source_path.to_s == full_path }
-      return if page.nil?
+    # path - relative to output dir
+    def page_by_output_path(path)
+      site.pages.find { |p|
+          p.source_path.to_s == path
+        } || site.layouts.find { |p|
+          p.source_path.to_s == path
+        }
+    end
+
+    def generate_page_and_dependencies(page)
+
+      if page.nil?
+        return
+      end
 
       if !page.output_path.nil?
         generate_page_internal(page)
       end
 
-      pages = [] << page
+      pages = [ page ]
 
-      pages.each{|page|
+      pages.each do |page|
         $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?
@@ -349,12 +351,14 @@ module Awestruct
         $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?
-      }
+      end
 
       regen_pages = Set.new
+
       if page.dependencies.has_changed_content or page.__is_layout
         regen_pages += page.dependencies.dependents
       end
+
       regen_pages = regen_pages.sort do |x, y|
         xf = "#{@site.dir}#{x.relative_source_path}"
         yf = "#{@site.dir}#{y.relative_source_path}"
@@ -367,11 +371,13 @@ module Awestruct
       end
 
       $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)
+        pages << p
       end
+
+      pages
     end
 
     def generate_page_internal(p)
@@ -382,9 +388,7 @@ module Awestruct
     end
 
     ####
-    ##
     ## compat with awestruct 0.2.x
-    ##
     ####
 
     def load_page(path, options={})

data/lib/awestruct/extensions/cachebuster.rb

@@ -3,11 +3,11 @@ module Awestruct
     module Cachebuster
 
       def cache(href)
-	"#{href}?#{cachebuster}"
+	      "#{href}?#{cachebuster}"
       end
 
       def cachebuster(p=page)
-	((site.timestamp || p.input_mtime || Time.now.to_i) / 1000).to_i.to_s
+	      ((site.timestamp || p.input_mtime || Time.now.to_i) / 1000).to_i.to_s
       end
 
     end