runeblog 0.2.90 → 0.2.95

data/lib/publish.rb

@@ -37,31 +37,15 @@ class RuneBlog::Publishing
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
 
-  def system!(str)
-    log!(enter: __method__, args: [str], level: 1)
-    rc = system(str)
-    rc
-  end
-
-  def publish(files, assets=[])
-    log!(enter: __method__, args: [files, assets], level: 1)
+  def publish
+    log!(enter: __method__, level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name
-    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
-    files.each do |file|
-      dest = "#@user@#@server:" + dir  # /view_name
-      file.gsub!(/\/\//, "/")  # weird... :-/
-      cmd = "scp -r #{file} #{dest} >/dev/null 2>/tmp/wtf"
-      debug "cmd = #{cmd.inspect}  - see /tmp/wtf"
-      result = system!(cmd) || puts("\n  Could not copy #{file} to #{dest}")
-    end
-    unless assets.empty?
-      cmd = "scp #{assets.join(' ')} #@user@#@server:#{viewpath}/assets >/dev/null 2>/tmp/wtf2"
-      result = system!(cmd)
-      raise PublishError if !result
-    end
-    dump(files, "#{@blog.view.dir}/last_published")
+    # FIXME rsync doesn't work
+    cmd = "rsync -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
+    system!(cmd)
+    dump("#{@blog.view} at #{Time.now}", "#{@blog.view.dir}/last_published")
     true
   end
 

data/lib/repl.rb

@@ -39,6 +39,7 @@ module RuneBlog::REPL
 
   def cmd_config(arg, testing = false)
     hash = {"global.lt3           Global configuration"                     => "global.lt3",
+            "banner/top.lt3       Text portion of banner"                   => "banner/top.lt3",
             "blog/generate.lt3    Generator for view (usu not edited)"      => "blog/generate.lt3",
             ".... head.lt3        HEAD info for view"                       => "blog/head.lt3",
             ".... banner.lt3      banner description"                       => "blog/banner.lt3",
@@ -75,10 +76,10 @@ module RuneBlog::REPL
   end
 
   def _manage_navbar(arg, testing = false)   # cloned from manage_pages
-    dir = @blog.view.dir/"themes/standard/navbar"
+    dir = @blog.view.dir/"themes/standard/banner/navbar"
     files = Dir.entries(dir) - %w[. .. navbar.lt3]
-    new_item = "  [New item]  "
     main_file = "[ navbar.lt3 ]"
+    new_item  = "  [New item]  "
     files = [main_file] + files + [new_item]
     num, fname = STDSCR.menu(title: "Edit navbar:", items: files)
     return if fname.nil?
@@ -113,7 +114,7 @@ module RuneBlog::REPL
     dir = @blog.view.dir/"themes/standard/widgets/pages"
     # Assume child files already generated (and list.data??)
     data = dir/"list.data"
-    lines = File.readlines(data)
+    lines = _get_data?(data)
     hash = {}
     lines.each do |line|
       url, name = line.chomp.split(",")
@@ -192,19 +193,8 @@ module RuneBlog::REPL
       return @out
     end
 
-    # Need to check dirty/clean status first
-    dirty, all, assets = @blog.view.publishable_files
-    files = dirty
-    if dirty.empty?
-      puts fx("\n  No files are out of date." + " "*20, :bold)
-      print "  Publish anyway? "
-      yn = RubyText.gets.chomp
-      files = all if yn == "y"
-    end
-    return @out if files.empty?
-
     ret = RubyText.spinner(label: " Publishing... ") do
-      @blog.view.publisher.publish(files, assets)  # FIXME weird?
+      @blog.view.publisher.publish
     end
     return @out unless ret
 
@@ -224,12 +214,31 @@ module RuneBlog::REPL
     puts "Error: See #{out}"
   end
 
+  def fresh?(src, dst)
+    return false unless File.exist?(dst)
+    File.mtime(src) <= File.mtime(dst)
+  end
+
+  def regen_posts
+    drafts = @blog.drafts  # current view
+    drafts.each do |draft|
+      orig = @blog.root/:drafts/draft
+      html = @blog.root/:posts/draft
+      html.sub!(/.lt3$/, "/guts.html")
+      next if fresh?(orig, html)
+      puts "  Regenerating #{draft}"
+      @blog.generate_post(orig)    # rebuild post
+    end
+    puts
+  end
+
   def cmd_rebuild(arg, testing = false)
     debug "Starting cmd_rebuild..."
     reset_output
     puts unless testing
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
+    regen_posts
     @out
   rescue => err
     out = "/tmp/blog#{rand(100)}.txt"
@@ -267,7 +276,7 @@ module RuneBlog::REPL
   def cmd_new_view(arg, testing = false)
     reset_output
     if arg.nil?
-      arg = ask("\nFilename: ")
+      arg = ask(fx("\nFilename: ", :bold))
       puts
     end
     @blog.create_view(arg)

data/lib/runeblog.rb

@@ -10,7 +10,6 @@ require 'logging'
 
 require 'runeblog_version'
 require 'helpers-blog'
-require 'default'
 require 'view'
 require 'publish'
 require 'post'
@@ -48,6 +47,34 @@ class RuneBlog
 
   include Helpers
 
+    class Default
+
+    # This will all become much more generic later.
+
+    def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
+                               teaser: "No teaser", body: "No body", tags: ["untagged"], 
+                               views: [], back: "javascript:history.go(-1)", home: "no url")
+      log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
+      viewlist = (views + [view.to_s]).join(" ")
+      taglist = ".tags " + tags.join(" ")
+
+      <<~TEXT
+      .post #{num}
+
+      .title #{title}
+      .pubdate #{date}
+      .views #{viewlist}
+      #{taglist}
+
+      .teaser
+      #{teaser}
+      .end
+      #{body}
+      TEXT
+    end
+
+  end
+
   def _tmp_error(err)   # FIXME move to helpers
     out = "/tmp/blog#{rand(100)}.txt"
     File.open(out, "w") do |f|
@@ -65,10 +92,13 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
-      create_dirs(:data, :drafts, :views, :posts)
+      create_dirs(:data, :config, :drafts, :views, :posts)
       new_sequence
     end
-    copy_data(:config, repo_root/:data)
+    unless File.exist?(repo_root/"data/VIEW")
+      copy_data(:config, repo_root/:data)   
+    end
+    copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
@@ -90,10 +120,10 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-    copy_data(:config, @root/:data)
     write_repo_config(root: @root)
     get_repo_config
-    @views = get_views
+    @views = retrieve_views
+    self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     if md
       @view_name = md[1]
@@ -163,7 +193,7 @@ class RuneBlog
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    preprocess cwd: dir, src: @root/:drafts/sourcefile, 
+    preprocess cwd: dir, src: @root/:drafts/sourcefile, dst: @root/:posts/sourcefile.sub(/.lt3/, ",html"),  # ZZZ
                mix: "liveblog"  # , debug: true
     _deploy_local(dir)
   rescue => err
@@ -209,6 +239,9 @@ class RuneBlog
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
     case arg
+      when "[no view]"
+        # puts "Warning: No current view set"
+        @view = nil
       when RuneBlog::View
         @view = arg
         _set_publisher
@@ -226,13 +259,13 @@ class RuneBlog
 
   def get_sequence
     log!(enter: __method__, level: 3)
-    File.read(@root/:sequence).to_i
+    File.read(@root/"data/sequence").to_i
   end
 
   def next_sequence
     log!(enter: __method__, level: 3)
     @sequence += 1
-    dump(@sequence, @root/:sequence)
+    dump(@sequence, @root/"data/sequence")
     @sequence
   end
 
@@ -472,7 +505,9 @@ class RuneBlog
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
                src: "blog/generate.lt3", dst: vdir/:remote/"index.html", 
                call: ".nopara"
+    copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+# rebuild widgets
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -484,8 +519,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
     view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call!" if view_line.size > 1
-    raise "No .views call!" if view_line.size < 1
+    raise "More than one .views call in #{draft}" if view_line.size > 1
+    raise "No .views call in #{draft}" if view_line.size < 1
     view_line = view_line.first
     views = view_line[7..-1].split
     views.uniq 
@@ -593,16 +628,12 @@ class RuneBlog
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
                dst: remote/ahtml, copy: @theme/:post,
                call: ".nopara"    # , debug: true
-    # FIXME dependencies?
-    preprocess cwd: @theme/:post, src: "permalink.lt3", 
-               dst: remote/:permalink/ahtml,
-               mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)
   end
 
-  def generate_post(draft)
+  def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
     views.each do |view| 

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.90"
+  VERSION = "0.2.95"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -41,22 +41,6 @@ def make_exception(sym, str)
   end
 end
 
-def system!(str, show: false)
-  log!(enter: __method__, args: [str], level: 2)
-  STDERR.puts str if show
-  rc = system(str)
-  if rc
-    return rc
-  else
-    STDERR.puts "FAILED: #{str.inspect}"
-    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
-    sleep 6; RubyText.stop
-exit
-    return rc
-  end
-  rc
-end
-
 def prefix(num)
   log!(enter: __method__, args: [num], level: 3)
   "#{'%04d' % num.to_i}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.90
+  version: 0.2.95
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -89,9 +89,24 @@ files:
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg
+- empty_view/config/exper/2svg.lt3
+- empty_view/config/exper/gen_svg.rb
+- empty_view/config/exper/meta.html
+- empty_view/config/exper/s2.html
+- empty_view/config/exper/varmint.rb
+- empty_view/config/facebook/facebook.rb
+- empty_view/config/facebook/fb.html
+- empty_view/config/facebook/fb.js
+- empty_view/config/reddit/config.txt
+- empty_view/config/reddit/notes.txt
+- empty_view/config/reddit/reddit_post_url.py
+- empty_view/config/reddit/redpost.rb
+- empty_view/config/reddit/the-graffiti-wall.html
+- empty_view/config/twitter/tw.html
+- empty_view/config/twitter/tw.js
+- empty_view/config/twitter/twitter.rb
 - empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
-- empty_view/remote/banner/austin-pano.jpg
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/ad/GIT_IS_DUMB
@@ -100,12 +115,12 @@ files:
 - empty_view/remote/widgets/pages/GIT_IS_DUMB
 - empty_view/remote/widgets/pinned/GIT_IS_DUMB
 - empty_view/themes/standard/README
-- empty_view/themes/standard/banner/about.lt3
-- empty_view/themes/standard/banner/contact.lt3
-- empty_view/themes/standard/banner/faq.lt3
-- empty_view/themes/standard/banner/list.data
+- empty_view/themes/standard/banner/banner.lt3
+- empty_view/themes/standard/banner/navbar/about.lt3
+- empty_view/themes/standard/banner/navbar/contact.lt3
+- empty_view/themes/standard/banner/navbar/faq.lt3
+- empty_view/themes/standard/banner/navbar/list.data
 - empty_view/themes/standard/banner/top.lt3
-- empty_view/themes/standard/blog/banner.lt3
 - empty_view/themes/standard/blog/generate.lt3
 - empty_view/themes/standard/blog/head.lt3
 - empty_view/themes/standard/blog/index.lt3
@@ -176,18 +191,11 @@ files:
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb
 - lib/Javascript.stuff
-- lib/default.rb
-- lib/exper/2svg.lt3
-- lib/exper/callout.js
-- lib/exper/fbtw-js
-- lib/exper/fbtw.rb
-- lib/exper/gen_svg.rb
-- lib/exper/s2.html
-- lib/exper/varmint.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/liveblog.rb
 - lib/logging.rb
+- lib/lowlevel.rb
 - lib/pathmagic.rb
 - lib/post.rb
 - lib/processing.rb

data/empty_view/themes/standard/banner/faq.lt3

@@ -1 +0,0 @@
-.include ../widgets/pages/faq.lt3

data/lib/default.rb

@@ -1,31 +0,0 @@
-class RuneBlog::Default
-
-# This will all become much more generic later.
-
-def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
-                       teaser: "No teaser", body: "No body", tags: ["untagged"], 
-                       views: [], back: "javascript:history.go(-1)", home: "no url")
-  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
-  viewlist = (views + [view.to_s]).join(" ")
-  taglist = ".tags " + tags.join(" ")
-
-# .mixin liveblog
-# . ^ get rid of this later
-
-<<-TEXT
-.post #{num}
- 
-.title #{title}
-.pubdate #{date}
-.views #{viewlist}
-#{taglist}
- 
-.teaser
-#{teaser}
-.end
-#{body}
-TEXT
-
-end
-
-end

data/lib/exper/callout.js

@@ -1,10 +0,0 @@
-  function callout(d, id, src) {
-     var js, fjs = d.getElementsByTagName('script')[0];
-     p=/^http:/.test(d.location)?'http':'https';
-     if (d.getElementById(id)) {return;}
-     js = d.createElement('script'); 
-     js.id = id;
-     js.src = p + src;
-     fjs.parentNode.insertBefore(js, fjs);
-  }
-

data/lib/exper/fbtw-js

@@ -1,48 +0,0 @@
-
-<!-- scripts: FB, twitter -->
-
-<script>
-  window.fbAsyncInit = function() {
-    FB.init({
-      appId      : '1176481582378716',
-      xfbml      : true,
-      version    : 'v2.4'
-    });
-  };
-
-  callout(document, 'facebook-jssdk', 
-          '//connect.facebook.net/en_US/sdk.js');
-
-  callout(document, 'script', 'twitter-wjs', 
-         '//platform.twitter.com/widgets.js';
-</script>
-
-<!-- meta tags -->
-
-<!-- meta property='fb:admins' content='767352779' /> -->
-<meta property='og:url' content='http://rubyhacker.com/blog2/#{slug}.html'/>
-<meta property='og:type' content='article'/>
-<meta property='og:title' content='#{title}'/>
-<meta property='og:image' content='http://rubyhacker.com/blog2/blog3b.gif'/>
-<meta property='og:description' content='#{teaser}'/>
-
-<!-- facebook -->
-
-<div
-  class='fb-like'
-  data-share='true'
-  data-width='450'
-  data-show-faces='true'>
-</div>
-
-<!-- Twitter: share, follow -->
-
-<a href='https://twitter.com/share' 
-   class='twitter-share-button' 
-   data-text='#{title}' 
-   data-url='#{'url'}' 
-   data-via='hal_fulton' 
-   data-related='hal_fulton'>Tweet</a>
-
-<a href='https://twitter.com/hal_fulton' class='twitter-follow-button' data-show-count='false'>Follow @hal_fulton</a>
-