runeblog 0.3.26 → 0.3.28

data/lib/repl.rb

@@ -39,7 +39,7 @@ module RuneBlog::REPL
 
   def cmd_config
     hash = {"Variables (general)"                 => "global.lt3",
-            "   View-specific"                    => "../../settings/view.txt",
+            "   View-specific"                    => "../settings/view.txt",
             "   Recent posts"                     => "../../settings/recent.txt",
             "   Publishing"                       => "../../settings/publish.txt",
             "Configuration: enable/disable"       => "../../settings/features.txt",
@@ -253,7 +253,6 @@ log! str:  "===   ...finished!"
       name = @blog.view.name
       k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n, wrap: true)
       return if name.nil?
-log! str:  "cv Setting to #{name.inspect}"
       @blog.view = name
 #     puts "\n  ", fx(name, :bold), "\n"
       return
@@ -371,7 +370,8 @@ log! str:  "cv Setting to #{name.inspect}"
 
   def cmd_list_views
     puts
-    @blog.views.each do |v| 
+    list = @blog.views
+    list.each do |v| 
       v = v.to_s
       title = view2title(v)
       v = fx(v, :bold) if v == @blog.view.name
@@ -412,22 +412,16 @@ log! str:  "cv Setting to #{name.inspect}"
     if curr_drafts.empty?
       puts "\n  No drafts\n "
       return
-    else
-      puts
-      curr_drafts.each do |draft| 
-        base = draft.sub(/.lt3$/, "")
-        dir = @blog.root/:posts/base
-        meta = nil 
-        Dir.chdir(dir) { meta = @blog.read_metadata }
-        num, title = meta.num, meta.title
-        num = '%4d' % num.to_s
-        puts "  ", fx(num, Red), "  ", fx(title, Black)
-        other = @blog._get_views(@blog.root/:drafts/draft) - [@blog.view.to_s]
-        unless other.empty?
-          print fx(" "*9 + "also in: ", :bold) 
-          puts other.join(", ") 
-        end
-      end
+    end
+    puts
+    curr_drafts.each do |draft| 
+      base = draft.sub(/.lt3$/, "")
+      dir = @blog.root/:posts/base
+      meta = nil 
+      Dir.chdir(dir) { meta = @blog.read_metadata }
+      num, title = meta.num, meta.title
+      num = '%4d' % num.to_s
+      puts "  ", fx(num, Red), "  ", fx(title, Black)
     end
     puts
   end
@@ -438,12 +432,11 @@ log! str:  "cv Setting to #{name.inspect}"
     if assets.empty?
       puts "  No assets"
       return
-    else
-      puts
-      assets.each do |name| 
-        asset = File.basename(name)
-        puts "  ", fx(asset, Blue)
-      end
+    end
+    puts
+    assets.each do |name| 
+      asset = File.basename(name)
+      puts "  ", fx(asset, Blue)
     end
     puts
   end

data/lib/runeblog.rb

@@ -58,9 +58,9 @@ class RuneBlog
     include ErrorChecks
   end
 
-  attr_reader :views, :sequence
-  attr_accessor :root, :editor, :features
-  attr_accessor :view  # overridden
+  attr_reader   :views, :sequence
+  attr_accessor :root,  :editor, :features
+  attr_accessor :view   # overridden
   attr_accessor :post
 
   attr_accessor :post_views, :post_tags, :dirty_views
@@ -74,7 +74,7 @@ class RuneBlog
                                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(" ")
+      viewlist = (views + [view.to_s]).join(" ").uniq
       taglist = ".tags " + tags.join(" ")
 
       <<~TEXT
@@ -96,9 +96,9 @@ class RuneBlog
 
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
+    check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
     check_nonempty_string(root_rel)
     repo_root = Dir.pwd/root_rel
-    check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
 
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
@@ -110,7 +110,6 @@ class RuneBlog
     unless File.exist?(repo_root/"data/VIEW")
       copy_data(repo_root/:data)   
     end
-#   copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     # Weird. Like a singleton - dumbass circular dependency?
     self.blog = blog = self.new
@@ -128,32 +127,35 @@ class RuneBlog
     _tmp_error(err)
   end
 
-  def initialize(root_rel = ".blogs")   # always assumes existing blog
-    log!(enter: "initialize", args: [root_rel])
-    # Weird. Like a singleton - dumbass circular dependency?
-    self.class.blog = self   
-
-    @root = Dir.pwd/root_rel
-    # write_repo_config(root: @root)   # ?? FIXME
-    get_repo_config
-    read_features   # top level
-    @views = retrieve_views
-    self.view = File.read(@root/"data/VIEW").chomp
-    md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    if md
-      @view_name = md[1]
-      @view = str2view(@view_name)
+################
+
+  def self.read(root_rel = ".blogs")   # always assumes existing blog
+    log!(enter: "RuneBlog.read", args: [root_rel])
+    instance = RuneBlog.allocate
+    instance.instance_eval do
+      @blog = instance    # Duhhh
+      @root = Dir.pwd/root_rel
+      # _init_get_view    ##########??????
+      # self.class.blog = self   # Weird, like singleton. Dumbass circular dependency?
+      RuneBlog.blog = instance
+      dirs = subdirs("#@root/views/").sort
+      @views = dirs.map {|name| RuneBlog::View.new(name) }
+      @curr = str2view(File.read(@root/"data/VIEW").chomp)
+      @view = @curr
+      # ...was init_get_view
+      @sequence, @post_views, @post_tags = get_sequence, [], []
     end
-    @sequence = get_sequence
-    @post_views = []
-    @post_tags = []
+    return instance
   rescue => err
-    puts "Error - see stdout.txt"
-    STDERR.puts err.inspect
-    STDERR.puts err&.backtrace
+    puts "ERROR - #{err.inspect}"
+    # puts "Error - see stderr.out"
+    puts err.inspect + "\n" + err&.backtrace
     sleep 3
   end
 
+  def initialize    ##### FIXME ??
+  end
+
   def complete_file(name, vars, hash)
     debugging = vars.nil?
     return if hash.empty?
@@ -270,14 +272,6 @@ class RuneBlog
     views.any? {|x| x.name == name }
   end
 
-# def view(name = nil)
-#   log!(enter: __method__, args: [name], level: 3)
-#   return @view if name.nil?
-# 
-#   check_nonempty_string(name)
-#   return str2view(name)
-# end
-
   def str2view(str)
     log!(enter: __method__, args: [str], level: 3)
     check_nonempty_string(str)  # redundant?
@@ -297,15 +291,12 @@ class RuneBlog
       @view = nil
       return
     end
-# STDERR.puts "view=  #{arg.inspect}"
-
     case arg
       when RuneBlog::View
         @view = arg
         @view.get_globals(true)
       when String
         new_view = str2view(arg)
-# STDERR.puts "view=  new view #{new_view.inspect}"
         check_error(NoSuchView, arg) { new_view.nil? }
         @view = new_view
       else 
@@ -541,11 +532,10 @@ class RuneBlog
       next unless Dir.exist?(postdir)
       meta = nil
       Dir.chdir(postdir) { meta = read_metadata }
-# puts [draft, meta.views].inspect
       list << draft if meta.views.include?(self.view.to_s)
     end
-    # list.sort
-    curr_drafts
+    # curr_drafts
+    list.sort
   end
 
   def all_drafts
@@ -739,8 +729,7 @@ args = {cwd: pdraft, src: draft, debug: true, dst: "guts.html",
 
   def remove_post(num)
     log!(enter: __method__, args: [num], level: 1)
-    check_integer(num)
-    # FIXME update original draft .views
+    check_integer(num)   # FIXME update original draft .views
     tag = prefix(num)
     files = Find.find(self.view.dir).to_a
     list = files.select {|x| File.directory?(x) and x =~ /#{tag}/ }

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.26"
+  VERSION = "0.3.28"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -39,8 +39,8 @@ class RuneBlog::View
 
     live = Livetext.customize(call: ".nopara")
     live.xform_file(gfile)
-    live._setvar("ViewDir", @blog.root/:views/@name)
-    live._setvar("View",    @name)
+    live.setvar("ViewDir", @blog.root/:views/@name)
+    live.setvar("View",    @name)
     @globals = live.vars
 #   dump_globals_stderr
   end

data/runeblog.gemspec

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.10'
+  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.33'
   s.add_runtime_dependency 'rubytext', '~> 0.1',  '>= 0.1.23'
   s.add_runtime_dependency 'rouge',    '~> 3.25', '>= 3.25.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.28
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.33
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -54,42 +54,42 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.25.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.25.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.0
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com
 executables:
@@ -101,6 +101,7 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
+- bin/blog.rb
 - bin/mkwidget
 - data/EDITOR
 - data/ROOT
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A command-line blogging system