runecms 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6ec34343c5dcae981f7cdb429ca0a9c5109ebe3b45821cb9d0382c3e951476
-  data.tar.gz: 0161f8b46af91f9095b684ce9f4eef86fda1c681d1386257e9441cecdb73c7db
+  metadata.gz: ede0ce49bdbce41d4a5b21380d2917194d2c4cff1c102820f6d79a93f425121b
+  data.tar.gz: 43bb06d716a28baf22ad7e8eaec55ff0d584c55f2d1feb091201386af71006e9
 SHA512:
-  metadata.gz: f2e2e03011516e173831f408488975af35ebb1e4b69e2e8644648217e7f43af188355aed37b1148a1a77d92cd7965c70c17df8d7324941ee891296108f8ac6bb
-  data.tar.gz: 51ba755814dcde8aef77a26139d35b8b9432ec18064156b8b171e5984f34e9577d20f9f55a6383e7c5407926ec562548abc190ee7a1d2dda19ba3e2f83a97dad
+  metadata.gz: 8570f0907a13e4bed0d0568e9b688fb24985c094289d6e0c09bbe0300ab6ab4ec5a58f8e64ac4d270e769345e7af068f6fc09f6f28ee12b592368ac15514ca32
+  data.tar.gz: d7c612dad92069bb329a3d68772e3a588c708db2dc1f87a371d8f3509a1016f7d7276516c034ee2f3bd982fe5c98a618a92b1116808e274cc1a4b63081ac9d1c

data/README.lt3

@@ -1,44 +1,23 @@
-. Note: at present, paragraphs are broken in livetext. Hence the .br
-
 RuneCMS is intended to be a simple, lightweight tool for building
 and deploying static websites.
 
-.br 2
-
 It's based on Livetext, but could be generalized to be agnostic of
 that tool. It is abstracted from a portion of RuneBlog.
 
-.br 2
-
 In its present form, the `rcms command simply takes a parameter.
-Choices are:
-
-.br 2
-
+Your choices are:
 .xtable
-`[rcms version] :: Print the version number of RuneCMS
-
-`[rcms config] :: Initialize `config.txt if necessary and edit with `vi
-
-`[rcms check] ::  List stale files, but do nothing else
-
-`[rcms generate] :: Find stale files under `source/ and generate them under `target/
-
-`[rcms publish] :: Publish `target/ to the remote server
-
-`[rcms update]  :: Shortcut - Like a generate followed by a publish
-
-`[rcms view] :: View the current state of `target/ via browser (local files)
-
-`[rcms browse] :: Browse the current state of the remote server
+`[ rcms config]   :: Initialize `config.txt if necessary and edit with `vi
+`[ rcms generate] :: Find stale files under `source/ and generate them under `target/
+`[ rcms view]     :: View the current state of `target/ via browser (local files)
+`[ rcms publish]  :: Publish `target/ to the remote server
+`[ rcms browse]   :: Browse the current state of the remote server
 .end
 
 At present, there is no check for these to be done in order. For example, 
 you could publish without a generate (analogous to editing a C program
 and running the executable without recompiling it).
 
-.br 2
-
 The assumption is made that keys for the user and server are already 
 set up. The `config.txt file looks like:
 
@@ -48,49 +27,6 @@ path: /var/www/foo
 user: hal9000
 </pre>
 
-<hr>
-
-*[Original notes:]
-
-<pre>
-General idea: Website is stored in a directory tree. Use Livetext (etc.?) to create target files
-and rsync to upload.
-
-.br 2
-
-Config will comprise:
-  - server
-  - user
-  - root/path
-
-.br 2
-
-Dir structure:
-
-.br 2
-
-  site
-   |
-   +---- config.lt3
-   +---- source/...
-   +---- target/...
-
-.br 2
-
-Logic flow:
-  1. Edit file(s) under source/ tree
-  2. Generate 
-      - reads config
-      - finds modified files under source/
-      - runs livetext on each
-      - results go under target/
-  3. View target/ locally to verify
-  4. Publish via rsync
-      # cmd = "rsync -r -z #{target}/ #@user@#@server:#{path}/"
-
-</pre>
-
-.br 2
 
 More details later...
 

data/README.md

@@ -1,100 +1,53 @@
 RuneCMS is intended to be a simple, lightweight tool for building
 and deploying static websites.
-<br><br>
+<p>
+
 It's based on Livetext, but could be generalized to be agnostic of
 that tool. It is abstracted from a portion of RuneBlog.
-<br><br>
-In its present form, the <t>rcms</t> command simply takes a parameter.
-Choices are:
-<br><br>
+<p>
+
+In its present form, the <font size=+1><tt>rcms</tt></font> command simply takes a parameter.
+Your choices are:
 <br><center><table width=90% cellpadding=5>
 <tr>
-  <td valign=top><t>rcms version</t></td>
-  <td valign=top>Print the version number of RuneCMS</td>
+  <td valign=top><font size=+1><tt>rcms config</tt></font>  </td>
+  <td valign=top>Initialize <font size=+1><tt>config.txt</tt></font> if necessary and edit with <font size=+1><tt>vi</tt></font></td>
 </tr>
 <tr>
+  <td valign=top><font size=+1><tt>rcms generate</tt></font></td>
+  <td valign=top>Find stale files under <font size=+1><tt>source/</tt></font> and generate them under <font size=+1><tt>target/</tt></font></td>
 </tr>
 <tr>
-  <td valign=top><t>rcms config</t></td>
-  <td valign=top>Initialize <t>config.txt</t> if necessary and edit with <t>vi</t></td>
+  <td valign=top><font size=+1><tt>rcms view</tt></font>    </td>
+  <td valign=top>View the current state of <font size=+1><tt>target/</tt></font> via browser (local files)</td>
 </tr>
 <tr>
+  <td valign=top><font size=+1><tt>rcms publish</tt></font> </td>
+  <td valign=top>Publish <font size=+1><tt>target/</tt></font> to the remote server</td>
 </tr>
 <tr>
-  <td valign=top><t>rcms check</t></td>
-  <td valign=top> List stale files, but do nothing else</td>
-</tr>
-<tr>
-</tr>
-<tr>
-  <td valign=top><t>rcms generate</t></td>
-  <td valign=top>Find stale files under <t>source/</t> and generate them under <t>target/</t></td>
-</tr>
-<tr>
-</tr>
-<tr>
-  <td valign=top><t>rcms publish</t></td>
-  <td valign=top>Publish <t>target/</t> to the remote server</td>
-</tr>
-<tr>
-</tr>
-<tr>
-  <td valign=top><t>rcms update</t> </td>
-  <td valign=top>Shortcut - Like a generate followed by a publish</td>
-</tr>
-<tr>
-</tr>
-<tr>
-  <td valign=top><t>rcms view</t></td>
-  <td valign=top>View the current state of <t>target/</t> via browser (local files)</td>
-</tr>
-<tr>
-</tr>
-<tr>
-  <td valign=top><t>rcms browse</t></td>
+  <td valign=top><font size=+1><tt>rcms browse</tt></font>  </td>
   <td valign=top>Browse the current state of the remote server</td>
 </tr>
 </table></center>
 At present, there is no check for these to be done in order. For example, 
 you could publish without a generate (analogous to editing a C program
 and running the executable without recompiling it).
-<br><br>
+<p>
+
 The assumption is made that keys for the user and server are already 
-set up. The <t>config.txt</t> file looks like:
+set up. The <font size=+1><tt>config.txt</tt></font> file looks like:
+<p>
+
 <pre>
 server: foo.com
 path: /var/www/foo
 user: hal9000
 </pre>
-<hr>
-<b>Original notes:</b>
-<pre>
-General idea: Website is stored in a directory tree. Use Livetext (etc.?) to create target files
-and rsync to upload.
-<br><br>
-Config will comprise:
-  - server
-  - user
-  - root/path
-<br><br>
-Dir structure:
-<br><br>
-  site
-   |
-   +---- config.lt3
-   +---- source/...
-   +---- target/...
-<br><br>
-Logic flow:
-  1. Edit file(s) under source/ tree
-  2. Generate 
-      - reads config
-      - finds modified files under source/
-      - runs livetext on each
-      - results go under target/
-  3. View target/ locally to verify
-  4. Publish via rsync
-      # cmd = "rsync -r -z #{target}/ #@user@#@server:#{path}/"
-</pre>
-<br><br>
+<p>
+
+<p>
+
 More details later...
+<p>
+

data/bin/rcms

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << "lib"
+$LOAD_PATH << "lib" 
+$LOAD_PATH << "../../lib"  # for examples/ex1/ etc.
+
+require 'rubygems'
 
 require 'runecms'
 
@@ -12,5 +15,7 @@ cmd = ARGV.first
 
 abort "Don't know #{cmd}" unless command?(cmd)
 
+read_config
+
 execute(cmd)
 

data/examples/ex1/config.txt

@@ -1,3 +1,3 @@
 server: foo.com
-path: /var/www/foo
-user: hal9000
+path:   /var/www/foo
+user:   hal9000

data/examples/ex1/target/file2.html

@@ -0,0 +1,3 @@
+<h3>This file is in HTML</h3>
+
+It would get copied over with no processing.

data/examples/ex1/target/file3.html

@@ -0,0 +1,10 @@
+<h3>This file...</h3>
+<p>
+
+is a <font size=+1><tt>.lt3</tt></font> file, which means livetext would process it
+before it is copied from source/ to target/
+<p>
+
+That's all for now.
+<p>
+

data/examples/ex1/target/index.html

@@ -0,0 +1,7 @@
+<h1>Well, here we are</h1>
+<p>
+
+<b>Not much to see here, really</b>
+<p>
+
+But maybe later there will be.

data/lib/runecms/commands.rb

@@ -3,52 +3,28 @@ require 'find'
 
 CONFIG = "config.txt"
 
-def run_version
-  puts RuneCMS::VERSION
-end
-
-def run_check
-  stale = stale_files("source")
-  if stale.empty? 
-    puts "No stale files"
-  else
-    puts "Stale files:"
-    stale.each {|x| puts "  " + x }
-    puts
-  end
-end
-
 def run_config
-  unless read_config
-    File.open("config.txt", "w") do |f|
+  unless File.exist?(CONFIG)
+    File.open(CONFIG, "w") do |f|
       f.puts "server: "
-      f.puts "path: "
-      f.puts "user: "
+      f.puts "path:   "
+      f.puts "user:   "
     end
   end
-  system("vi config.txt")
+  system("vi #{CONFIG}")
 end
 
 def run_generate
   verify_dirs    # handle missing subdirectories
-  stale = stale_files("source") 
-  if stale.empty? 
-    puts "Nothing to do"
-  else
-    puts "Stale files:"
-    stale.each do |file| 
-      puts "  " + x
+  list = find_files("source") 
+  list.each do |file|
+    if stale?(file)
+      puts "  #{file} is stale"
       update_target(file)
     end
-    puts
   end
 end
 
-def run_update
-  run_generate
-  run_publish
-end
-
 def run_view
   # FIXME index is hardcoded...
   system("open target/index.html")
@@ -57,10 +33,19 @@ end
 def run_publish
   cmd = "rsync -r -z target/ #@user@#@server:#@path/"
   system(cmd)
+# puts "Would run: '#{cmd}'"
+# puts
+end
+
+def run_update
+  run_generate
+  run_publish
 end
 
 def run_browse
   system("open #@server")
+# puts "Would run: 'open #@server'"
+# puts
 end
 
 def command?(cmd)

data/lib/runecms/support.rb

@@ -3,32 +3,19 @@ def usage_message
   puts
   puts <<-TEXT
     rcms config    Initialize config.txt if necessary and edit with vi
-    rcms check     List stale files, but do nothing else
     rcms generate  Find stale files under source/ and generate them under target/
     rcms view      View the current state of target/ via browser (local files)
     rcms publish   Publish target/ to the remote server
     rcms update    Shortcut - Like a generate followed by a push
     rcms browse    Browse the current state of the remote server
-
-    Run from a directory with a config.txt, a source/ dir, and a target/ dir.
-
-    Config file looks like:
-      server: example.com
-      path: /some/arbitrary/path
-      user: myuser
-
   TEXT
   puts
   exit
 end
 
-def stale_files(dir)
-  list = nil
-  path = "#{Dir.pwd}/#{dir}/"
-  list = Find.find(path).to_a
-  list = list.select {|x| ! File.directory?(x) }
-  list.map! {|x| x.sub(path, "") }
-  list.select {|x| stale?(x) }
+def find_files(dir)
+  list = Find.find(dir).to_a - [dir]
+  list.map {|x| x.sub("#{dir}/","") }
 end
 
 def stale?(file)  # without source/ or target/
@@ -49,14 +36,14 @@ end
 def update_target(file)
   file2 = fix_extension(file)
   if lt3?(file) 
-    cmd = "livetext source/#{file} > target/#{file2}"
+    update = "livetext" 
+    redir = ">"
   else
-    if File.directory?(file)
-      cmd = "mkdir target/#{file2}"
-    else
-      cmd = "cp source/#{file} target/#{file2}"
-    end
+    update = "cp"
+    redir = ""
   end
+  cmd = "#{update} source/#{file} #{redir} target/#{file2}"
+  # puts cmd
   system(cmd)
 end
 
@@ -86,23 +73,13 @@ def fix_extension(file)
 end
 
 def read_config
-  config = "config.txt"
-  here = Dir.pwd
-  loop do
-    raise if Dir.pwd == "/"  # shouldn't get this far
-    break if File.exist?(config)
-    Dir.chdir("..")
-  end
   lines = File.readlines("config.txt")
   # Example: "user: hal9000"
   lines.each do |line|
     var, val = line.split(": ")
-    instance_variable_set("@" + var, val.chomp.strip)
+    instance_variable_set("@"+var, val.chomp.strip)
   end
-  return true
-rescue => e
-  puts "Can't read config file: here = #{here}  pwd = #{Dir.pwd}"
-  puts e
-  return false
+rescue => err
+  abort "Can't open config file: #{err}"
 end
 

data/lib/runecms/version.rb

@@ -1,3 +1,3 @@
 class RuneCMS
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/runecms.gemspec

@@ -1,15 +1,14 @@
 require 'date'
 require 'find'
 
-require_relative "lib/runecms"
+$LOAD_PATH << "lib"
+
+require "runecms"
 
 Gem::Specification.new do |s|
   def s.file_trees(*dirs)
     list = []
-    dirs.each do |dir| 
-      stuff = Find.find(dir).to_a 
-      list += stuff
-    end
+    dirs.each {|dir| list += Find.find(dir).to_a }
     list
   end
 
@@ -35,5 +34,4 @@ Gem::Specification.new do |s|
   s.files       =  main + misc
   s.homepage    = 'https://github.com/Hal9000/runecms'
   s.license     = "Ruby"
-  s.post_install_message = "\n  Success! For help, run 'rcms' with no parameters.\n "
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runecms
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies: []
 description: A simple static website manager based on Livetext (and Ruby)
 email: rubyhacker@gmail.com
@@ -24,6 +24,9 @@ files:
 - examples/ex1/source/file2.html
 - examples/ex1/source/file3.lt3
 - examples/ex1/source/index.lt3
+- examples/ex1/target/file2.html
+- examples/ex1/target/file3.html
+- examples/ex1/target/index.html
 - lib/runecms.rb
 - lib/runecms/commands.rb
 - lib/runecms/support.rb
@@ -33,7 +36,7 @@ homepage: https://github.com/Hal9000/runecms
 licenses:
 - Ruby
 metadata: {}
-post_install_message: "\n  Success! For help, run 'rcms' with no parameters.\n "
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib