bridgetown-core 1.2.0.beta5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db2117b99eb2b2943920e6cbfe4267b2a668842de44e360df645da6554ea877
-  data.tar.gz: b8e3652ab12db38512546612a74df6939bd841166d9cfae371aa75d6ae8d8265
+  metadata.gz: 599f0ff57d4bac2146e5cacb12ccb8f2e7e02026815447c2db9cbf914ed9d3a2
+  data.tar.gz: be29cede2daa248b4db41bb6a7eaeebb7d3533b54a5cf891922b0762a6ca47e0
 SHA512:
-  metadata.gz: 446f796d17a209b19afdb9d8f349d1e5197d7f5600598bc21be3c23c73df7d10c125379d739bd608322d404365ca37b4a37cbe9b38fa8bdd22a97c84c41bee7c
-  data.tar.gz: 89293450447e8acb5718cdcdc782124699faa138c559474c5df66609715163fca809d4ed477cf5ee75b905f62e0bcbd540f62a46841b8c58fede225670ae429b
+  metadata.gz: 739ed852e60fabf0b6b2d352c8ce8993d4751a1f6cfec67c0bb7ed4cc5f0af41bb82fb8dc3eb34f5806a421bcec38e9050cd0fbcb50249a0482f5804e19a1d27
+  data.tar.gz: 97eea9cb28095624a8d47821f754df39790d8db46e62d79774371113c875fd914a796f3e445ad982e6f8de8e94d5babf7b8be1736c4bc93f3a9fe0a0f6862433

data/bridgetown-core.gemspec

@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("roda",                  "~> 3.46")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
   s.add_runtime_dependency("serbea",                "~> 1.0")
-  s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.1")
   s.add_runtime_dependency("tilt",                  "~> 2.0")
   s.add_runtime_dependency("webrick",               "~> 1.7")

data/lib/bridgetown-core/commands/plugins.rb

@@ -126,7 +126,7 @@ module Bridgetown
         Layouts, you'd run:\n
         bridgetown plugins cd SamplePlugin/Layouts
       DOC
-      desc "cd <origin/dir>", "Open folder (content, layouts, etc.) within the plugin origin"
+      desc "cd <origin/dir>", "Open content folder within the plugin origin"
 
       # This is super useful if you want to copy files out of plugins to override.
       #
@@ -177,38 +177,43 @@ module Bridgetown
         end
       end
 
-      desc "new NAME", "Create a new plugin NAME by cloning the sample plugin repo"
+      desc "new NAME", "Create a new plugin NAME (snake_case_name_preferred)"
       def new(name)
         folder_name = name.underscore
         module_name = folder_name.camelize
 
-        run "git clone -b v1.2-initializer https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
-        new_gemspec = "#{name}.gemspec"
+        run "git clone https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
+        new_gemspec = "#{folder_name}.gemspec"
 
         inside name do # rubocop:todo Metrics/BlockLength
           destroy_existing_repo
           initialize_new_repo
 
-          FileUtils.mv "bridgetown-sample-plugin.gemspec", new_gemspec.to_s
+          FileUtils.mv "sample_plugin.gemspec", new_gemspec
           gsub_file new_gemspec, "https://github.com/bridgetownrb/bridgetown-sample-plugin", "https://github.com/username/#{name}"
           gsub_file new_gemspec, "bridgetown-sample-plugin", name
-          gsub_file new_gemspec, "sample-plugin", name
+          gsub_file new_gemspec, "sample_plugin", folder_name
           gsub_file new_gemspec, "SamplePlugin", module_name
 
           gsub_file "package.json", "https://github.com/bridgetownrb/bridgetown-sample-plugin", "https://github.com/username/#{name}"
           gsub_file "package.json", "bridgetown-sample-plugin", name
+          gsub_file "package.json", "sample_plugin", folder_name
 
           FileUtils.mv "lib/sample_plugin.rb", "lib/#{folder_name}.rb"
-          gsub_file "lib/#{name}.rb", "sample_plugin", folder_name
-          gsub_file "lib/#{name}.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}.rb", "sample_plugin", folder_name
+          gsub_file "lib/#{folder_name}.rb", "SamplePlugin", module_name
 
           FileUtils.mv "lib/sample_plugin", "lib/#{folder_name}"
-          gsub_file "lib/#{name}/builder.rb", "SamplePlugin", module_name
-          gsub_file "lib/#{name}/version.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}/builder.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}/builder.rb", "sample_plugin", folder_name
+          gsub_file "lib/#{folder_name}/version.rb", "SamplePlugin", module_name
 
           FileUtils.mv "test/test_sample_plugin.rb", "test/test_#{folder_name}.rb"
           gsub_file "test/test_#{folder_name}.rb", "SamplePlugin", module_name
-          gsub_file "test/helper.rb", "sample-plugin", name
+          gsub_file "test/test_#{folder_name}.rb", "sample plugin", module_name
+          gsub_file "test/helper.rb", "sample_plugin", folder_name
+          gsub_file "test/fixtures/src/index.html", "sample_plugin", folder_name
+          gsub_file "test/fixtures/config/initializers.rb", "sample_plugin", folder_name
 
           FileUtils.mv "components/sample_plugin", "components/#{folder_name}"
           FileUtils.mv "content/sample_plugin", "content/#{folder_name}"
@@ -220,14 +225,15 @@ module Bridgetown
 
           gsub_file "components/#{folder_name}/plugin_component.rb", "SamplePlugin", module_name
 
-          gsub_file "frontend/javascript/index.js", "bridgetown-sample-plugin", name
+          gsub_file "frontend/javascript/index.js", "sample_plugin", folder_name
           gsub_file "frontend/javascript/index.js", "SamplePlugin", module_name
