awestruct 0.5.5 → 0.5.6.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42707b3e65d935704a6a4b4e70950897dbe43c26
-  data.tar.gz: e51aab1ecb9a80daf22f5cad51a01150a4b546e9
+  metadata.gz: eb0a51f409f8009c7c325d9d2e7acea5437e2c1e
+  data.tar.gz: e392c0a5f0fd4252953d61a0399d548de9f072c3
 SHA512:
-  metadata.gz: 910fb313268c6b32697d557cf7864ed609027a53231df08859dce06e8e8667613286d0360341668b5a90f4a0ad2417b47f68fe7a2ee19aa89713bb9663e3881a
-  data.tar.gz: 0136ae84bbea1d15b311f0c627d40e7f810446cad2a64b2f98dc0dd280515ee521e3abfe5d08739958b549ae093d1b03125d07bf6596b18f213f386fbf3e214a
+  metadata.gz: 0b818f8b17abc86d8f471b52b0d3e8e2820d77619a3492c9ca47d34a4a47961a07891bc73b4fa7d3a7b7baebfee4a00bbff2d5933a7ffd8eb8bca6055804b925
+  data.tar.gz: 3a7dd3521dbe40d059c79a12edcc51d36a2c6d7aa7da2b54b4ea6dd557885615a46a855436d6ef71a3882a2585fbadb7251bd42ca5b3f00f0317b115fdaef4f2

data/Gemfile

@@ -1,13 +1,12 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'spectator', '~> 1.2.6'
   gem 'hashery', '~> 2.1.1'
   gem 'rspec', '~> 2.14.1'
   gem 'rake', '~> 10.2.2'
   gem 'guard-rspec', '~> 4.2.0', :require => false
-  gem 'pry', '~> 0.9.12', :require => false
-  gem 'pry-nav', '~> 0.2', :require => false
+  gem 'pry', :require => false
+  gem 'pry-byebug', :require => false
 end
 
 group :test do
@@ -18,7 +17,7 @@ group :test do
   gem 'asciidoctor', '~> 0.1.4'
   gem 'slim', '~> 2.0.2'
   gem 'kramdown', '~> 1.3.3'
-  gem 'therubyracer', '~> 0.10.0', :platforms => :ruby
+  gem 'therubyracer', '~> 0.12.1', :platforms => :ruby
   gem 'therubyrhino', '~> 2.0.3', :platforms => :jruby
   gem 'less', '~> 2.5.0'
   gem 'org-ruby', '~> 0.9.3'

data/Rakefile

@@ -94,7 +94,3 @@ task :release => [ :build, :tag ] do
   sh "gem push pkg/#{gem_file}"
 end
 
-desc 'Run `spectator` to monitor changes and execute specs in TDD fashion'
-task :tdd do
-  sh 'spectator'
-end

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2014-04-23'
+  s.date          = '2014-09-26'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']
@@ -41,11 +41,12 @@ Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if
   s.add_dependency 'bootstrap-sass', '~> 3.1.1.0'
   s.add_dependency 'zurb-foundation', '~> 4.3.2'
   s.add_dependency 'mime-types', '~> 2.1'
-  s.add_dependency 'rest-client', '~> 1.6.7'
+  s.add_dependency 'rest-client', '~> 1.7.2'
   s.add_dependency 'ruby-s3cmd', '~> 0.1.5'
   s.add_dependency 'listen', '~> 2.7.1'
   s.add_dependency 'rack', '~> 1.5.2'
   s.add_dependency 'git', '~> 1.2.6'
   s.add_dependency 'guard-livereload', '~> 2.1.2'
   s.add_dependency 'colorize', '~> 0.7.1'
+  s.add_dependency 'parallel', '> 1.1.1'
 end

data/lib/awestruct/cli/auto.rb

