runeblog 0.1.59 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9609df6651bdbbca80999137759619281518ebb4d77d08d177c8d1bff9c1b22
-  data.tar.gz: fa0f3619b0d306fb7df03e8015056aea57e547ebcd94dd022154cd7caa252f18
+  metadata.gz: 7453b5f695da487a1597153fc5d1d50f6587f1af6034ffc9b0d8e11d8fdcea18
+  data.tar.gz: 0d96a8a534c8835a486c2e58685d98696919483c880221ef6e0333b39a7b868a
 SHA512:
-  metadata.gz: 7a378779a948cc365d0c42982f7aea41b0d08effb2699447411cd8ccb234b738e5af27a2341eaf177cac9193c21b141ef8aed4a27efc84e5aa1e6f3091256073
-  data.tar.gz: 352e5c1c504d476c5919d73b6df4fd22f9bf62f6c81888f0d13d54084401aaa3d26032c7bf8d15da21c3d8c7f8b81d55446fd3128f1cf9681e03c0597d72fda4
+  metadata.gz: 786b5590bbfea02bc77382d06f6ccf4ed465da0140b96d09cecd1e9297fded5d9a7b82013b235f64c7be3f13d125c9582ad92d0f5a4448bf7917310f1a93a923
+  data.tar.gz: ad8870b822206825c0a175003f5772f114724401931d64d18b3f3a3bfeae135f60fc12793525d605d40010be2ed3e32b163cd8a3dafa8516a8e87bab010ea32d

data/README.lt3

@@ -12,6 +12,8 @@ It's based on Livetext (highly extensible Ruby-based markup)
 It has the concept of multiple "views" for a blog
 .end
 
+The multiple views are in effect multiple blogs managed with the same backend.
+
 .h2 What is Livetext?
 
 Livetext is a markup format that is a throwback to the old, old days of text 
@@ -36,11 +38,15 @@ _All the views will be managed the same way in the same place, and they will all
 Any post can easily be included in a single view, in more than one, or in all of them.
 Each view can have its own look and feel, and it can be linked/published separately from the others.
 Each view can be hosted in a different location and/or a different server and domain
+Any post can be in more than one view
 .end
 
 .h2 The `blog environment
 
 There is a command-line tool called `blog which is a REPL (read-eval-print loop). 
+Note that this tool is a curses-based environment (mainly so it can display menus
+and such to the user).
+
 The help message looks like this:
 
 .mono
@@ -49,7 +55,7 @@ The help message looks like this:
      h, help           This message
      q, quit           Exit the program
 
-     change view _view Change current view
+     change view _view  Change current view
      new view          Create a new view
      list views        List all views available
      lsv               Same as: list views
@@ -62,16 +68,39 @@ The help message looks like this:
      rm _id             Remove a post
      edit _id           Edit a post
 
-     open              Look at current (local) view in browser
-     open remote       Look at current (deployed) view in browser
+     preview           Look at current (local) view in browser
+     browse            Look at current (deployed) view in browser
 
-     relink            Regenerate index for all views
-     rebuild           Regenerate all posts and relink
+     relink            Regenerate index for all views  (MAY CHANGE)
+     rebuild           Regenerate all posts and relink (MAY CHANGE)
      deploy            Deploy (current view)
 .end
 
