bridgetown-core 0.14.0 → 0.15.0.beta4

data/lib/bridgetown-core/tags/with.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class WithTag < Liquid::Block
+      def render(context)
+        region_name = @markup.strip
+        context["content_with_region_#{region_name}"] = super
+        ""
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("with", Bridgetown::Tags::WithTag)

data/lib/bridgetown-core/utils.rb

@@ -287,6 +287,50 @@ module Bridgetown
       merged
     end
 
+    # Returns a string that's been reindented so that Markdown's four+ spaces =
+    # code doesn't get triggered for nested Liquid components
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def reindent_for_markdown(input)
+      lines = input.lines
+      return input if lines.first.nil?
+
+      starting_indentation = lines.find { |line| line != "\n" }&.match(%r!^ +!)
+      return input unless starting_indentation
+
+      starting_indent_length = starting_indentation[0].length
+
+      skip_pre_lines = false
+      lines.map do |line|
+        continue_processing = !skip_pre_lines
+
+        if skip_pre_lines
+          skip_pre_lines = false if line.include?("</pre>")
+        end
+        if line.include?("<pre")
+          skip_pre_lines = true
+          continue_processing = false
+        end
+
+        if continue_processing
+          line_indentation = line.match(%r!^ +!).yield_self do |indent|
+            indent.nil? ? "" : indent[0]
+          end
+          new_indentation = line_indentation.rjust(starting_indent_length, " ")
+
+          if %r!^ +!.match?(line)
+            line
+              .sub(%r!^ {1,#{starting_indent_length}}!, new_indentation)
+              .sub(%r!^#{new_indentation}!, "")
+          else
+            line
+          end
+        else
+          line
+        end
+      end.join("")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+
     private
 
     def merge_values(target, overwrite)

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.14.0"
-  CODE_NAME = "Hazelwood"
+  VERSION = "0.15.0.beta4"
+  CODE_NAME = "Overlook"
 end

data/lib/bridgetown-core/watcher.rb

@@ -39,17 +39,21 @@ module Bridgetown
     def build_listener(site, options)
       webpack_path = site.in_root_dir(".bridgetown-webpack")
       FileUtils.mkdir(webpack_path) unless Dir.exist?(webpack_path)
+      plugin_paths_to_watch = site.plugin_manager.plugins_path.select do |path|
+        Dir.exist?(path)
+      end
+
       Listen.to(
         options["source"],
         webpack_path,
-        *site.plugin_manager.plugins_path,
+        *plugin_paths_to_watch,
         ignore: listen_ignore_paths(options),
         force_polling: options["force_polling"],
-        &listen_handler(site)
+        &listen_handler(site, options)
       )
     end
 
-    def listen_handler(site)
+    def listen_handler(site, options)
       proc do |modified, added, removed|
         t = Time.now
         c = modified + added + removed
@@ -59,7 +63,7 @@ module Bridgetown
         Bridgetown.logger.info "", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
 
         c.each { |path| Bridgetown.logger.info "", path["#{site.root_dir}/".length..-1] }
-        process(site, t)
+        process(site, t, options)
       end
     end
 
@@ -95,7 +99,6 @@ module Bridgetown
     # options - A Hash of options passed to the command
     #
     # Returns a list of relative paths from source that should be ignored
-    # rubocop: disable Metrics/AbcSize
     def listen_ignore_paths(options)
       source = Pathname.new(options["source"]).expand_path
       paths  = to_exclude(options)
@@ -117,13 +120,12 @@ module Bridgetown
         end
       end.compact + [%r!^\.bridgetown\-metadata!]
     end
-    # rubocop:enable Metrics/AbcSize
 
     def sleep_forever
       loop { sleep 1000 }
     end
 
-    def process(site, time)
+    def process(site, time, options)
       begin
         Bridgetown::Hooks.trigger :site, :pre_reload, site
         Bridgetown::Hooks.clear_reloadable_hooks
@@ -131,9 +133,14 @@ module Bridgetown
         site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
                                " #{(Time.now - time).ceil(2)} seconds."
-      rescue StandardError => e
-        Bridgetown.logger.warn "Error:", e.message
-        Bridgetown.logger.warn "Error:", "Run bridgetown build --trace for more information."
+      rescue Exception => e
+        Bridgetown.logger.error "Error:", e.message
+
+        if options[:trace]
+          Bridgetown.logger.info e.backtrace.join("\n")
+        else
+          Bridgetown.logger.warn "Error:", "Use the --trace option for more information."
+        end
       end
       Bridgetown.logger.info ""
     end

data/lib/site_template/Gemfile.erb

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Hello! This is where you manage which Bridgetown version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Bridgetown with `bundle exec`, like so:
+#
+#   bundle exec bridgetown serve
+#
+# This will help ensure the proper Bridgetown version is running.
+#
+# To install a plugin, simply run bundle add and specify the group
+# "bridgetown_plugins". For example:
+#
+#   bundle add some-new-plugin -g bridgetown_plugins
+#
+# Happy Bridgetowning!
+
+gem "bridgetown", "~> <%= Bridgetown::VERSION %>"

data/lib/site_template/bridgetown.config.yml

@@ -10,12 +10,14 @@
 # For reloadable site metadata like title, SEO description, social media
 # handles, etc., take a look at src/_data/site_metadata.yml
 #
-# If you need help with YAML syntax, here are some quick references for you: 
+# If you need help with YAML syntax, here are some quick references for you:
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
 # https://learnxinyminutes.com/docs/yaml/
 #
 
 baseurl: "" # OPTIONAL: the subpath of your site, e.g. /blog
-url: "" # the base hostname & protocol for your site, e.g. http://example.com
+url: "" # the base hostname & protocol for your site, e.g. https://example.com
 
-# Additional build settings go here
+permalink: pretty
+
+# timezone: America/Los_Angeles

data/lib/site_template/package.json

@@ -14,6 +14,7 @@
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-decorators": "^7.10.1",
     "@babel/plugin-transform-runtime": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
     "babel-loader": "^8.1.0",

data/lib/site_template/src/_components/footer.liquid

@@ -0,0 +1,3 @@
+<footer>
+  Contact me at {{ metadata.email }}
+</footer>

data/lib/site_template/src/_components/head.liquid

@@ -0,0 +1,9 @@
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+{% capture page_title %}{{ title | strip_html | strip_newlines }}{% endcapture %}
+<title>{% if page_title != "" %}{{ page_title | escape }} | {{ metadata.title | escape }}{% else %}{{ metadata.title | escape }}: {{ metadata.tagline | escape }}{% endif %}</title>
+
+<meta name="description" content="{{ metadata.description }}" />
+
+<link rel="stylesheet" href="{% webpack_path css %}" />
+<script src="{% webpack_path js %}" defer></script>

data/lib/site_template/src/_layouts/default.html

@@ -1,15 +1,15 @@
 <!doctype html>
 <html lang="en">
   <head>
-    {% include head.html %}
+    {% render "head", metadata: site.metadata, title: page.title %}
   </head>
   <body class="{{ page.layout }} {{ page.page_class }}">
-    {% include navbar.html %}
+    {% render "navbar", metadata: site.metadata, page: page %}
 
     <main>
       {{ content }}
     </main>
 
-    {% include footer.html %}
+    {% render "footer", metadata: site.metadata %}
   </body>
 </html>

data/lib/site_template/start.js

@@ -14,4 +14,4 @@ concurrently([
 ], {
   restartTries: 3,
   killOthers: ['failure', 'success'],
-}).then(() => { console.log("Done.") }, () => {});
+}).then(() => { console.log("Done.");console.log('\033[0G'); }, () => {});

data/lib/site_template/webpack.config.js

@@ -36,7 +36,8 @@ module.exports = {
           options: {
             presets: ["@babel/preset-env"],
             plugins: [
-              "@babel/plugin-proposal-class-properties",
+              ["@babel/plugin-proposal-decorators", { "legacy": true }],
+              ["@babel/plugin-proposal-class-properties", { "loose" : true }],
               [
                 "@babel/plugin-transform-runtime",
                 {
@@ -57,8 +58,7 @@ module.exports = {
             options: {
               sassOptions: {
                 includePaths: [
-                  path.resolve(__dirname, "src/_components"),
-                  path.resolve(__dirname, "src/_includes"),
+                  path.resolve(__dirname, "src/_components")
                 ],
               },
             },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -137,47 +151,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: liquid-render-tag
+  name: liquid-component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: liquid-render-tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: mercenary
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pathutil
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Bridgetown is a Webpack-aware, Ruby-powered static site generator for
   the modern Jamstack era
 email: maintainers@bridgetownrb.com
@@ -249,14 +277,19 @@ files:
 - lib/bridgetown-core/cache.rb
 - lib/bridgetown-core/cleaner.rb
 - lib/bridgetown-core/collection.rb
-- lib/bridgetown-core/command.rb
+- lib/bridgetown-core/commands/apply.rb
+- lib/bridgetown-core/commands/base.rb
 - lib/bridgetown-core/commands/build.rb
 - lib/bridgetown-core/commands/clean.rb
+- lib/bridgetown-core/commands/concerns/actions.rb
+- lib/bridgetown-core/commands/concerns/build_options.rb
+- lib/bridgetown-core/commands/concerns/configuration_overridable.rb
+- lib/bridgetown-core/commands/concerns/summarizable.rb
 - lib/bridgetown-core/commands/console.rb
 - lib/bridgetown-core/commands/doctor.rb
-- lib/bridgetown-core/commands/help.rb
 - lib/bridgetown-core/commands/new.rb
 - lib/bridgetown-core/commands/plugins.rb
+- lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
 - lib/bridgetown-core/concerns/convertible.rb
@@ -330,6 +363,7 @@ files:
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
 - lib/bridgetown-core/tags/webpack_path.rb
+- lib/bridgetown-core/tags/with.rb
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
@@ -342,6 +376,7 @@ files:
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
 - lib/site_template/.gitignore
+- lib/site_template/Gemfile.erb
 - lib/site_template/bridgetown.config.yml
 - lib/site_template/frontend/javascript/index.js
 - lib/site_template/frontend/styles/index.scss
@@ -349,11 +384,10 @@ files:
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
 - lib/site_template/src/404.html
-- lib/site_template/src/_components/.keep
+- lib/site_template/src/_components/footer.liquid
+- lib/site_template/src/_components/head.liquid
+- lib/site_template/src/_components/navbar.liquid
 - lib/site_template/src/_data/site_metadata.yml
-- lib/site_template/src/_includes/footer.html
-- lib/site_template/src/_includes/head.html
-- lib/site_template/src/_includes/navbar.html
 - lib/site_template/src/_layouts/default.html
 - lib/site_template/src/_layouts/home.html
 - lib/site_template/src/_layouts/page.html

data/lib/bridgetown-core/command.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  class Command
-    class << self
-      # A list of subclasses of Bridgetown::Command
-      def subclasses
-        @subclasses ||= []
-      end
-
-      # Keep a list of subclasses of Bridgetown::Command every time it's inherited
-      # Called automatically.
-      #
-      # base - the subclass
-      #
-      # Returns nothing
-      def inherited(base)
-        subclasses << base
-        super(base)
-      end
-
-      # Run Site#process and catch errors
-      #
-      # site - the Bridgetown::Site object
-      #
-      # Returns nothing
-      def process_site(site)
-        site.process
-      rescue Bridgetown::Errors::FatalException => e
-        Bridgetown.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-        Bridgetown.logger.error "", "------------------------------------"
-        Bridgetown.logger.error "", e.message
-        exit(1)
-      end
-
-      # Create a full Bridgetown configuration with the options passed in as overrides
-      #
-      # options - the configuration overrides
-      #
-      # Returns a full Bridgetown configuration
-      def configuration_from_options(options)
-        return options if options.is_a?(Bridgetown::Configuration)
-
-        Bridgetown.configuration(options)
-      end
-
-      # Add common options to a command for building configuration
-      #
-      # cmd - the Bridgetown::Command to add these options to
-      #
-      # Returns nothing
-      # rubocop:disable Metrics/MethodLength
-      def add_build_options(cmd)
-        cmd.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
-                   Array, "Custom configuration file"
-        cmd.option "source", "-s", "--source [DIR]",
-                   "Source directory (defaults to src)"
-        cmd.option "destination", "-d", "--destination [DIR]",
-                   "Destination directory (defaults to output)"
-        cmd.option "root_dir", "-r", "--root_dir [DIR]", "The top-level root folder" \
-                    " where config files are located"
-        cmd.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array,
-                   "Plugins directory (defaults to plugins)"
-        cmd.option "layouts_dir", "--layouts [DIR]", String,
-                   "Layouts directory (defaults to src/_layouts)"
-        cmd.option "future", "--future", "Publishes posts with a future date"
-        cmd.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
-                   "Limits the number of posts to parse and publish"
-        cmd.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
-        cmd.option "baseurl", "-b", "--baseurl URL",
-                   "Serve the website from the given base URL"
-        cmd.option "force_polling", "--force_polling", "Force watch to use polling"
-        cmd.option "lsi", "--lsi", "Use LSI for improved related posts"
-        cmd.option "unpublished", "-U", "--unpublished",
-                   "Render posts that were marked as unpublished"
-        cmd.option "disable_disk_cache", "--disable-disk-cache",
-                   "Disable caching to disk"
-        cmd.option "profile", "--profile", "Generate a Liquid rendering profile"
-        cmd.option "quiet", "-q", "--quiet", "Silence output."
-        cmd.option "verbose", "-V", "--verbose", "Print verbose output."
-        cmd.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
-        cmd.option "strict_front_matter", "--strict_front_matter",
-                   "Fail if errors are present in front matter"
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      # Run ::process method in a given set of Bridgetown::Command subclasses and suggest
-      # re-running the associated command with --trace switch to obtain any additional
-      # information or backtrace regarding the encountered Exception.
-      #
-      # cmd     - the Bridgetown::Command to be handled
-      # options - configuration overrides
-      # klass   - an array of Bridgetown::Command subclasses associated with the command
-      #
-      # Note that all exceptions are rescued..
-      # rubocop: disable Lint/RescueException
-      def process_with_graceful_fail(cmd, options, *klass)
-        klass.each { |k| k.process(options) if k.respond_to?(:process) }
-      rescue Exception => e
-        raise e if cmd.trace
-
-        msg = " Please append `--trace` to the `#{cmd.name}` command "
-        dashes = "-" * msg.length
-        Bridgetown.logger.error "", dashes
-        Bridgetown.logger.error "Bridgetown #{Bridgetown::VERSION} ", msg
-        Bridgetown.logger.error "", " for any additional information or backtrace. "
-        Bridgetown.logger.abort_with "", dashes
-      end
-      # rubocop: enable Lint/RescueException
-    end
-  end
-end