@@ -83,6 +83,11 @@ module Awestruct
         listener.ignore( %r(\.awestruct) )
         listener.ignore( %r(^#{File.basename( @config.tmp_dir )}) )
         listener.ignore( %r(^#{File.basename( @config.output_dir )}) )
+
+        @config.ignore.each do |i|
+          listener.ignore( %r(^#{i}) )
+        end
+
         listener.start
       end
 

data/lib/awestruct/cli/invoker.rb

@@ -26,8 +26,8 @@ module Awestruct
         @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 = Logger.new(Awestruct::AwestructLoggerMultiIO.new(@options.debug, STDOUT, File.open('.awestruct/debug.log', 'w')))
+        $LOG.level = @options.debug ? Logger::DEBUG : Logger::INFO
         $LOG.formatter = Awestruct::AwestructLogFormatter.new
 
         # these requires are deferred until after $LOG is set

data/lib/awestruct/cli/options.rb

@@ -35,6 +35,7 @@ module Awestruct
       attr_accessor :source_dir
       attr_accessor :output_dir
       attr_accessor :livereload
+      attr_accessor :debug
 
       def initialize()
         @generate   = nil
@@ -63,6 +64,9 @@ module Awestruct
 
       def parse!(args)
         opts = OptionParser.new do |opts|
+          opts.on('-D', '--debug', 'Enable debug logging') do |verbose|
+            self.debug = true
+          end
           opts.on('-w', '--verbose', 'Enable verbose mode') do |verbose|
             self.verbose = true
           end

data/lib/awestruct/engine.rb

@@ -1,4 +1,5 @@
 require 'awestruct/util/inflector'
+require 'awestruct/util/exception_helper'
 require 'awestruct/util/default_inflections'
 
 require 'awestruct/config'
@@ -12,10 +13,10 @@ require 'awestruct/extensions/pipeline'
 
 require 'fileutils'
 require 'set'
+require 'date'
 
 require 'compass'
-
-require 'pry'
+require 'parallel'
 
 class OpenStruct
   def inspect
@@ -68,6 +69,7 @@ module Awestruct
       $LOG.debug 'load_pages' if $LOG.debug?
       load_pages
       $LOG.debug 'execute_pipeline' if $LOG.debug?
+      $LOG.info 'Excecuting pipeline...' if $LOG.info?
       execute_pipeline
       $LOG.debug 'configure_compass' if $LOG.debug?
       configure_compass
@@ -76,7 +78,9 @@ module Awestruct
       $LOG.debug 'build_page_index' if $LOG.debug?
       build_page_index
       $LOG.debug 'generate_output' if $LOG.debug?
+      $LOG.info 'Generating pages...' if $LOG.info?
       generate_output
+      return 0
     end
 
     def build_page_index
@@ -128,32 +132,42 @@ module Awestruct
 
     def load_site_yaml(yaml_path, profile = nil)
       if ( File.exist?( yaml_path ) )
-        data = YAML.load( File.read( yaml_path, :encoding => 'bom|utf-8' ) )
-        if ( profile )
-          # 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? ) )
-              profile_data = ( v[profile] || {} )
-            else
+        begin
+          data = YAML.load( File.read( yaml_path, :encoding => 'bom|utf-8' ) )
+          if ( profile )
+            # 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? ) )
+                profile_data = ( v[profile] || {} )
+              else
+                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}=", merge_data( site.send( "#{k}" ), v ) )
             end
-          end if data
-          site.profile = profile
-          profile_data.each do |k,v|
-            site.send( "#{k}=", merge_data( site.send( "#{k}" ), v ) )
+          else
+            data.each do |k,v|
+              site.send( "#{k}=", v )
+            end if data
           end
-        else
-          data.each do |k,v|
-            site.send( "#{k}=", v )
-          end if data
+        rescue Exception => e
+          ExceptionHelper.log_building_error e, yaml_path
+          ExceptionHelper.mark_failed
         end
       end
     end
 
     def load_yaml(yaml_path)
-      data = YAML.load( File.read( yaml_path ) )
+      begin
+        data = YAML.load( File.read( yaml_path ) )
+      rescue Exception => e
+        ExceptionHelper.log_building_error e, yaml_path
+        ExceptionHelper.mark_failed
+      end
       name = File.basename( yaml_path, '.yml' )
       site.send( "#{name}=", massage_yaml( data ) )
     end
@@ -267,7 +281,7 @@ module Awestruct
 
     def generate_output
       FileUtils.mkdir_p( site.config.output_dir )
-      @site.pages.each do |page|
+      Parallel.each(@site.pages, :in_processes => Parallel.processor_count) do |page|
         generated_path = File.join( site.config.output_dir, page.output_path )
         if ( page.stale_output?( generated_path ) )
           generate_page( page, generated_path )
@@ -279,7 +293,7 @@ module Awestruct
 
     def generate_page(page, generated_path, produce_output=true)
       if ( produce_output )
-        $LOG.info "Generating: #{generated_path}" if $LOG.info? && !config.quiet
+        $LOG.debug "Generating: #{generated_path}" if $LOG.debug? && config.verbose
         FileUtils.mkdir_p( File.dirname( generated_path ) )
 
         c = page.rendered_content

data/lib/awestruct/extensions/pipeline.rb

@@ -56,6 +56,11 @@ module Awestruct
         end
       end
 
+      private
+      def site
+        Awestruct::Engine.instance.site
+      end
+
     end
   end
 end

data/lib/awestruct/extensions/tag_cloud.rb

@@ -7,10 +7,11 @@ module Awestruct
         @output_path = output_path
         @layout = opts[:layout].to_s
         @title  = opts[:title] || 'Tags'
+        @template = opts[:template] || File.join( File.dirname( __FILE__ ), 'tag_cloud.html.haml' )
       end
 
       def execute(site)
-        page = site.engine.load_page( File.join( File.dirname( __FILE__ ), 'tag_cloud.html.haml' ) )
+        page = site.engine.load_page( @template )
         page.output_path = File.join( @output_path )
         page.layout = @layout
         page.title  = @title

data/lib/awestruct/handlers/asciidoctor_handler.rb

@@ -89,7 +89,8 @@ module Awestruct
           collector["site-#{key}"] = "#{val}@" if types.detect {|t| val.kind_of? t }
           collector
         })
-        opts[:attributes]['awestruct'] = true
+        opts[:attributes]['env'] = @site
+        opts[:attributes]['env-site'] = true
         opts[:attributes]['awestruct-version'] = Awestruct::VERSION
         if @front_matter['header_footer']
           opts[:header_footer] = true

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -14,14 +14,13 @@ module Awestruct
       def match(path)
         matcher = ::Tilt[File.basename(path)]
         if matcher.nil?
-	  $LOG.warn(%(Copying #{path}))
+          $LOG.warn(%(Copying #{path})) if $LOG.warn? && Awestruct::Engine.instance.config.verbose
           return false
         end
 
         # We have our own extra integration with Asciidoctor
-        if matcher.name.include? 'Asciidoctor'
-          return false
-        end
+        return false if matcher.name.include? 'Asciidoctor'
+
         matcher
       end
     end
@@ -141,9 +140,9 @@ module Awestruct
         rescue Exception => e
           error_page = context[:page]
           if error_page[:__is_layout] == true
-	    ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
+            ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
           else
-	    ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
+            ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
           end
           ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.5'
+  VERSION = '0.5.6.beta'
 end

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -106,6 +106,7 @@ describe Awestruct::Handlers::TiltHandler do
   context 'when loading an engine not installed' do
     specify 'should not throw exceptions; instead have the error in the rendered output' do
       # setup
+      Awestruct::Engine.instance.config.verbose = true
       Tilt::register Tilt::BogusTemplate, '.bogus',
       log = StringIO.new
       $LOG = Logger.new(log)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6.beta
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -147,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: ruby-s3cmd
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Awestruct is a static site baking and publishing tool. It supports an
   extensive list of both templating and markup languages via Tilt (Haml, Slim, AsciiDoc,
   Markdown, Sass via Compass, etc), provides mobile-first layout and styling via Bootstrap
@@ -512,9 +526,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - |
   Any markup languages you are using and its dependencies.