sitepress-cli 2.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b220abebebc16b765605139dabc9d680a24ced09a41acd95e23417c6cfa0b1
-  data.tar.gz: 935a906c5ea0c51b1d9522862a201e06d8f5507fe1897f687b61f8e48e17b26e
+  metadata.gz: 32ceede4b8b6e20838b244f3444cd761c4d6ce253327fa2724150f37ad8a98b4
+  data.tar.gz: 98f84c60444f09321246f374c1a75de6f5313ae40a13546ec5a6afb7dd1beed3
 SHA512:
-  metadata.gz: 98e8c553101db8f2c855fac3c3301db888870c7161525c617c21b05a894df8f8b354e98919cea970d2e5d6d7d3d3f3dceada6c388b550a7b16645d33154f32f8
-  data.tar.gz: 99cf8ed79c79bd3bd16bb7b752e50c362b1ae4abb34b3bb8c8367283be638c0524e95a9ea057c3c80a5e58318b9e5e59350162689235496a5a0219cf472bf6ea
+  metadata.gz: 561ef4a45a3443b81bbae7e2a0c012b530324ccbfca314191e5773b77807b9989651be47e1b645a2310500803cf41c723ee7adf600380d02a02d5ea198264d2c
+  data.tar.gz: 6b72a7a76e1f59b3a11a329029e17c7986e3a8a78fa7abd3bab9b8decfe4759f48edd0f871bf0b6464f0c89bfb31677c2fe2b4b84257d379f385a3c0c3031217

data/lib/sitepress/boot.rb

@@ -6,7 +6,5 @@ require "sitepress/server"  # Load all the stuff needed setup the configuration
 # Setup defaults for stand-alone Sitepress server in the current path. This
 # can, and should, be over-ridden by the end-user in the `config/site.rb` file.
 Sitepress.configure do |config|
-  config.routes = false
   config.site = Sitepress::Site.new root_path: "."
 end
-

data/lib/sitepress/cli.rb

@@ -3,31 +3,51 @@ require "thor"
 module Sitepress
   # Command line interface for compiling Sitepress sites.
   class CLI < Thor
-    SERVER_DEFAULT_PORT = 8080
-    SERVER_DEFAULT_BIND_ADDRESS = "0.0.0.0".freeze
-    COMPILE_DEFAULT_TARGET_PATH = "./build".freeze
+    # Default port address for server port.
+    SERVER_PORT = 8080
+
+    # Default address is public to all IPs.
+    SERVER_BIND_ADDRESS = "0.0.0.0".freeze
+
+    # Default build path for compiler.
+    COMPILE_TARGET_PATH = "./build".freeze
+
+    # Display detailed error messages to the developer. Useful for development environments
+    # where the error should be displayed to the developer so they can debug errors.
+    SERVER_SITE_ERROR_REPORTING = true
+
+    # Reload the site between requests, useful for development environments when
+    # the site has to be rebuilt between requests. Disable in production environments
+    # to run the site faster.
+    SERVER_SITE_RELOADING = true
 
     include Thor::Actions
 
     source_root File.expand_path("../../../templates/default", __FILE__)
 
-    option :bind_address, default: SERVER_DEFAULT_BIND_ADDRESS, aliases: :a
-    option :port, default: SERVER_DEFAULT_PORT, aliases: :p, type: :numeric
+    option :bind_address, default: SERVER_BIND_ADDRESS, aliases: :a
+    option :port, default: SERVER_PORT, aliases: :p, type: :numeric
+    option :site_reloading, default: SERVER_SITE_RELOADING, aliases: :r, type: :boolean
+    option :site_error_reporting, default: SERVER_SITE_ERROR_REPORTING, aliases: :e, type: :boolean
     desc "server", "Run preview server"
     def server
-      initialize!
-      # Enable Sitepress web error reporting so users have more friendly
-      # error messages instead of seeing a Rails exception.
-      controller.enable_sitepress_error_reporting = true
-      # Enable reloading the site between requests so we can see changes.
-      controller.enable_site_reloading = true
+      # Now boot everything for the Rack server to pickup.
+      initialize! do |app|
+        # Enable Sitepress web error reporting so users have more friendly
+        # error messages instead of seeing a Rails exception.
+        app.config.enable_site_error_reporting = options.fetch("site_error_reporting")
+
+        # Enable reloading the site between requests so we can see changes.
+        app.config.enable_site_reloading = options.fetch("site_reloading")
+      end
+
       # This will use whatever server is found in the user's Gemfile.
       Rack::Server.start app: app,
         Port: options.fetch("port"),
         Host: options.fetch("bind_address")
     end
 
-    option :output_path, default: COMPILE_DEFAULT_TARGET_PATH, type: :string
+    option :output_path, default: COMPILE_TARGET_PATH, type: :string
     desc "compile", "Compile project into static pages"
     def compile
       initialize!
@@ -87,13 +107,9 @@ module Sitepress
       rails.config.assets.precompile
     end
 
-    def initialize!
+    def initialize!(&block)
       require_relative "boot"
-      app.initialize!
-    end
-
-    def controller
-      ::SiteController
+      app.tap(&block).initialize!
     end
 
     def app

data/sitepress-cli.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sitepress-server", spec.version
   spec.add_runtime_dependency "thor", ">= 1.0.0"
   spec.add_runtime_dependency "rack", ">= 1.0.0"
+  spec.add_runtime_dependency "sitepress-server", spec.version
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sitepress-server
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: sitepress-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.1.1
 description:
 email:
 - bradgessler@gmail.com
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Sitepress command line interface and compilation tools for static site.