awestruct 0.4.8 → 0.5.0.cr

data/lib/awestruct/astruct.rb

@@ -17,6 +17,10 @@ module Awestruct
       "AStruct{...}"
     end
 
+    def hash()
+      self.output_path.hash
+    end
+
   end
 
 end

data/lib/awestruct/astruct_mixin.rb

@@ -43,6 +43,9 @@ module Awestruct
           self[name] = AStruct.new.cascade_for_nils!
           self[name]
         else
+          unless args.size.zero?
+            $LOG.warn "Call to unknown method: #{name}"
+          end
           nil
         end
       end

data/lib/awestruct/cli/auto.rb

@@ -26,7 +26,7 @@ module Awestruct
               begin
                 if path.eql? current_path
                   unless generate_thread.nil?
-                    puts "Same path triggered, stopping previous generation" if generate_thread.alive?
+                    $LOG.info "Same path triggered, stopping previous generation" if generate_thread.alive? && $LOG.info?
                     generate_thread.kill
                   end
                 else
@@ -37,15 +37,15 @@ module Awestruct
                 generate_thread = Thread.new {
                   begin
                     engine.generate_page_by_output_path( path )
-                    puts "Generating.... done!"
+                    $LOG.info "Generating.... done!" if $LOG.info?
                   rescue => e
-                    puts e
-                    puts e.backtrace
+                    $LOG.error e if $LOG.error?
+                    $LOG.error e.backtrace.join("\n") if $LOG.error?
                   end
                 }
               rescue => e
-                puts e
-                puts e.backtrace
+                $LOG.error e if $LOG.error?
+                $LOG.error e.backtrace.join("\n") if $LOG.error?
               end
             end
           end

data/lib/awestruct/cli/deploy.rb

@@ -14,7 +14,7 @@ module Awestruct
         @site_config   = site_config
         @deploy_config = deploy_config
         @deploy_config['type'] ||= (is_github? ? :github_pages : :rsync)
-        puts "Deploying to #{deploy_type}"
+         $LOG.info "Deploying to #{deploy_type}" if $LOG.info?
       end
 
       def deploy_type
@@ -25,8 +25,8 @@ module Awestruct
         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(', ')}"
+          $LOG.error "Unable to locate correct deployer for #{deploy_type}" if $LOG.error?
+          $LOG.error "Deployers available for #{::Awestruct::Deployers.instance.collect {|k,v| "#{v} (#{k})"}.join(', ')}" if $LOG.error?
           return
         end
   

data/lib/awestruct/cli/generate.rb

@@ -1,4 +1,6 @@
 require 'awestruct/engine'
+require 'compass'
+require 'ninesixty'
 
 module Awestruct
   module CLI
@@ -15,11 +17,11 @@ module Awestruct
       def run()
         begin
           base_url = @profile['base_url'] || @default_base_url
-          puts "Generating site: #{base_url}"
+          $LOG.info "Generating site: #{base_url}" if $LOG.info?
           @engine.run( @profile, @base_url, ( @profile ? @profile['base_url'] || @default_base_url : @default_base_url ), @force )
         rescue =>e
-          puts e
-          puts e.backtrace
+          $LOG.error e if $LOG.error?
+          $LOG.error e.backtrace.join("\n") if $LOG.error?
           return false
         end
       end

data/lib/awestruct/cli/init.rb

@@ -27,7 +27,7 @@ module Awestruct
         if ( @scaffold )
           manifest.copy_file( '_layouts/base.html.haml', 
                               File.join( File.dirname(__FILE__), "/../frameworks/#{scaffold_name}/base_layout.html.haml" ) )
-          if ( File.file? File.join( File.dirname(__FILE__), "/frameworks/#{scaffold_name}/base_index.html.haml" ) )
+          if ( File.file? File.join( File.dirname(__FILE__), "/../frameworks/#{scaffold_name}/base_index.html.haml" ) )
             manifest.copy_file( 'index.html.haml', 
                                 File.join( File.dirname(__FILE__), "/../frameworks/#{scaffold_name}/base_index.html.haml" ) )
           else

data/lib/awestruct/cli/invoker.rb

@@ -5,8 +5,10 @@ require 'awestruct/cli/generate'
 require 'awestruct/cli/auto'
 require 'awestruct/cli/server'
 require 'awestruct/cli/deploy'
+require 'awestruct/logger'
 
 require 'pathname'
+require 'logger'
 
 module Awestruct
   module CLI
@@ -28,6 +30,11 @@ module Awestruct
         @threads = []
         @profile = nil
         @success = true
+        logging_path = Pathname.new '.awestruct'
+        logging_path.mkdir unless logging_path.exist?
+        $LOG = Logger.new(Awestruct::AwestructLoggerMultiIO.new(@options.verbose, STDOUT, File.open('.awestruct/debug.log', 'w')))
+        $LOG.level = @options.verbose ? Logger::DEBUG : Logger::INFO
+        $LOG.formatter = Awestruct::AwestructLogFormatter.new
       end
 
       def invoke!
@@ -68,11 +75,11 @@ module Awestruct
         end
  
         unless @profile
-          $stderr.puts "Unable to locate profile: #{options.profile}" if options.profile
+          $LOG.error "Unable to locate profile: #{options.profile}" if options.profile && $LOG.error?
           options.profile = 'NONE'
           @profile = {}
         end 
-        $stderr.puts "Using profile: #{options.profile}"
+        $LOG.info "Using profile: #{options.profile}" if $LOG.info?
       end
 
       def setup_config()
@@ -101,7 +108,7 @@ module Awestruct
         deploy_config = profile[ 'deploy' ]
 
         if ( deploy_config.nil? )
-          $stderr.puts "No configuration for 'deploy'"
+          $LOG.error "No configuration for 'deploy'" if $LOG.error?
           return
         end
 

data/lib/awestruct/cli/manifest.rb

@@ -16,7 +16,7 @@ class Compass::AppIntegration::StandAlone::Installer
     # no!
   end
   def finalize(opts={})
-    puts <<-END.gsub(/^ {6}/, '')
+    $LOG.info <<-END.gsub(/^ {6}/, '')
 
       Now you're awestruct!
 
@@ -67,8 +67,8 @@ module Awestruct
           begin
             step.perform( dir )
           rescue => e
-            puts e
-            puts e.backtrace
+            $LOG.error e if $LOG.error?
+            $LOG.error e.backtrace.join("\n") if $LOG.error?
           end
         end
       end
@@ -78,8 +78,8 @@ module Awestruct
           begin
             step.unperform( dir )
           rescue => e
-            puts e
-            puts e.backtrace
+            $LOG.error e if $LOG.error?
+            $LOG.error e.backtrace.join("\n") if $LOG.error?
           end
         end
       end
@@ -97,32 +97,32 @@ module Awestruct
         def perform(dir)
           p = File.join( dir, @path ) 
           if ( File.exist?( p ) )
-            $stderr.puts "Exists: #{p}"
+            $LOG.error "Exists: #{p}" if $LOG.error?
             return
           end
           if ( ! File.directory?( File.dirname( p ) ) )
-            $stderr.puts "Does not exist: #{File.dirname(p)}"
+            $LOG.error "Does not exist: #{File.dirname(p)}" if $LOG.error?
             return
           end
-          $stderr.puts "Create directory: #{p}"
+          $LOG.info "Create directory: #{p}" if $LOG.info?
           FileUtils.mkdir( p )
         end
 
         def unperform(dir)
           p = File.join( dir, @path ) 
           if ( ! File.exist?( p ) )
-            $stderr.puts "Does not exist: #{p}"
+            $LOG.error "Does not exist: #{p}" if $LOG.error?
             return
           end
           if ( ! File.directory?( p ) )
-            $stderr.puts "Not a directory: #{p}"
+            $LOG.error "Not a directory: #{p}" if $LOG.error?
             return
           end
           if ( Dir.entries( p ) != 2 )
-            $stderr.puts "Not empty: #{p}"
+            $LOG.error "Not empty: #{p}" if $LOG.error?
             return
           end
-          $stderr.puts "Remove: #{p}"
+          $LOG.info "Remove: #{p}" if $LOG.info?
           FileUtils.rmdir( p )
         end
       end
@@ -150,14 +150,14 @@ module Awestruct
         def perform(dir )
           p = File.join( dir, @path )
           if ( File.exist?( p ) )
-            $stderr.puts "Exists: #{p}"
+            $LOG.error "Exists: #{p}" if $LOG.error?
             return
           end
           if ( ! File.directory?( File.dirname( p ) ) )
-            $stderr.puts "No directory: #{File.dirname( p )}"
+            $LOG.error "No directory: #{File.dirname( p )}" if $LOG.error?
             return
           end
-          $stderr.puts "Create file: #{p}"
+          $LOG.info "Create file: #{p}" if $LOG.info?
           File.open( p, 'w' ){|f| f.write( File.read( @input_path ) ) }
         end
 
@@ -168,10 +168,10 @@ module Awestruct
         def notunperform(dir)
           p = File.join( @dir, p )
           if ( ! File.exist?( p ) )
-            $stderr.puts "Does not exist: #{p}"
+            $LOG.error "Does not exist: #{p}" if $LOG.error?
             return
           end
-          $stderr.puts "Remove: #{p}"
+          $LOG.info "Remove: #{p}" if $LOG.info?
           FileUtils.rm( p )
         end
 
@@ -193,6 +193,7 @@ module Awestruct
                   :css_dir=>'_site/stylesheets',
                   :sass_dir=>'stylesheets',
                   :images_dir=>'images',
+                  :fonts_dir=>'fonts',
                   :javascripts_dir=>'javascripts',
                 } )
           cmd.perform

data/lib/awestruct/cli/options.rb

@@ -36,6 +36,7 @@ module Awestruct
         @profile   = nil
         @deploy    = false
         @script    = nil
+        @verbose   = false
       end
 
       def self.parse!(args)
@@ -66,14 +67,14 @@ module Awestruct
           opts.on( '-u', '--url URL', 'Set site.base_url' ) do |url|
             self.base_url = url
           end
-          opts.on( '-d', '--dev',     'Run in development mode (--auto, --server and -profile development)' ) do |url|
+          opts.on( '-d', '--dev',     'Run site in development mode (--auto, --server, --port 4242 and --profile development)' ) do |url|
             self.server   = true
             self.auto     = true
             self.port     = 4242
             self.profile  = 'development'
           end
 
-          opts.on( '-P', '--profile PROFILE', 'Specify a profile' ) do |profile|
+          opts.on( '-P', '--profile PROFILE', 'Activate a configuration profile' ) do |profile|
             self.profile = profile
           end
       
@@ -91,12 +92,12 @@ module Awestruct
           opts.on( '-b', '--bind ADDR', 'Server address (default: 0.0.0.0)' ) do |bind_addr|
             self.bind_addr = bind_addr
           end
-          opts.on( '-g', '--[no-]generate', 'Generated site' ) do |g|
+          opts.on( '-g', '--[no-]generate', 'Generate site' ) do |g|
             self.generate = g
           end
-          opts.on( '--run SCRIPT', 'Force a regeneration' ) do |script|
-            self.script = script
-          end
+          #opts.on( '--run SCRIPT', 'Invoke a script after initialization' ) do |script|
+          #  self.script = script
+          #end
       
           opts.separator ''
           opts.separator "Common options:"

data/lib/awestruct/cli/server.rb

@@ -1,13 +1,9 @@
-#require 'webrick'
-require 'thin'
+require 'rack'
+require 'rack/server'
 require 'awestruct/rack/app'
 
 module Awestruct
   module CLI
-
-    #WEBrick::HTTPUtils::DefaultMimeTypes.store('atom', 'application/atom+xml')
-    #WEBrick::HTTPUtils::DefaultMimeTypes.store('appcache', 'text/cache-manifest')
-
     class Server
       attr_reader :server
 
@@ -18,14 +14,11 @@ module Awestruct
       end
 
       def run
-        @server = Thin::Server.new( '0.0.0.0', @port, Awestruct::Rack::App.new( @path ) )
-        @server.start
-      end
-
-      def run_webrick
-        @server = WEBrick::HTTPServer.new( :DocumentRoot=>@path, :Port=>@port, :BindAddress=>@bind_addr )
-        @server.start
-      end
+        ::Rack::Server::start( :app => Awestruct::Rack::App.new( @path ),
+                              :Port => @port,
+                              :Host => @bind_addr
+                             )
+      end 
     end
   end
 end

data/lib/awestruct/config.rb

@@ -32,7 +32,13 @@ module Awestruct
       @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)] : []
+      # Dir[] doesn't like empty list
+      ignore_file = File.join(dir, ".awestruct_ignore")
+      if File.exists?(ignore_file)
+        ignore_stmts = IO.read(ignore_file).each_line.map(&:strip)
+      end
+
+      @ignore         = (!ignore_stmts.nil? and ignore_stmts.size > 0) ? Dir[*ignore_stmts] : []
 
       @track_dependencies = false
     end

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

@@ -0,0 +1,30 @@
+content_syntax:
+  coffee: coffeescript
+  md: markdown
+  mkd: markdown
+  org: orgmod
+  adoc: asciidoc
+  ad: asciidoc
+
+haml:
+  :attr_wrapper: '"' 
+  :escape_attrs: :once
+  :format: :xhtml
+
+haml|html:
+  :format: :html5
+
+slim:
+  :sort_attrs: false
+  :disable_escape: true
+  :format: :xhtml
+
+slim|html:
+  :format: :html5
+
+asciidoctor:
+  :backend: html5
+  :safe: 1
+  :attributes:
+    imagesdir: /images
+    stylesdir: /stylesheets

data/lib/awestruct/context_helper.rb

@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 
 module Awestruct
   module ContextHelper
@@ -38,24 +38,24 @@ module Awestruct
     end
 
     def fully_qualify_urls(base_url, text)
-      doc = Hpricot( text )
+      doc = Nokogiri::HTML.fragment( text )
 
-      doc.search( "//a" ).each do |a|
+      doc.css( "a" ).each do |a|
         a['href'] = fix_url( base_url, a['href'] ) if a['href']
       end
-      doc.search( "//link" ).each do |link|
+      doc.css( "link" ).each do |link|
         link['href'] = fix_url( base_url, link['href'] )
       end
-      doc.search( "//img" ).each do |img|
+      doc.css( "img" ).each do |img|
         img['src'] = fix_url( base_url, img['src'] )
       end
-      # Hpricot::Doc#to_s output encoding is not necessarily the same as the encoding of text
+
       if RUBY_VERSION.start_with? '1.8'
         doc.to_s
       else
         doc.to_s.tap do |d| 
           d.force_encoding(text.encoding) if d.encoding != text.encoding 
-        end
+        end 
       end
     end
 

data/lib/awestruct/dependencies.rb

@@ -27,10 +27,12 @@ module Awestruct
     end
 
     def self.push_page(page)
-      #puts "push #{page.output_path}"
+      $LOG.debug "push #{page.output_path}" if $LOG.debug?
       if ( top_page.nil? )
+        $LOG.debug "clearing dependencies" if $LOG.debug?
         page.dependencies.clear
       else
+        $LOG.debug "adding page as a dependency to top_page" if $LOG.debug?
         top_page.dependencies.add_dependency( page )
       end
       @pages.push( page )
@@ -38,7 +40,7 @@ module Awestruct
 
     def self.pop_page
       page = @pages.pop
-      #puts "pop #{page.output_path} #{@pages.empty?}"
+      $LOG.debug "pop #{page.output_path} #{@pages.empty?}" if $LOG.debug?
       if ( @pages.empty? && ! page.nil? )
         page.dependencies.persist!
       end
@@ -48,7 +50,7 @@ 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}"
+      $LOG.debug "dep #{top_page.relative_source_path} - #{dep.relative_source_path}" if $LOG.debug?
       top_page.dependencies.add_dependency(dep)
     end
 
@@ -56,8 +58,8 @@ module Awestruct
       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]
+      $LOG.debug "dep key #{top_page.relative_source_path} - #{dep.relative_source_path} -> #{key}" if $LOG.debug?
+      $LOG.debug "callers #{Kernel.caller}" if $LOG.debug?
       top_page.dependencies.add_key_dependency(dep)
     end
 
@@ -75,7 +77,7 @@ module Awestruct
     end
 
     def key_hash=(key)
-      #puts "key_hash #{key}"
+      $LOG.debug "key_hash #{key}" if $LOG.debug?
       if @key_hash.nil?
         @has_changed_keys = false
       else
@@ -89,7 +91,7 @@ module Awestruct
     end
 
     def content_hash=(key)
-      #puts "content_hash #{key}"
+      $LOG.debug "content_hash #{key}" if $LOG.debug?
       if @content_hash.nil?
         @has_changed_content = false
       else
@@ -110,6 +112,7 @@ module Awestruct
       return if @page.do_not_track_dependencies
       return if @page.output_path.nil?
       return if dep == @page
+      $LOG.debug "adding dependency #{dep.source_path} to #{page.source_path}" if $LOG.debug?
       @dependencies << dep
       dep.dependencies.add_dependent( page )
     end
@@ -141,8 +144,8 @@ 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}"
+      file = File.join( @page.site.config.dir.to_s, '.awestruct', 'dependency-cache', page.output_path )
+      $LOG.debug "store #{file}" if $LOG.debug?
       FileUtils.mkdir_p( File.dirname( file ) )
       File.open( file, 'w' ) do |file|
         file.puts "ch:#{@content_hash}"
@@ -159,10 +162,10 @@ module Awestruct
     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}"
+      $LOG.debug "load #{file}" if $LOG.debug?
       if ( File.exist?( file ) )
         File.open( file, 'r' ) do |file|
-          file.lines.each do |line|
+          file.each_line do |line|
             type, path = line.split(':')
             path ||= ""
             path.strip!