sitepress-cli 2.0.0.beta2 → 2.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d93d966280bc5ea9c909ece7b952312515b2871488be52bb787aa094ca82abc
-  data.tar.gz: 91b8f6423d15d5c7b7e3bfb58d87132207b906d821acc1ebdb8db91cec8c9190
+  metadata.gz: f7c2555bfa5a3aaeb17b33521a2583aeea366082c00ee011ffd216dc7f6fb848
+  data.tar.gz: ec9f1eddd9aebd824f17d788277c079cc01ec03eabb025fdcbe3ebcbd5595c4f
 SHA512:
-  metadata.gz: b562eee6d252afd5c7e7f1e3efe64d6a7d9f35987443ff02d07ba5600376d599adf29bd29e8570c272615f9bb4336a08f63e0511a99a256e4ad4cd1cae24f832
-  data.tar.gz: 80d01e38bb791983db26e1e8e92a7c6ffa4cd5c6a6543f46662ea442585077a55269c50fff32f6698a0df6a1a3a7494e28286ef5a86802e58782c3cae18a85a8
+  metadata.gz: d4635e94087861bf3d20512ec9d821c284ee92a79f35d1410ee6070b1f0bfae1e246d57ec89ebd698e539ccc00d96621dbc6664ce877bacf48782af634e1842d
+  data.tar.gz: 4fa9758a918aa4ec1f0f96e3507d9a68568030323d517104b2d26189a7209fda23c44a0dde11b3414df6f94203b82fdf328320e475124cdb656cebfa031e9d82

data/lib/sitepress/cli.rb

@@ -1,5 +1,4 @@
 require "thor"
-require_relative "boot"
 
 module Sitepress
   # Command line interface for compiling Sitepress sites.
@@ -16,7 +15,7 @@ module Sitepress
     option :port, default: SERVER_DEFAULT_PORT, aliases: :p, type: :numeric
     desc "server", "Run preview server"
     def server
-      Sitepress::Server.initialize!
+      initialize!
       # This will use whatever server is found in the user's Gemfile.
       Rack::Server.start app: Sitepress::Server,
         Port: options.fetch("port"),
@@ -26,7 +25,7 @@ module Sitepress
     option :output_path, default: COMPILE_DEFAULT_TARGET_PATH, type: :string
     desc "compile", "Compile project into static pages"
     def compile
-      Sitepress::Server.initialize!
+      initialize!
       # Sprockets compilation
       logger.info "Sitepress compiling assets"
       sprockets_manifest(target_path: options.fetch("output_path")).compile precompile_assets
@@ -37,13 +36,17 @@ module Sitepress
 
     desc "console", "Interactive project shell"
     def console
-      Sitepress::Server.initialize!
+      initialize!
       # Start's an interactive console.
       REPL.new(context: configuration).start
     end
 
     desc "new PATH", "Create new project at PATH"
     def new(target)
+      # Peg the generated site to roughly the released version.
+      *segments, _ = Gem::Version.new(Sitepress::VERSION).segments
+      @target_sitepress_version = segments.join(".")
+
       inside target do
         directory self.class.source_root, "."
         run "bundle install"
@@ -52,7 +55,7 @@ module Sitepress
 
     desc "version", "Show version"
     def version
-      say "Sitepress #{Sitepress::VERSION}"
+      say Sitepress::VERSION
     end
 
     private
@@ -82,5 +85,10 @@ module Sitepress
     def precompile_assets
       rails.config.assets.precompile
     end
+
+    def initialize!
+      require_relative "boot"
+      Sitepress::Server.initialize!
+    end
   end
 end

data/templates/default/{Gemfile → Gemfile.tt}

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Stand-alone Sitepress server and compiler.
-gem "sitepress"
+gem "sitepress", "~> <%= @target_sitepress_version %>"
 
 # Server used for the Sitepress preview server.
 gem "webrick"

data/templates/default/README.md

