awestruct 0.6.0.alpha1 → 0.6.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c6be05537489d0dde74527315af3f2490df09a9
-  data.tar.gz: ac53c8b5c359f8214743bddab97e0af09fbe13da
+SHA256:
+  metadata.gz: f4d8fb9e5ada0854f2b36987d7d5c7e7f65aefb977efb17ce6d94a964d3449b9
+  data.tar.gz: 818e50d79bad2d65fb9927c54dfb86c27fb1d0ddd2eaafc233c7b758ea48076a
 SHA512:
-  metadata.gz: 3aef7394e9c084710473ad3537f3ce9b0211e9defa04174341d4c14010c1a71bd1ece132c28516a0e8bc09e88aa53778d46a200c9782cd08e7b94b96bec3e6ed
-  data.tar.gz: 36508eb8d76bf9c6c94306242ffe822affadebae953490d683241595946c48e152899084405fcbed6efa8034f12f270c8ebd8b468e664b20680ad2b5401df439
+  metadata.gz: 7eac386ac58acc6316f0e037393a818f9e8b186d0720539931ead71c8d95ed7a972d7b9c166604b7b8d0484c2f46dc11e0cf20ec64e009ab9372e626a514d46f
+  data.tar.gz: 14fb03bd96ef61cb1cdecc3e7450fc4a3bebaac21d2cea92190607e7e00bf44edefd55fe08163d26e5bac36eac81bc9081abfc7058fca29d6e34faf29a519348

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          = '2018-03-24'
+  s.date          = '2019-08-19'
 
   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']
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options  = ['--charset=UTF-8']
   s.extra_rdoc_files = 'README.md'
 
-  s.files         = `git ls-files -z -- {lib,man,spec}/* {README,LICENSE}* *{.gemspec,file}`.split("\0")
+  s.files         = `git ls-files -z -- lib/* man/* spec/* README* LICENSE* *.gemspec *file`.split("\0")
   s.test_files    = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
   s.executables   = `git ls-files -z -- bin/*`.split("\0").map {|f| File.basename f }
   s.require_paths = ['lib']

data/lib/awestruct/engine.rb

@@ -435,6 +435,7 @@ module Awestruct
           end
         rescue Exception => e
           Awestruct::ExceptionHelper.log_building_error e, page.relative_source_path
+          return Awestruct::ExceptionHelper::EXITCODES[:generation_error]
         ensure
           return Awestruct::ExceptionHelper::EXITCODES[:generation_error] if c.include? 'Backtrace:'
         end

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.6.0.alpha1'
+  VERSION = '0.6.0.alpha3'
 end

data/spec/awestruct/engine_spec.rb

@@ -217,6 +217,34 @@ describe Awestruct::Engine do
     end
   end
 
+  it "should exit unsuccessfully if page syntax is invalid, using threads" do
+    output_dir = Dir.mktmpdir 'engine-generate-with-errors'
+
+    begin
+      Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+      $LOG = Logging.logger.new 'awestruct'
+      $LOG.add_appenders(
+          Logging.appenders.string_io({level: :info, layout: Logging.layouts.pattern(pattern: "%m\n"),
+                                       color_scheme: :default})
+      )
+      $LOG.level = :debug
+
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = test_data_dir 'engine-generate-syntax-errors'
+      opts.output_dir = output_dir
+      config = Awestruct::Config.new( opts )
+      engine = Awestruct::Engine.new(config)
+      begin
+        engine.run('development', 'http://localhost:4242', 'http://localhost:4242')
+        fail('Expected generation error')
+      rescue SystemExit => e
+        e.status.should eql Awestruct::ExceptionHelper::EXITCODES[:generation_error]
+      end
+    ensure
+      FileUtils.remove_entry_secure output_dir, true
+    end
+  end
+
   it "should exit unsuccessfully if generate page output fails, using processes" do
     output_dir = Dir.mktmpdir 'engine-generate-with-errors'
 

data/spec/support/test-data/engine-generate-syntax-errors/_config/site.yml

@@ -0,0 +1,26 @@
+profiles:
+  development:
+    show_drafts: false
+    cook: microwave
+    base_url: http://localhost:4242
+  production:
+    show_drafts: true
+    cook: oven
+    asciidoctor:
+      :eruby: erb
+      :attributes:
+        imagesdir: /img
+  staging:
+    compass_line_comments: off
+    compass_output_style: :compact
+    base_url: http://stage.example.com
+
+title: Awestruction!
+intl_name: Internéšnl
+
+asciidoctor:
+  :safe: 0
+  :eruby: erubis
+  :attributes:
+    imagesdir: /assets/images
+    idprefix: ''

data/spec/support/test-data/engine-generate-syntax-errors/_ext/pipeline.rb

@@ -0,0 +1,8 @@
+require 'awestruct/extensions/pipeline'
+
+Awestruct::Extensions::Pipeline.new do
+  # extension Awestruct::Extensions::Posts.new '/news'
+  # extension Awestruct::Extensions::Indexifier.new
+  # Indexifier *must* come before Atomizer
+  # extension Awestruct::Extensions::Atomizer.new :posts, '/feed.atom'
+end

data/spec/support/test-data/engine-generate-syntax-errors/_layouts/base.html.slim

@@ -0,0 +1,6 @@
+doctype html
+html
+  head
+    title Hello
+  body
+    = content

data/spec/support/test-data/engine-generate-syntax-errors/index.html.slim

@@ -0,0 +1,7 @@
+---
+layout: base
+---
+p#intentional-syntax-error
+  - if 2 > 4:
+     = 'hi'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha1
+  version: 0.6.0.alpha3
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -511,6 +511,10 @@ files:
 - spec/support/test-data/engine-generate-no-errors/_ext/pipeline.rb
 - spec/support/test-data/engine-generate-no-errors/_layouts/base.html.slim
 - spec/support/test-data/engine-generate-no-errors/index.html.slim
+- spec/support/test-data/engine-generate-syntax-errors/_config/site.yml
+- spec/support/test-data/engine-generate-syntax-errors/_ext/pipeline.rb
+- spec/support/test-data/engine-generate-syntax-errors/_layouts/base.html.slim
+- spec/support/test-data/engine-generate-syntax-errors/index.html.slim
 - spec/support/test-data/engine-generate-with-errors/_config/site.yml
 - spec/support/test-data/engine-generate-with-errors/_ext/pipeline.rb
 - spec/support/test-data/engine-generate-with-errors/_layouts/base.html.slim
@@ -624,7 +628,7 @@ requirements:
   Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if you're running on MRI. JRuby should be using haml 4.0.0+ with Kramdown.
   Compass and sass are no longer hard dependencies. You'll need too add them on your own should you want them. We also should be able to work with sassc.
 rubyforge_project: awestruct
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Static site baking and publishing tool