awestructx 0.4.0 → 0.4.1.x1

data/lib/awestruct/astruct_mixin.rb

@@ -1,4 +1,6 @@
 
+require 'awestruct/dependencies'
+
 module Awestruct
 
   module AStructMixin
@@ -21,7 +23,7 @@ module Awestruct
 
     def [](key)
       r = super( key ) || super( key.to_sym ) || super( key.to_s  )
-      transform_entry( r )
+      transform_entry( key, r )
     end
 
     def method_missing(sym, *args, &blk)
@@ -46,8 +48,11 @@ module Awestruct
       end
     end
 
+    UNTRACKED_KEYS = [
+      :url,
+    ]
 
-    def transform_entry(entry)
+    def transform_entry(for_key, entry)
       r = case(entry)
         when AStructMixin
           entry
@@ -55,10 +60,15 @@ module Awestruct
           #AStruct.new( entry )
           entry.extend( AStructMixin )
         when Array
-          entry.map!{|i| transform_entry(i)}
+          entry.map!{|i| transform_entry( for_key, i)}
         else
           entry
       end
+      if ( self.is_a? Awestruct::Page )
+        unless UNTRACKED_KEYS.include? for_key.to_sym
+          Awestruct::Dependencies.track_dependency( self )
+        end
+      end
       r
     end
 

data/lib/awestruct/cli/auto.rb

@@ -4,17 +4,31 @@ module Awestruct
   module CLI
     class Auto
 
-      def initialize(path)
-        @path = path
+      def initialize(config)
+        @config = config
       end
 
       def run()
         Guard.setup
