awestruct 0.4.5 → 0.4.6

data/lib/awestruct/astruct_mixin.rb

@@ -66,7 +66,7 @@ module Awestruct
       end
       if ( self.is_a? Awestruct::Page )
         unless UNTRACKED_KEYS.include? for_key.to_sym
-          Awestruct::Dependencies.track_dependency( self )
+          Awestruct::Dependencies.track_key_dependency( self, for_key )
         end
       end
       r

data/lib/awestruct/cli/auto.rb

@@ -11,6 +11,9 @@ module Awestruct
       end
 
       def run()
+        generate_thread = nil
+        current_path = nil
+
         force_polling = ( RUBY_PLATFORM =~ /mingw/ ? true : false )
         listener = Listen.to( @config.dir, :relative_paths=>true, :latency=>0.5, :force_polling=>force_polling )
         listener.ignore( %r(\.awestruct) )
@@ -21,7 +24,25 @@ module Awestruct
             engine = ::Awestruct::Engine.instance
             unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ )
               begin
-                engine.generate_page_by_output_path( path )
+                if path.eql? current_path
+                  unless generate_thread.nil?
+                    puts "Same path triggered, stopping previous generation" if generate_thread.alive?
+                    generate_thread.kill
+                  end
+                else
+                  generate_thread.join unless generate_thread.nil?
+                  current_path = path
+                end
+
+                generate_thread = Thread.new {
+                  begin
+                    engine.generate_page_by_output_path( path )
+                    puts "Generating.... done!"
+                  rescue => e
+                    puts e
+                    puts e.backtrace
+                  end
+                }
               rescue => e
                 puts e
                 puts e.backtrace

data/lib/awestruct/cli/deploy.rb

@@ -1,3 +1,4 @@
+require 'awestruct/deploy/s3_deploy'
 require 'awestruct/deploy/rsync_deploy'
 require 'awestruct/deploy/github_pages_deploy'
 
@@ -12,18 +13,20 @@ module Awestruct
       def initialize(site_config, deploy_config)
         @site_config   = site_config
         @deploy_config = deploy_config
-        deploy_config[:type] ||= (is_github? ? :github_pages : :rsync)
+        @deploy_config['type'] ||= (is_github? ? :github_pages : :rsync)
+        puts "Deploying to #{deploy_type}"
       end
 
       def deploy_type
-        deploy_config[:type]
+        deploy_config['type']
       end
   
       def run()
-        deployer_class = Awestruct::Deployers.instance[ deploy_type ]
+        deployer_class = Awestruct::Deployers.instance[ deploy_type.to_sym ]
   
         if ( deployer_class.nil? )
           $stderr.puts "Unable to locate correct deployer for #{deploy_type}"
+          $stderr.puts "Deployers available for #{::Awestruct::Deployers.instance.collect {|k,v| "#{v} (#{k})"}.join(', ')}"
           return
         end
   
@@ -33,7 +36,7 @@ module Awestruct
 
       private
       def is_github?
-        deploy_config[:host].to_s == :github_pages.to_s || deploy_config['host'].to_s == :github_pages.to_s
+        deploy_config['host'].to_s == 'github_pages' || deploy_config['host'].to_s == 'github_pages'
       end
     end
 

data/lib/awestruct/dependencies.rb

@@ -4,15 +4,30 @@ module Awestruct
 
     attr_reader :page
     attr_reader :dependencies
+    attr_reader :key_dependencies
     attr_reader :dependents
+    attr_reader :key_dependents
+    attr_reader :content_hash
+    attr_reader :key_hash
+    attr_reader :has_changed_content
+    attr_reader :has_changed_keys
 
 
+    def self.track_dependencies=(bol)
+      @track_dependencies = bol
+    end
+
+    def self.should_track_dependencies
+      @track_dependencies
+    end
+
     def self.top_page
       @pages ||= []
       @pages.first
     end
 
     def self.push_page(page)
+      #puts "push #{page.output_path}"
       if ( top_page.nil? )
         page.dependencies.clear
       else
@@ -23,6 +38,7 @@ module Awestruct
 
     def self.pop_page
       page = @pages.pop
+      #puts "pop #{page.output_path} #{@pages.empty?}"
       if ( @pages.empty? && ! page.nil? )
         page.dependencies.persist!
       end
@@ -32,13 +48,58 @@ module Awestruct
     def self.track_dependency(dep)
       return if top_page.nil? 
       return if top_page == dep
+      #puts "dep #{top_page.relative_source_path} - #{dep.relative_source_path}"
       top_page.dependencies.add_dependency(dep)
     end
 
+    def self.track_key_dependency(dep, key)
+      return if !Awestruct::Dependencies.should_track_dependencies
+      return if top_page.nil?
+      return if top_page == dep
+      #puts "dep key #{top_page.relative_source_path} - #{dep.relative_source_path} -> #{key}"
+      #puts Kernel.caller(4)[0]
+      top_page.dependencies.add_key_dependency(dep)
+    end
+
+
     def initialize(page)
       @page = page
       @dependencies = Set.new
+      @key_dependencies   = Set.new
       @dependents   = Set.new
+      @key_dependents   = Set.new
+      @content_hash = nil
+      @key_hash = nil
+      @has_changed_content = false
+      @has_changed_keys = false
+    end
+
+    def key_hash=(key)
+      #puts "key_hash #{key}"
+      if @key_hash.nil?
+        @has_changed_keys = false
+      else
+        if key.eql? @key_hash
+          @has_changed_keys = false
+        else
+          @has_changed_keys = true
+        end
+      end
+      @key_hash = key
+    end
+
+    def content_hash=(key)
+      #puts "content_hash #{key}"
+      if @content_hash.nil?
+        @has_changed_content = false
+      else
+        if key.eql? @content_hash
+          @has_changed_content = false
+        else
+          @has_changed_content = true
+        end
+      end
+      @content_hash = key
     end
 
     def <<(dep)
@@ -53,10 +114,22 @@ module Awestruct
       dep.dependencies.add_dependent( page )
     end
 
+    def add_key_dependency(dep)
+      return if @page.do_not_track_dependencies
+      return if @page.output_path.nil?
+      return if dep == @page
+      @key_dependencies << dep
+      dep.dependencies.add_key_dependent( page )
+    end
+
     def add_dependent(dep)
       @dependents << dep
     end
 
+    def add_key_dependent(dep)
+      @key_dependents << dep
+    end
+
     def remove_dependent(dep)
       @dependents.delete( dep )
     end
@@ -69,10 +142,16 @@ module Awestruct
     def persist!
       return if  page.output_path.nil? || page.output_path == ''
       file = File.join( @page.site.config.dir, '.awestruct', 'dependency-cache', page.output_path )
+      #puts "store #{file}"
       FileUtils.mkdir_p( File.dirname( file ) )
       File.open( file, 'w' ) do |file|
+        file.puts "ch:#{@content_hash}"
+        file.puts "kh:#{@key_hash}"
         @dependencies.collect{|e| e.relative_source_path }.uniq.each do |d|
-          file.puts d unless d.nil?
+          file.puts "c:#{d}" unless d.nil?
+        end
+        @key_dependencies.collect{|e| e.relative_source_path }.uniq.each do |d|
+          file.puts "k:#{d}" unless d.nil?
         end
       end
     end
@@ -84,8 +163,18 @@ module Awestruct
       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?
+            type, path = line.split(':')
+            path.strip!
+            if type.eql? 'c' or type.eql? 'k'
+              d = find_page_by_path( path.strip )
+              unless d.nil?
+                add_dependency( d ) if 'c'.eql? type
+                add_key_dependency( d ) if 'k'.eql? type
+              end
+            else
+              self.content_hash = path if 'ch'.eql? type
+              self.key_hash = path if 'kh'.eql? type
+            end
           end
         end
         return true

data/lib/awestruct/deploy/base_deploy.rb