-.h2 More later...
+.h2 Getting started
+
+But when you first run the REPL, it checks for an existing blog under the `.blog
+directory. If it doesn't find one, it asks whether you want to create a new blog.
+If you enter `y for yes, it creates a sort of "skeleton" with a single view
+called ``test_view.
+
+The next thing you should do is to create at least one view of your own. Use the
+`[new view] command for this.  
+
+(new view)
+
+(new post)
+
+(preview)
+
+(publishing one-time setup - server, ssh keys, etc.)
+
+(publish)
+
+(browse)
+
+(and so on...)
 
 *[To be continued]
 
+.h2 More later...
 

data/lib/liveblog.rb

@@ -11,34 +11,14 @@ def quote
   _optional_blank_line
 end
 
-class ::Livetext::Functions   # do this differently??
-
-  def asset   # FIXME this is baloney...
-    raise "meh"
-    param = ::Livetext::Functions.param
-    context = ::Livetext::Functions.context
-    main = context.eval("@main") rescue "NO MAIN?"
-    @meta = main.instance_eval("@main.instance_eval { @meta }")
-    @config = main.instance_eval("@main.instance_eval { @config }")
-    @root = @config.root
-
-    text, name = param.split("|")
- 
-    # FIXME how should this work?
-    view = @blog.view
-    url = find_asset(name)
-    "<a href='#{url}'>#{text}</a>"
-  end
-
-end
-
 def categories   # does nothing right now
 end
 
 
-# Move elsewhere later
+# Move elsewhere later!
 
 def h1; _out "<h1>#{@_data}</h1>"; end
+
 def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 def h4; _out "<h4>#{@_data}</h4>"; end
@@ -91,13 +71,13 @@ end
 #############
 
 def init_liveblog    # FIXME - a lot of this logic sucks
-  @blog, num = Livetext.parameters
+  @blog, num, @live = Livetext.parameters  # live is Livetext instance
   @meta = OpenStruct.new
   @meta.num = num
   @root = @blog.root rescue nil
   @view = @blog.view.name rescue nil
   @vdir = @blog.view.dir rescue nil
-  @body = ""
+  # @body = ""
 end
 
 def _errout(*args)
@@ -105,24 +85,23 @@ def _errout(*args)
 end
 
 def _passthru(line, context = nil)
-  $which = 2
   return if line.nil?
   line = _formatting(line, context)
-  @body << line + "\n"
-  @body << "<p>" if line.empty? && ! @_nopara
+  @live.body << line + "\n"
+  @live.body << "<p>" if line.empty? && ! @_nopara
 end
 
 def _passthru_noline(line, context = nil)
   return if line.nil?
   line = _formatting(line, context)
-  @body << line
-  @body << "<p>" if line.empty? && ! @_nopara
+  @live.body << line
+  @live.body << "<p>" if line.empty? && ! @_nopara
 end
 
 def title 
   title = @_data.chomp
   @meta.title = title
-  @body << "<h1>#{title}</h1>"
+  @live.body << "<h1>#{title}</h1>"
   _optional_blank_line
 end
 
@@ -140,9 +119,8 @@ end
 def image   # primitive so far
   _debug "img: huh? <img src=#{_args.first}></img>"
   fname = _args.first
-puts "image fname = #{fname}"
   path = "../assets/#{fname}"
-  @body << "<img src=#{path}></img>"
+  @live.body << "<img src=#{path}></img>"
   _optional_blank_line
 end
 
@@ -169,25 +147,25 @@ end
 # end
 
 def list
-  @body << "<ul>"
-  _body {|line| @body << "<li>#{line}</li>" }
-  @body << "</ul>"
+  @live.body << "<ul>"
+  _body {|line| @live.body << "<li>#{line}</li>" }
+  @live.body << "</ul>"
   _optional_blank_line
 end
 
 def list!
-  @body << "<ul>"
+  @live.body << "<ul>"
   lines = _body.each   # {|line| @body << "<li>#{line}</li>" }
   loop do 
     line = lines.next
     line = _formatting(line)
     if line[0] == " "
-      @body << line
+      @live.body << line
     else
-      @body << "<li>#{line}</li>"
+      @live.body << "<li>#{line}</li>"
     end
   end
-  @body << "</ul>"
+  @live.body << "</ul>"
   _optional_blank_line
 end
 
@@ -213,7 +191,7 @@ def write_post(meta)
   Dir.chdir(@postdir)
   meta.views = meta.views.join(" ")
   meta.tags  = meta.tags.join(" ") rescue ""
-  File.write("body.txt", @body)  # Actually HTML...
+  File.write("body.txt", @live.body)  # Actually HTML...
   File.write("teaser.txt", meta.teaser)
   
   fields = [:num, :title, :date, :pubdate, :views, :tags]
@@ -230,13 +208,13 @@ end
 
 def teaser
   @meta.teaser = _body_text
-  @body << @meta.teaser + "\n"
+  @live.body << @meta.teaser + "\n"
   # FIXME
 end
 
 def finalize
   if @blog.nil?
-    return @body
+    return @live.body
   end
   @slug = @blog.make_slug(@meta)
   @postdir = @blog.view.dir + "/#@slug"

data/lib/post.rb

@@ -124,8 +124,8 @@ class RuneBlog::Post
     debug "=== build"
     views = @meta.views
     text = File.read(@draft)
-    Livetext.parameters = [@blog, @meta.num]
     livetext = Livetext.new(STDOUT)
+    Livetext.parameters = [@blog, @meta.num, livetext]
     meta = livetext.process_text(text)
     raise LivetextError(@draft) if meta.nil?
 

data/lib/runeblog.rb

@@ -141,21 +141,16 @@ class RuneBlog
     dump("", "tagpool")
     view = RuneBlog::View.new(arg)
     self.view = view
-    Livetext.parameters = [RuneBlog.blog, 0]
-    devnull = File.new("/dev/null", "w")
-    live = Livetext.new(devnull)
+    live = Livetext.new(nil)
+    Livetext.parameters = [RuneBlog.blog, 0, live]
     meta = live.transform(x::BlogTemplate)
-puts x::BlogTemplate
-puts
-puts meta
-puts
-puts "---"
     dump(meta, "templates/blogview.lt3")
 #   dump(x::BlogHeader, "templates/blog_header.html")
 #   dump(x::BlogTrailer, "templates/blog_trailer.html")
     dump("Initial creation", "last_published")
     Dir.chdir(up)
     @views << view
+    @views
   end
 
   def delete_view(name, force = false)
@@ -231,8 +226,8 @@ puts "---"
     path = @root + "/src/#{file}"
     raise FileNotFound(path) unless File.exist?(path)
     num = file.to_i       # e.g. 0098-this-is-a-title
-    Livetext.parameters = [self, num]
     live = Livetext.new # (STDOUT) # (nil)
+    Livetext.parameters = [self, num, live]
     text = File.read(path)
     live.process_text(text)
   rescue => err

data/lib/runeblog_version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.1.59"
+  VERSION = "0.1.61"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/runeblog.gemspec

@@ -20,7 +20,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.8', '>= 0.8.69'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.72'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
   # Files...

data/test/make_blog.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << "./li"
+$LOAD_PATH << "./lib"
 
 major, minor = RUBY_VERSION.split(".").values_at(0,1)
 ver = major.to_i*10 + minor.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.61
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.69
+        version: 0.8.72
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.69
+        version: 0.8.72
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement