sancho 0.6.2 → 0.7.0

data/lib/sancho/config.rb

@@ -0,0 +1,25 @@
+module Sancho
+  module_function
+
+  VERSION = '0.7.0'
+  
+  def root
+    File.expand_path(File.dirname(__dir__))
+  end
+
+  def assets
+    File.join(root, LAYOUTS_DIR)
+  end
+
+  CONFIG_FILE = '.sancho.yml'
+
+  LAYOUTS_DIR = '_layouts'
+
+  DEFAULT_SITE_DIR = 'docs'
+
+  DEFAULT_SITE_DOMAIN = 'domain'
+
+  DEFAULT_SITE_TITLE = 'Sancho'
+end
+
+# puts Sancho.root, Sancho.assets

data/lib/sancho/model/config.rb

@@ -0,0 +1,8 @@
+module Sancho
+  module Model
+
+    # Config model
+    Config = Data.define(:directory, :domain, :title, :pages)
+
+  end
+end

data/lib/sancho/model/page.rb

@@ -0,0 +1,16 @@
+module Sancho
+  module Model
+
+    # Page model
+    Page = Data.define(:source, :url, :date) do
+      # @param source [String] filename
+      # @param url [String]
+      def self.from(source, url = '')
+        url = File.basename(source, '.md').downcase + '.html' if url.empty?
+        date = File.mtime(source).to_date
+        new(source:, url:, date:)
+      end
+    end
+
+  end
+end

data/lib/sancho/model/site.rb

@@ -0,0 +1,23 @@
+require_relative 'page'
+require 'forwardable'
+
+module Sancho
+  module Model
+
+    # Site model
+    Site = Data.define(:domain, :title, :pages) do
+      extend Forwardable
+      def_delegator :pages, :each, :each_page
+
+      def pages_by_date
+        pages.sort{|a, b| b.date <=> a.date }
+      end
+      
+      def add(page)
+        with(pages: pages.push(page))
+      end
+      alias << add
+    end    
+    
+  end
+end

data/lib/sancho/model.rb

@@ -0,0 +1,10 @@
+require_relative 'model/page'
+require_relative 'model/site'
+require_relative 'model/config'
+
+module Sancho
+  
+  # Model namespace
+  module Model
+  end
+end

data/lib/sancho/tasks/basic.rb

@@ -0,0 +1,17 @@
+require_relative '../config'
+require_relative '../model'
+require 'fileutils'
+
+module Sancho
+  module Task
+
+    # Basic action
+    class Basic
+      extend FileUtils
+
+      def self.run(*args, **kwargs)
+      end
+    end
+    
+  end
+end

data/lib/sancho/tasks/build_site.rb

@@ -0,0 +1,55 @@
+require_relative 'basic'
+require 'tmpdir'
+require 'erb'
+
+module Sancho
+  module Task
+
+    # Build site
+    class BuildSite < Basic
+      # @param config [Model::Config]
+      def self.run(config)
+        %w[images css jss]
+          .map{ File.join(config.directory, it) }
+          .each{ mkdir_p it } 
+
+        styles = File.join(Sancho::LAYOUTS_DIR, 'styles.css')
+        cp styles, File.join(config.directory, 'css') 
+        
+        pages = config.pages.map{ Model::Page.from(it) }
+        index = config.pages.find{ it.downcase =~ /^index/ }
+        pages << Model::Page.from(config.pages.first, 'index.html') \
+          unless index
+        
+        site = Model::Site.new(
+          domain: config.domain,
+          title: config.title,
+          pages:)
+        
+        # process erb require site variable
+        Dir["#{Sancho::LAYOUTS_DIR}/*.erb"].each do |erb|
+          content = ERB.new(File.read(erb), trim_mode: '%').result(binding)
+          filename = File.join(config.directory, File.basename(erb,'.erb'))
+          File.write(filename, content)
+        end
+
+        srcdir = Dir.pwd
+        Dir.mktmpdir do |dir|
+          header = File.join(dir, 'header.html')
+          footer = File.join(dir, 'footer.html')
+          system "pandoc -o #{header} #{Sancho::LAYOUTS_DIR}/header.md"
+          system "pandoc -o #{footer} #{Sancho::LAYOUTS_DIR}/footer.md"
+
+          optns = PANDOC_OPTIONS + " -B #{header} -A #{footer}"
+          site.pages.each{
+            source = File.join(srcdir, it.source)
+            system "pandoc #{optns} -o #{config.directory}/#{it.url} #{source}"
+          }
+        end
+      end
+
+      PANDOC_OPTIONS = "-s --toc --template #{Sancho::LAYOUTS_DIR}/layout.html -c css/styles.css"
+    end
+    
+  end
+end

data/lib/{config.ru → sancho/tasks/config.ru}

@@ -1,6 +1,6 @@
 # https://devcenter.heroku.com/articles/static-sites-ruby
 require 'rack/static'
-require 'sancho'
+require_relative 'read_config'
 
 use Rack::Static,
   :urls => ["/images", "/js", "/css"],
@@ -12,9 +12,10 @@ text_html = {
   'cache-control' => 'public, max-age=86400'
 }
 
+config = Sancho::Task::ReadConfig.run 
 run lambda {|env|
   target = env['REQUEST_PATH'][1..-1]
-  source = File.join(Sancho::DOCS, target)
+  source = File.join(config.directory, target)
   return [404, text_plain, ['not found']] \
     unless File.exist?(source)
   [200, text_html, File.open(source, File::RDONLY)]

data/lib/sancho/tasks/copy_assets.rb

@@ -0,0 +1,19 @@
+require_relative 'basic'
+
+module Sancho
+  module Task
+
+    # Copy Sancho assets
+    class CopyAssets < Basic
+      # @param dest [String] directory to punch
+      def self.run
+        dir = Sancho::LAYOUTS_DIR
+        return if Dir.exist?(dir)
+
+        mkdir_p dir
+        cp_r "#{Sancho.assets}/.", dir, verbose: true
+      end
+    end
+    
+  end
+end

data/lib/sancho/tasks/read_config.rb

@@ -0,0 +1,37 @@
+require_relative 'basic'
+require 'psych'
+
+module Sancho
+  module Task
+
+    # Read configuration
+    class ReadConfig < Basic
+      def self.run
+        config = Sancho::CONFIG_FILE
+
+        begin
+          if File.exist?(config)
+            Psych
+              .load(File.read(config))
+              .transform_keys(&:to_sym)
+              .then{ return Model::Config.new(**it) }
+          end 
+        rescue StandardError => e
+          puts "Sancho configuration error", e.message
+        end
+
+        conf = Model::Config.new(
+          Sancho::DEFAULT_SITE_DIR,
+          Sancho::DEFAULT_SITE_DOMAIN,
+          Sancho::DEFAULT_SITE_TITLE,
+          %w[README.md CHANGELOG.md])
+
+        dump = Psych.dump(conf.to_h.transform_keys(&:to_s))
+        File.write(config, dump)
+
+        conf
+      end
+    end
+    
+  end
+end

data/lib/sancho/tasks/serve_site.rb

@@ -0,0 +1,18 @@
+require_relative 'basic'
+
+module Sancho
+  module Task
+
+    # Serve site
+    class ServeSite
+      def self.run
+        ru = File.join(__dir__, CONFIG_RU)
+        system "rackup #{ru}" 
+      end
+
+      # rackup file
+      CONFIG_RU = 'config.ru'
+    end
+    
+  end
+end

data/lib/sancho/tasks.rb

@@ -0,0 +1,11 @@
+require_relative 'tasks/read_config'
+require_relative 'tasks/copy_assets'
+require_relative 'tasks/build_site'
+require_relative 'tasks/serve_site'
+
+module Sancho
+
+  # Tasks (interactors) namespace
+  module Task
+  end
+end

data/lib/sancho.rb

@@ -1,37 +1,8 @@
-# frozen_string_literal: true
-require 'date'
-require_relative 'sancho/conf'
-require_relative 'sancho/page'
-require_relative 'sancho/site'
+require_relative 'sancho/config'
+require_relative 'sancho/model'
+require_relative 'sancho/tasks'
+require_relative 'sancho/cli'
 
 # Github Pages site generator
 module Sancho
-  extend self
-
-  VERSION = "0.6.2"
-
-  DOCS = 'docs'.freeze
-
-  def root
-    dir = File.dirname(__dir__)
-    File.expand_path(dir)
-  end
-
-  def assets
-    File.join(root, '_layouts')
-  end
-
-  def docs
-    Site.new(**Conf.read.to_h)
-  end
-
-  def lib
-    File.join(root, 'lib')
-  end
-
-  # Rake.application.rake_require "tasks", [sancho]
-  def tasks
-    ['tasks', [lib]]
-  end
-
 end

data/lib/tasks.rake

@@ -25,10 +25,11 @@ namespace :sancho do
 
       Sancho initialized!
 
-      To create Site Pages:
-        $ rake sancho:init
-        $ rake sancho:docs
-        $ rake sancho:serve
+      To create GitHub Pages:
+        1. run 'git checkout -b docs'
+        2. configure in 'sancho.yml'
+        3. run 'rake sancho:docs'
+        4. commit changes, push 'docs'
     EOF
   end
 
@@ -72,9 +73,20 @@ namespace :sancho do
   end
 
   desc "serve"
-  task serve: [:docs] do
+  task :serve do
     ru = File.join(Sancho.lib, 'config.ru')
     sh "rackup #{ru}"
   end
 
+  desc "release.."
+  task :release do
+    sh 'git checkout docs'
+    sh 'git merge master'
+    Rake::Task['sancho:docs'].execute
+    sh 'git add .'
+    sh 'git commit -m "sancho:docs"'
+    sh 'git push'
+    sh 'git checkout master'
+  end
+
 end

data/sancho.gemspec

@@ -9,16 +9,12 @@ Gem::Specification.new do |spec|
   spec.email = ["nvoynov@gmail.com"]
 
   spec.summary = "Github Pages Generator"
-  # spec.description = "Simple Site Generator from Markdown to Html by Pandoc"
-  # spec.homepage = "https://github/nvoynov/sancho"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.description = "Simple Site Generator from Markdown to Html by Pandoc"
+  spec.homepage = "https://github/nvoynov/sancho"
+  spec.required_ruby_version = ">= 3.4.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
-  # spec.metadata["homepage_uri"] = spec.homepage
-  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(__dir__) do

metadata

@@ -1,34 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: sancho
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Nikolay Voynov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
+description: Simple Site Generator from Markdown to Html by Pandoc
 email:
 - nvoynov@gmail.com
-executables: []
+executables:
+- sancho
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
+- ".rubocop.yml"
+- ".sancho.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - STORY.md
-- _layouts/footer.md
-- _layouts/header.md
-- _layouts/layout.html
-- _layouts/robots.txt.erb
-- _layouts/sitemap.xml.erb
-- _layouts/styles.css
 - docs/changelog.html
 - docs/css/styles.css
 - docs/index.html
@@ -37,18 +34,33 @@ files:
 - docs/sitemap.xml
 - docs/story.html
 - docs/styles.css
-- lib/config.ru
+- exe/sancho
+- lib/_layouts/footer.md
+- lib/_layouts/header.md
+- lib/_layouts/layout.html
+- lib/_layouts/robots.txt.erb
+- lib/_layouts/sitemap.xml.erb
+- lib/_layouts/styles.css
 - lib/sancho.rb
-- lib/sancho/conf.rb
-- lib/sancho/page.rb
-- lib/sancho/site.rb
+- lib/sancho/cli.rb
+- lib/sancho/config.rb
+- lib/sancho/model.rb
+- lib/sancho/model/config.rb
+- lib/sancho/model/page.rb
+- lib/sancho/model/site.rb
+- lib/sancho/tasks.rb
+- lib/sancho/tasks/basic.rb
+- lib/sancho/tasks/build_site.rb
+- lib/sancho/tasks/config.ru
+- lib/sancho/tasks/copy_assets.rb
+- lib/sancho/tasks/read_config.rb
+- lib/sancho/tasks/serve_site.rb
 - lib/tasks.rake
 - sancho.gemspec
 - sancho.yml
-homepage:
+homepage: https://github/nvoynov/sancho
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -56,15 +68,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Github Pages Generator
 test_files: []

data/_layouts/robots.txt.erb

@@ -1,4 +0,0 @@
-User-agent: *
-Allow: /
-
-Sitemap: https://<%= @site.domain %>/sitemap.xml

data/lib/sancho/conf.rb

@@ -1,21 +0,0 @@
-require 'psych'
-
-module Sancho
-  class Conf < Data.define(:domain, :title, :pages)
-    def self.read
-      return new(**Psych.load(File.read(CONF)).transform_keys(&:to_sym)) \
-        if File.exist?(CONF)
-
-      new.tap{|o| File.write(CONF, Psych.dump(o.to_h.transform_keys(&:to_s))) }
-    rescue => e
-      puts 'Sancho: reading config error', e.full_message
-      new
-    end
-
-    def initialize(domain: 'domain', title: 'title', pages: %w[README.md CHANGELOG.md])
-      super
-    end
-
-    CONF = 'sancho.yml'
-  end
-end

data/lib/sancho/page.rb

@@ -1,11 +0,0 @@
-module Sancho
-
-  class Page < Data.define(:source, :url, :date)
-    def initialize(source:, url: '')
-      url = File.basename(source, '.md').downcase + '.html' if url.empty?
-      date = File.mtime(source).to_date
-      super(source: source, url: url, date: date)
-    end
-  end
-
-end

data/lib/sancho/site.rb

@@ -1,24 +0,0 @@
-require_relative 'page'
-require 'forwardable'
-
-module Sancho
-
-  class Site < Data.define(:domain, :title, :pages)
-    extend Forwardable
-    def_delegator :pages, :each, :each_page
-
-    def initialize(domain:, title:, pages:)
-      pages = pages.map{|e| Page.new(e) }
-      super
-    end
-
-    def pages_by_date
-      pages.sort{|a, b| b.date <=> a.date}
-    end
-
-    def <<(page)
-      with(pages: pages.unshift(page))
-    end
-  end
-
-end