+          gsub_file "frontend/styles/index.css", "sample_plugin", folder_name
         end
         say ""
         say_status "Done!", "Have fun writing your new #{name} plugin :)"
         say_status "Remember:", "Don't forget to rename the SamplePlugin" \
                                 " code identifiers and paths to your own" \
-                                " indentifer, as well as update your README" \
+                                " identifier, as well as update your README" \
                                 " and CHANGELOG files as necessary."
       end
 

data/lib/bridgetown-core/concerns/front_matter_importer.rb

@@ -9,9 +9,9 @@ module Bridgetown
 
     YAML_HEADER = %r!\A---\s*\n!.freeze
     YAML_BLOCK = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
-    RUBY_HEADER = %r!\A[~`#\-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
+    RUBY_HEADER = %r!\A[~`#-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
     RUBY_BLOCK =
-      %r!#{RUBY_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#\-]{3,}\s*$\n?)!m.freeze
+      %r!#{RUBY_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#-]{3,}\s*$\n?)!m.freeze
 
     def read_front_matter(file_path) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       file_contents = File.read(

data/lib/bridgetown-core/configuration/configuration_dsl.rb

@@ -72,6 +72,10 @@ module Bridgetown
         @scope.roda_initializers << block
       end
 
+      def timezone(tz) # rubocop:disable Naming/MethodParameterName
+        Bridgetown.set_timezone(tz)
+      end
+
       def method_missing(key, *value, &block) # rubocop:disable Style/MissingRespondToMissing
         return get(key) if value.empty? && block.nil?
 
@@ -132,7 +136,7 @@ module Bridgetown
 
         if require_initializer
           init_file_name = File.join(@scope.root_dir, "config", "#{name}.rb")
-          require(init_file_name) if File.exist?(init_file_name)
+          load(init_file_name) if File.exist?(init_file_name)
         end
 
         @scope.initializers[name.to_sym]

data/lib/bridgetown-core/configuration.rb

@@ -134,7 +134,7 @@ module Bridgetown
       initializers_file = File.join(root_dir, "config", "initializers.rb")
       return unless File.file?(initializers_file)
 
-      require initializers_file
+      load initializers_file
 
       return unless initializers # no initializers have been set up
 

data/lib/bridgetown-core/liquid_renderer/table.rb

@@ -17,7 +17,9 @@ module Bridgetown
       private
 
       def tabulate(data)
-        require "terminal-table"
+        unless defined?(Terminal::Table)
+          Bridgetown::Utils::RequireGems.require_with_graceful_fail "terminal-table"
+        end
 
         header = data.shift
         footer = data.pop

data/lib/bridgetown-core/model/repo_origin.rb

@@ -7,9 +7,9 @@ module Bridgetown
       include Bridgetown::Utils::RubyFrontMatterDSL
 
       YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
-      RUBY_FRONT_MATTER_HEADER = %r!\A[~`#\-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
+      RUBY_FRONT_MATTER_HEADER = %r!\A[~`#-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
       RUBY_FRONT_MATTER_REGEXP =
-        %r!#{RUBY_FRONT_MATTER_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#\-]{3,}\s*$\n?)!m.freeze
+        %r!#{RUBY_FRONT_MATTER_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#-]{3,}\s*$\n?)!m.freeze
 
       # @return [String]
       attr_accessor :content

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.2.0.beta5"
+  VERSION = "1.2.0"
   CODE_NAME = "Bonny Slope"
 end

data/lib/bridgetown-core.rb

@@ -136,6 +136,8 @@ module Bridgetown
     end
     alias_method :env, :environment
 
+    # Set up the Bridgetown execution environment before attempting to load any
+    # plugins or gems prior to a site build
     def begin!
       ENV["RACK_ENV"] ||= environment
 
@@ -178,6 +180,38 @@ module Bridgetown
       end
     end
 
+    # Initialize a preflight configuration object, copying initializers and
+    # source manifests from a previous standard configuration if necessary.
+    # Typically only needed in test suites to reset before a new test.
+    #
+    # @return [Bridgetown::Configuration::Preflight]
+    def reset_configuration! # rubocop:disable Metrics/AbcSize
+      if Bridgetown::Current.preloaded_configuration.nil?
+        return Bridgetown::Current.preloaded_configuration =
+                 Bridgetown::Configuration::Preflight.new
+      end
+
+      return unless Bridgetown::Current.preloaded_configuration.is_a?(Bridgetown::Configuration)
+
+      previous_config = Bridgetown::Current.preloaded_configuration
+      new_config = Bridgetown::Configuration::Preflight.new
+      new_config.initializers = previous_config.initializers
+      new_config.source_manifests = previous_config.source_manifests
+      if new_config.initializers
+        new_config.initializers.delete(:init)
+        new_config.initializers.select! do |_k, initializer|
+          next false if initializer.block.source_location[0].start_with?(
+            File.join(previous_config.root_dir, "config")
+          )
+
+          initializer.completed = false
+          true
+        end
+      end
+
+      Bridgetown::Current.preloaded_configuration = new_config
+    end
+
     def initializer(name, prepend: false, replace: false, &block) # rubocop:todo Metrics
       unless Bridgetown::Current.preloaded_configuration
         raise "The `#{name}' initializer in #{block.source_location[0]} was called " \
@@ -276,6 +310,14 @@ module Bridgetown
     def set_timezone(timezone)
       ENV["TZ"] = timezone
     end
+
+    # Get the current TZ environment variable
+    #
+    # @return [String]
+    def timezone
+      ENV["TZ"]
+    end
+
     # rubocop:enable Naming/AccessorMethodName
 
     # Fetch the logger instance for this Bridgetown process.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta5
+  version: 1.2.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -274,20 +274,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -615,9 +601,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: