awestruct 0.6.0.RC1 → 0.6.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0399037b69ee735bc1afbad093fdc95faa02c153'
-  data.tar.gz: 5bd7ff867e171dd6d96ff218438a5ef0e5b66f53
+  metadata.gz: 6c6be05537489d0dde74527315af3f2490df09a9
+  data.tar.gz: ac53c8b5c359f8214743bddab97e0af09fbe13da
 SHA512:
-  metadata.gz: ab3587a8d9d0bf6d8c129476e2ae598452e5952ba0bea7dfabd603fcd8732974da8db6742864d6fa167bd339d7db73a642b01cf4b23fb5a2d0283d32feae2c12
-  data.tar.gz: 9bd1ab9df76ea3c7fb2feb6ef1b4822fa2c19c2f3b52544dc0fbdbf72ad94a6b4eadeba6d482f533868adfcd3c4714473eabed9db0ee328c0f0fc8d32048cbd0
+  metadata.gz: 3aef7394e9c084710473ad3537f3ce9b0211e9defa04174341d4c14010c1a71bd1ece132c28516a0e8bc09e88aa53778d46a200c9782cd08e7b94b96bec3e6ed
+  data.tar.gz: 36508eb8d76bf9c6c94306242ffe822affadebae953490d683241595946c48e152899084405fcbed6efa8034f12f270c8ebd8b468e664b20680ad2b5401df439

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '>= 2.4.0'
+ruby '~> 2.4.0'
 
 group :development do
   gem 'hashery', '~> 2.1.1'

data/LICENSE.txt

@@ -1,21 +1,18 @@
-MIT License
-
-Copyright (c) 2010-2019 Bob McWhirter and contributors (see git log)
+Copyright (c) 2010-2014 Bob McWhirter and contributors (see git log)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,21 +1,12 @@
-# Awestruct
-[![Gem](https://img.shields.io/gem/v/awestruct)](https://rubygems.org/gems/awestruct)
-[![Gem](https://img.shields.io/gem/dt/awestruct?color=blue)](https://rubygems.org/gems/awestruct)
-[![Build Status](https://secure.travis-ci.org/awestruct/awestruct.png)](https://travis-ci.org/awestruct/awestruct)
+[![Build Status](https://secure.travis-ci.org/awestruct/awestruct.png)](http://travis-ci.org/awestruct/awestruct)
 
-## Requirements
+[![Build Status](https://buildhive.cloudbees.com/job/awestruct/job/awestruct/badge/icon)](https://buildhive.cloudbees.com/job/awestruct/job/awestruct/)
 
-Ruby 2.4 or later
-
-## Getting started
-
-Install Awestruct using `gem install awestruct`. Then you can initialize an Awestruct projet by running `awestruct --init`. To generate the static site use `awestruct generate`.
-
-## For more information
+# For more information
 
 Please see the complete site at <http://awestruct.org/>.
 
-## License
+# License
 
     Copyright (c) 2010-2014 Bob McWhirter and contributors (see git log)
 

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          = '2020-01-21'
+  s.date          = '2018-03-24'
 
   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/config/default-site.yml

@@ -42,7 +42,8 @@ asciidoctor:
 textile:
   :no_span_caps: true
 
-generation: {}
+generation:
+  :in_threads: <%= Parallel.processor_count * 10 %>
 
 profiles:
   development:

data/lib/awestruct/engine.rb

@@ -435,7 +435,6 @@ 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/extensions/posts.rb

@@ -39,10 +39,10 @@ module Awestruct
               day = sprintf( "%02d", date.day )
               page.date = date
               slug = $1
-              if ( page.relative_source_path =~ /^#{@path_prefix}\/(2[0-9]{3})-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
+              if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
                 slug = $4
               end
-            elsif ( page.relative_source_path =~ /^#{@path_prefix}\/(2[0-9]{3})-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
+            elsif ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
               year  = $1
               month = $2
               day   = $3

data/lib/awestruct/handlers/javascript_handler.rb

@@ -21,11 +21,11 @@ module Awestruct
       end
 
       def simple_name
-        File.basename( relative_source_path || path, '.js' )
+        File.basename( relative_source_path, '.js' )
       end
 
       def output_filename
-        File.basename( relative_source_path || path)
+        File.basename( relative_source_path )
       end
 
       def output_extension

data/lib/awestruct/handlers/redirect_handler.rb

@@ -21,7 +21,7 @@ module Awestruct
       end
 
       def simple_name
-        File.basename( relative_source_path || path, '.redirect' ) 
+        File.basename( relative_source_path, '.redirect' ) 
       end
 
       def output_filename

data/lib/awestruct/version.rb

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

data/spec/awestruct/engine_spec.rb

@@ -217,34 +217,6 @@ 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'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.6.0.RC1
+  version: 0.6.0.alpha1
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -511,10 +511,6 @@ 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
@@ -628,7 +624,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.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Static site baking and publishing tool

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

@@ -1,26 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

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

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

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