-        Guard.start( :guardfile=>File.dirname(__FILE__) + '/Guardfile', 
-                     :watchdir=>@path,
+        Guard.start( :guardfile_contents=>guardfile_contents,
+                     :watchdir=>@config.dir,
                      :watch_all_modifications=>true )
       end
 
+      def guardfile_contents
+        ignored = [ 
+          "'.awestruct'",
+          "'#{File.basename( @config.tmp_dir )}'",
+          "'#{File.basename( @config.output_dir )}'",
+        ] 
+        c = ''
+        c += "guard :awestruct do\n"
+        c += "  watch %r(.*)\n"
+        c += "  ignore_paths #{ignored.join(', ')}"
+        c += "end\n"
+        c
+      end
     end
+
   end
 end

data/lib/awestruct/cli/deploy.rb

@@ -0,0 +1,38 @@
+require 'awestruct/deploy/rsync_deploy'
+require 'awestruct/deploy/github_pages_deploy'
+
+module Awestruct
+  module CLI
+
+    class Deploy
+
+      attr_accessor :site_config
+      attr_accessor :deploy_config
+
+       def initialize(site_config, deploy_config)
+        @site_config   = site_config
+        @deploy_config = deploy_config
+      end
+  
+      def run()
+        deploy_type = :rsync
+  
+        if ( deploy_config['host'] == 'github_pages' )
+          deploy_type = :github_pages
+        end
+  
+        deployer_class = Awestruct::Deployers.instance[ deploy_type ]
+  
+        if ( deployer_class.nil? )
+          $stderr.puts "Unable to locate correct deployer for #{deploy_type}"
+          return
+        end
+  
+        deployer = deployer_class.new( site_config, deploy_config )
+        deployer.run
+        
+      end
+    end
+
+  end
+end

data/lib/awestruct/cli/invoker.rb

@@ -3,6 +3,7 @@ require 'awestruct/cli/options'
 require 'awestruct/cli/generate'
 require 'awestruct/cli/auto'
 require 'awestruct/cli/server'
+require 'awestruct/cli/deploy'
 
 require 'pathname'
 
@@ -64,6 +65,7 @@ module Awestruct
 
       def setup_config()
         @config = Awestruct::Config.new( Dir.pwd )
+        @config.track_dependencies = true if ( options.auto )
       end
 
       def invoke_init()
@@ -73,6 +75,7 @@ module Awestruct
       end
 
       def invoke_force()
+        FileUtils.rm_rf( File.join( config.dir, '.awestruct', 'dependency-cache' ) )
         FileUtils.rm_rf( config.output_dir )
       end
 
@@ -81,10 +84,18 @@ module Awestruct
       end
 
       def invoke_deploy()
+        deploy_config = profile[ 'deploy' ]
+
+        if ( deploy_config.nil? )
+          $stderr.puts "No configuration for 'deploy'"
+          return
+        end
+
+        Awestruct::CLI::Deploy.new( config, deploy_config ).run
       end
 
       def invoke_auto()
-        run_in_thread( Awestruct::CLI::Auto.new( config.dir ) )
+        run_in_thread( Awestruct::CLI::Auto.new( config ) )
       end
 
       def invoke_server()

data/lib/awestruct/config.rb

@@ -12,6 +12,10 @@ module Awestruct
     attr_accessor :skin_dir
     attr_accessor :tmp_dir
     attr_accessor :ignore
+    attr_accessor :track_dependencies
+
+    attr_accessor :images_dir
+    attr_accessor :stylesheets_dir
 
     def initialize(dir = Dir.pwd)
       @dir            = Pathname.new( dir ) 
@@ -22,7 +26,13 @@ module Awestruct
       @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') ) 
+
       @ignore         = File.exists?(ignore_file = File.join(dir, ".awestruct_ignore")) ? Dir[*IO.read(ignore_file).each_line.map(&:strip)] : []
+
+      @track_dependencies = false
     end
 
   end

data/lib/awestruct/dependencies.rb

@@ -0,0 +1,102 @@
+
+module Awestruct
+  class Dependencies
+
+    attr_reader :page
+    attr_reader :dependencies
+    attr_reader :dependents
+
+
+    def self.top_page
+      @pages ||= []
+      @pages.first
+    end
+
+    def self.push_page(page)
+      if ( top_page.nil? )
+        page.dependencies.clear
+      else
+        top_page.dependencies.add_dependency( page )
+      end
+      @pages.push( page )
+    end
+
+    def self.pop_page
+      page = @pages.pop
+      if ( @pages.empty? && ! page.nil? )
+        page.dependencies.persist!
+      end
+    end
+
+
+    def self.track_dependency(dep)
+      return if top_page.nil? 
+      return if top_page == dep
+      top_page.dependencies.add_dependency(dep)
+    end
+
+    def initialize(page)
+      @page = page
+      @dependencies = Set.new
+      @dependents   = Set.new
+    end
+
+    def <<(dep)
+      add_dependency( dep )
+    end
+
+    def add_dependency(dep)
+      return if @page.do_not_track_dependencies
+      return if @page.output_path.nil?
+      return if dep == @page
+      @dependencies << dep
+      dep.dependencies.add_dependent( page )
+    end
+
+    def add_dependent(dep)
+      @dependents << dep
+    end
+
+    def remove_dependent(dep)
+      @dependents.delete( dep )
+    end
+
+    def clear
+      @dependencies.clear
+      @dependents.each{|d| d.remove_dependent( page ) }
+    end
+
+    def persist!
+      return if  page.output_path.nil? || page.output_path == ''
+      file = File.join( @page.site.config.dir, '.awestruct', 'dependency-cache', page.output_path )
+      FileUtils.mkdir_p( File.dirname( file ) )
+      File.open( file, 'w' ) do |file|
+        @dependencies.collect{|e| e.relative_source_path }.uniq.each do |d|
+          file.puts d unless d.nil?
+        end
+      end
+    end
+
+    def load!
+      return if  page.output_path.nil? || page.output_path == ''
+      file = File.join( @page.site.config.dir, '.awestruct', 'dependency-cache', page.output_path )
+      #puts "load #{file}"
+      if ( File.exist?( file ) )
+        File.open( file, 'r' ) do |file|
+          file.lines.each do |line|
+            d = find_page_by_path( line.strip )
+            add_dependency( d ) unless d.nil?
+          end
+        end
+        return true
+      end
+      false
+    end
+
+    def find_page_by_path(path)
+      page.site.pages_by_relative_source_path[ path ]
+    end
+
+
+  end
+end

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -0,0 +1,61 @@
+require 'awestruct/deployers'
+
+module Awestruct
+  module Deploy
+
+    class GitHubPagesDeploy
+      def initialize( site_config, deploy_config )
+        @site_path = site_config.output_dir
+        @branch    = deploy_config[ 'branch' ] || 'gh-pages'
+      end
+
+      def run
+        git.status.changed.empty? ? publish_site : message_for(:existing_changes)
+      end
+
+      private
+      def git
+        @git ||= Git.open('.')
+      end
+
+      def publish_site
+        current_branch = git.branch
+        checkout_pages_branch
+        add_and_commit_site @site_path
+        push_and_restore current_branch
+      end
+
+      def checkout_pages_branch
+        git.branch( @branch ).checkout
+      end
+
+      def add_and_commit_site( path )
+        git.with_working( path ) do
+          git.add(".")
+          begin
+            git.commit("Published #{@branch} to GitHub pages.")
+          rescue Git::GitExecuteError => e
+            $stderr.puts "Can't commit. #{e}."
+          end
+        end
+      end
+
+      def push_and_restore( original_branch )
+        git.reset_hard
+        git.push( 'origin', @branch )
+        git.checkout( original_branch )
+      end
+
+      def message_for( key )
+        $stderr.puts case key
+        when :existing_changes 
+          "You have uncommitted changes in the working branch. Please commit or stash them."
+        else 
+          "An error occured."
+        end
+      end
+    end
+  end
+end
+
+Awestruct::Deployers.instance[ :github_pages ] = Awestruct::Deploy::GitHubPagesDeploy

data/lib/awestruct/deploy/rsync_deploy.rb

@@ -0,0 +1,51 @@
+require 'awestruct/deployers'
+
+require 'open3'
+
+module Awestruct
+  module Deploy
+    class RSyncDeploy
+
+      def initialize(site_config, deploy_config)
+        @site_path = File.join( site_config.output_dir, '/' )
+        @host      = deploy_config['host']
+        @path      = File.join( deploy_config['path'], '/' )
+      end
+
+      def run
+        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+s,ug+w --delete #{@site_path} #{@host}:#{@path}"
+        Open3.popen3( cmd ) do |stdin, stdout, stderr|
+          stdin.close
+          threads = []
+          threads << Thread.new(stdout) do |i|
+            while ( ! i.eof? )
+              line = i.readline
+              case line[0,9]
+              when '<f.sT....'
+                puts " updating #{line[10..-1]}"
+              when 'cd+++++++'
+                puts " creating #{line[10..-1]}"
+              when '<f+++++++'
+                puts " adding #{line[10..-1]}"
+              when '<f..T....'
+                # ignoring unchanged files
+                # puts " no change to #{line[10..-1]}"
+              else
+                puts line
+              end
+            end
+          end
+          threads << Thread.new(stderr) do |i|
+            while ( ! i.eof? )
+              line = i.readline
+              puts line
+            end
+          end
+          threads.each{|t|t.join}
+        end
+      end
+    end
+  end
+end
+
+Awestruct::Deployers.instance[ :rsync ] = Awestruct::Deploy::RSyncDeploy

data/lib/awestruct/deployers.rb

@@ -0,0 +1,15 @@
+
+module Awestruct
+
+  class Deployers < Hash
+    def self.instance
+      @instance ||= Deployers.new
+    end
+
+    def self.register( key, cls )
+      Deployers.instance[ key.to_sym ] = cls
+    end
+
+  end
+
+end

data/lib/awestruct/engine.rb

@@ -10,6 +10,7 @@ require 'awestruct/page_loader'
 require 'awestruct/extensions/pipeline'
 
 require 'fileutils'
+require 'set'
 
 class OpenStruct
   def inspect
@@ -38,7 +39,6 @@ module Awestruct
       @pipeline = Pipeline.new
       @site_page_loader = PageLoader.new( @site )
       @layout_page_loader = PageLoader.new( @site, :layouts )
-      adjust_load_path
     end
 
     def config
@@ -46,6 +46,7 @@ module Awestruct
     end
 
     def run(profile, base_url, default_base_url, force=false)
+      adjust_load_path
       load_site_yaml(profile)
       set_base_url( base_url, default_base_url )
       load_yamls
@@ -54,9 +55,24 @@ module Awestruct
       execute_pipeline
       configure_compass
       set_urls( site.pages )
+      build_page_index
       generate_output
     end
 
+    def build_page_index
+      site.pages_by_relative_source_path = {}
+      site.pages.each do |p|
+        if ( p.relative_source_path )
+          site.pages_by_relative_source_path[ p.relative_source_path ] = p
+        end
+      end
+      site.layouts.each do |p|
+        if ( p.relative_source_path )
+          site.pages_by_relative_source_path[ p.relative_source_path ] = p
+        end
+      end
+    end
+
     def set_base_url(base_url, default_base_url)
       if ( base_url )
         site.base_url = base_url
@@ -191,27 +207,47 @@ module Awestruct
         generated_path = File.join( site.config.output_dir, page.output_path )
         if ( page.stale_output?( generated_path ) )
           generate_page( page, generated_path )
+        else
+          generate_page( page, generated_path, false )
         end
       end
     end
 
-    def generate_page(page, generated_path)
-      puts "Generating: #{generated_path}"
-      FileUtils.mkdir_p( File.dirname( generated_path ) )
-      File.open( generated_path, 'w' ) do |file|
-        file << page.rendered_content
+    def generate_page(page, generated_path, produce_output=true)
+      if ( produce_output )
+        puts "Generating: #{generated_path}"
+        FileUtils.mkdir_p( File.dirname( generated_path ) )
+        File.open( generated_path, 'w' ) do |file|
+          file << page.rendered_content
+        end
+      elsif ( site.config.track_dependencies )
+        if page.dependencies.load!
+          puts "Cached:     #{generated_path}"
+        else
+          puts "Analyzing:  #{generated_path}"
+          page.rendered_content
+        end
       end
     end
 
     def generate_page_by_output_path(path)
       full_path = File.join( '', path )
-      #puts "regen path #{full_path}"
-      page = site.pages.find{|p| p.relative_source_path.to_s==full_path}
-      if ( page.nil? )
-        #puts "Unable to locate page for #{path}"
-      else
-        generated_path = File.join( site.config.output_dir, page.output_path )
-        generate_page(page, generated_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?
+
+      #puts "regen page #{page.inspect}"
+      #puts "page.dependents #{page.dependencies.dependents.inspect}"
+
+      regen_pages = Set.new
+      regen_pages << page unless ( page.output_path.nil? )
+      regen_pages += page.dependencies.dependents
+
+      #puts regen_pages.collect{|e|e.output_path}.inspect
+      regen_pages.each do |p|
+        unless ( p.output_path.nil? || p.__is_layout )
+          generated_path = File.join( site.config.output_dir, p.output_path )
+          generate_page( p, generated_path )
+        end
       end
     end
 

data/lib/awestruct/extensions/atomizer.rb

@@ -2,8 +2,8 @@ module Awestruct
   module Extensions
     class Atomizer
 
-      def initialize(entries_name, output_path, opts={})
-        @entries_name = entries_name
+      def initialize(entries, output_path, opts={})
+        @entries = entries
         @output_path = output_path
         @num_entries = opts[:num_entries] || 50
         @content_url = opts[:content_url]
@@ -11,7 +11,7 @@ module Awestruct
       end
 
       def execute(site)
-        entries = site.send( @entries_name ) || []
+        entries = @entries.is_a?(Array) ? @entries : site.send( @entries ) || []
         unless ( @num_entries == :all )
           entries = entries[0, @num_entries]
         end

data/lib/awestruct/extensions/minify.rb

@@ -12,10 +12,10 @@ require 'fileutils'
 #
 # These commands must be available on your PATH in order to use them.
 #
-# This class is loaded as a transformer in the Awestruct pipeline. The
+# This class is loaded as a transformer into the Awestruct pipeline. The
 # constructor accepts an array of symbols representing the file types to minimize.
 #
-#   extension Awestruct::Extensions::Minify.new
+#   transformer Awestruct::Extensions::Minify.new
 #
 # This transform recognizes the following symbols:
 #
@@ -57,30 +57,28 @@ module Awestruct
 
       def transform(site, page, input)
         if site.minify
-          ext = File.extname(page.output_path)[1..-1].to_sym
-          if @types.include?(ext)
-            case ext
-            when :html
-              print "minifying html #{page.output_path}"
-              htmlcompressor(page, input, site.minify_html_opts)
-            when :css
-              print "minifying css #{page.output_path}"
-              yuicompressor(page, input, :css)
-            when :js
-              print "minifying js #{page.output_path}"
-              yuicompressor(page, input, :js)
-            when :png
-              print "minifying png #{page.output_path}"
-              pngcrush(page, input)
-            else
-              input
+          ext = File.extname(page.output_path)
+          if !ext.empty?
+            ext_sym = ext[1..-1].to_sym
+            if @types.include?(ext_sym)
+              case ext_sym
+              when :html
+                print "minifying html #{page.output_path}"
+                input = htmlcompressor(page, input, site.minify_html_opts)
+              when :css
+                print "minifying css #{page.output_path}"
+                input = yuicompressor(page, input, :css)
+              when :js
+                print "minifying js #{page.output_path}"
+                input = yuicompressor(page, input, :js)
+              when :png
+                print "minifying png #{page.output_path}"
+                input = pngcrush(page, input)
+              end
             end
-          else
-            input
           end
-        else
-          input
         end
+        input
       end
 
       private

data/lib/awestruct/extensions/posts.rb

@@ -27,22 +27,22 @@ module Awestruct
                 date = Time.parse page.date
               end
               year = date.year
-              month = date.month
-              day = date.day
+              month = sprintf( "%02d", date.month )
+              day = sprintf( "%02d", date.day )
               page.date = Time.utc(year, month, day)
               slug = $1
             end
 
             # if a date was found create a post
             if( year and month and day)
-              page.slug = slug
+              page.slug ||= slug
               #context = OpenStruct.new({
                 #:site=>site,
                 #:page=>page,
               #})
               context = page.create_context
               #page.body = page.render( context )
-              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
+              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
               #page.layout = 'post'
               posts << page
             end

data/lib/awestruct/extensions/sitemap.rb

@@ -33,6 +33,7 @@ module Awestruct
         page                 = site.engine.load_page( sitemap )
         page.output_path     = 'sitemap.xml'
         page.sitemap_entries = sitemap_pages
+        page.do_not_track_dependencies = true
 
         # Add the sitemap to our site
         site.pages << page