@@ -0,0 +1,25 @@
+require 'awestruct/deployers'
+require 'git'
+
+module Awestruct
+  module Deploy
+    class Base
+      UNCOMMITTED_CHANGES = "You have uncommitted changes in the working branch. Please commit or stash them."
+      def run
+        git.status.changed.empty? ? publish_site : existing_changes
+      end
+
+      def git
+        @git ||= ::Git.open('.')
+      end
+
+      def publish_site
+        $stderr.puts( "#{self.class.name}#publish_site not implemented." )
+      end
+
+      def existing_changes
+        $stderr.puts UNCOMMITTED_CHANGES
+      end
+    end
+  end
+end

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -1,35 +1,23 @@
-require 'awestruct/deployers'
-require 'git'
+require 'awestruct/deploy/base_deploy'
 
 module Awestruct
   module Deploy
-
-    class GitHubPagesDeploy
+    class GitHubPagesDeploy < Base
       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('.')
+        @repo      = deploy_config[ 'repository' ] || 'origin'
       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
+        current_branch = git.current_branch
         git.branch( @branch ).checkout
+        add_and_commit_site @site_path
+        git.push( @repo, @branch )
+        git.checkout( current_branch )
       end
 
+      private
       def add_and_commit_site( path )
         git.with_working( path ) do
           git.add(".")
@@ -39,21 +27,7 @@ module Awestruct
             $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

data/lib/awestruct/deploy/rsync_deploy.rb

@@ -1,19 +1,30 @@
-require 'awestruct/deployers'
-
+require 'awestruct/deploy/base_deploy'
+require 'shellwords'
 require 'open3'
 
 module Awestruct
   module Deploy
-    class RSyncDeploy
+    class RSyncDeploy < Base
 
       def initialize(site_config, deploy_config)
         @site_path = File.join( site_config.output_dir, '/' ).gsub(/^\w:\//, '/')
         @host      = deploy_config['host']
         @path      = File.join( deploy_config['path'], '/' )
+        @exclude   = deploy_config['exclude']
       end
 
-      def run
-        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+sx,ug+rw --delete #{@site_path} #{@host}:#{@path}"
+      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}"
+
+        # Shellwords mangles windows  rsync command so we need to skip shell words
+        if(RUBY_PLATFORM !~ /mingw/)
+          cmd = Shellwords.escape(cmd)
+        end
+
         Open3.popen3( cmd ) do |stdin, stdout, stderr|
           stdin.close
           threads = []

data/lib/awestruct/deploy/s3_deploy.rb

@@ -0,0 +1,14 @@
+require 'awestruct/deploy/base_deploy'
+
+module Awestruct
+  module Deploy
+    class S3Deploy < Base
+      def initialize( site_config, deploy_config )
+        @site_path = site_config.output_dir
+      end
+    end
+  end
+end
+
+Awestruct::Deployers.instance[ :s3 ] = Awestruct::Deploy::S3Deploy
+

data/lib/awestruct/engine.rb

@@ -198,6 +198,11 @@ module Awestruct
       Compass.configuration.css_dir         = site.css_dir
       Compass.configuration.javascripts_dir = 'javascripts'
       Compass.configuration.images_dir      = 'images'
+      Compass.configuration.line_comments   = include_line_comments?
+    end
+
+    def include_line_comments?
+      site.key?(:compass_line_comments) ? !!site.compass_line_comments : !site.profile.eql?('production')
     end
 
     def load_pages
@@ -243,20 +248,56 @@ module Awestruct
       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}"
+      if !page.output_path.nil?
+        generate_page_internal(page)
+      end
+
+      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 "--------------------"
+      }
 
       regen_pages = Set.new
-      regen_pages << page unless ( page.output_path.nil? )
-      regen_pages += page.dependencies.dependents
+      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}"
+        xt = 0
+        yt = 0
+        xt = File.mtime(xf).to_i if File.exist? xf
+        yt = File.mtime(yf).to_i if File.exist? yf
+
+        yt <=> xt
+      end
+
+      puts "Starting regeneration of content dependent pages:" if regen_pages.size > 0
+      regen_pages.each{|x| puts x.output_path}
 
-      #puts regen_pages.collect{|e|e.output_path}.inspect
       regen_pages.each do |p|
+        generate_page_internal(p)
+      end
+    end
+
+    def generate_page_internal(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
 
     ####