@@ -0,0 +1,73 @@
+# Getting started
+
+Welcome to your new Sitepress site! If you know Rails, you'll feel right at home in Sitepress because it's built on top of Rails. There's a few things you'll need to know to get around:
+
+## Starting the preview server
+
+First thing you'll want to do is start the preview server:
+
+```sh
+$ sitepress server
+```
+
+Then open http://127.0.0.1:8080 and you'll see the welcome page.
+
+## Layouts
+
+To specify a layout for a page, add a `layout` key to the pages frontmatter. For example, if I create the layout `tech-support`, I'd add the following frontmatter to the top of a page in `pages/support/router.html.md`:
+
+```md
+---
+title: How to fix a router
+layout: tech-support
+---
+
+# How to fix a router
+
+1. Unplug the router.
+2. Plug in the router.
+```
+
+Sitepress will look for the layout in the `layouts` folder from the `layout` key in the file's frontmatter.
+
+Additionally, you may use the `render_layout` function in a page, or layout, to nest the layouts. For example, you could:
+
+```haml
+---
+title: How to fix a scanner
+---
+= render_layout "tech-support" do
+  %h1 How to fix a scanner
+
+  %ol
+    %li Unplug the scanner.
+    %li Plug in the scanner.
+```
+
+The `render_layout` can be used to nest a layout within a layout, which is a very powerful way to compose content pages.
+
+## File locations
+
+Like Rails, Sitepress organizes files in certain directories:
+
+* `pages` - This is where you'll edit the content. All `erb`, `haml`, and `md` files will be rendered and all other files will be served up. Support for other templating languages should work if you add them to the Gemfile and they already work with Rails.
+
+* `layouts` - Layouts for all pages may be found in this directory. Layouts are great for headers, footer, and other content that you'd otherwise be repeating across the files in `pages`.
+
+* `helpers` - Complex view code that you don't want to live in `page` or `layouts` can be extracted into helpers and re-used throughout the website. These are just like Rails helpers.
+
+* `assets` - If you want Sprockets to fingerprint and manage images, stylesheets, or scripts then put them in the `assets` directory.
+
+* `config` - All configuration files and initializers belong in this directory. The `config/site.rb` file has settings that can be changed for the Sitepress site. Changes made to this file require the `sitepress server` to be restarted.
+
+## Compiling & publishing the website
+
+Once you're satisfied with your website and you're ready to compile it into static HTML files, run `sitepress compile` and the website will be built to `./build`.
+
+## It's just Rails
+
+Anything you can do in Rails, you can do in Sitepress. If you find yourself needing more Rails for Sitepress, you could try adding it to the `Gemfile` and integrating it into your website. You can also embed and integrate Sitepress into a full-blown Rails app and serve up the content without statically compiling it.
+
+## More info
+
+Check out https://sitepress.cc for the latest and most up-to-date Sitepress documentation.

data/templates/default/Rakefile

@@ -1,7 +1,5 @@
 ## Example deployment script to an Amazon Web Servie S3 bucket.
-
-# Change the s3_url to whatever bucket you'd like to deploy to.
-s3_url = "s3://<insert-your-s3-bucket-here>/"
+s3_bucket_name = "<replace-with-your-bucket-name>"
 
 desc "Remove all files from the build directory"
 task :clean do
@@ -16,12 +14,12 @@ end
 namespace :publish do
   desc "Upload ./build/assets to S3 with cache-control headers optimized for assets"
   task :assets do
-    sh "aws s3 sync ./build/assets #{s3_url} --cache-control max-age=31536000"
+    sh "aws s3 sync ./build/assets s3://#{s3_bucket_name}/assets --cache-control max-age=31536000"
   end
 
   desc "Upload ./build to S3"
   task :pages do
-    sh "aws s3 sync ./build #{s3_url} --exclude 'assets/**' --cache-control max-age=60"
+    sh "aws s3 sync ./build s3://#{s3_bucket_name} --exclude 'assets/**' --cache-control max-age=60"
   end
 end
 

data/templates/default/pages/index.html.erb

@@ -3,13 +3,16 @@ title: Welcome to Sitepress
 ---
 
 <h3>Website files</h3>
-<p>All your website files are in <code><%= site.root_path.expand_path %></code>. If you've built stuff on Rails, you'll feel right at home because Sitepress was built on top of Rails.</p>
+<p>All the website files are in <code><%= site.root_path.expand_path %></code>. If you've built stuff on <a href="https://rubyonrails.org">Rails</a>, you'll feel right at home because Sitepress is actually running on Rails.</p>
 
 <h3>Assets</h3>
-<p>There's an asset pipeline at <code><%= site.assets_path.expand_path %></code> where you can put all of your images, stylesheets, and JavaScripts, which will be compiled and fingerprinted for your deployment.</p>
+<p>There's an asset pipeline at <code><%= site.assets_path.expand_path %></code> where you can put all of your images, stylesheets, and scripts, which will be compiled and fingerprinted for your deployment via Sprockets.</p>
 
 <h3>Compile</h3>
 <p>When you're ready to build the website, run <code>sitepress compile</code> and the website files and assets will all be built and compiled into the <code><%= site.root_path.join("build").expand_path %></code> path.</p>
 
+<h3>Deploy</h3>
+<p>An example Rakefile is included at <code><%= site.root_path.join("Rakefile").expand_path %></code> that deploys the build to an AWS S3 bucket. You can customize it to fit your needs or use a completely different deployment pipeline. Whatever floats your boat.</p>
+
 <h3>Documentation</h3>
 <p>Check out the <a href="https://sitepress.cc">Sitepress website</a> for help on getting started and documentation. Since Sitepress is also built on top of Rails, most of the <a href="https://guides.rubyonrails.org/action_view_helpers.html">Rails view helpers</a> work too.</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta7
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sitepress-server
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,8 @@ files:
 - lib/sitepress/repl.rb
 - sitepress-cli.gemspec
 - templates/default/.gitignore
-- templates/default/Gemfile
+- templates/default/Gemfile.tt
+- templates/default/README.md
 - templates/default/Rakefile
 - templates/default/assets/config/manifest.js
 - templates/default/assets/images/logo-brown.svg
@@ -76,6 +77,7 @@ files:
 - templates/default/config/site.rb
 - templates/default/helpers/page_helper.rb
 - templates/default/layouts/layout.html.erb
+- templates/default/pages/favicon.ico
 - templates/default/pages/index.html.erb
 homepage: https://github.com/sitepress/sitepress
 licenses: []
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Sitepress command line interface and compilation tools for static site.