runeblog 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc3e2a34a12ed3f1e937d24cc1b8fa96a723bf2
-  data.tar.gz: 1dc3be8dce26862daf1a8e56c8e9ddbf30a55577
+  metadata.gz: d4f29cc12aa64b5f4cca11de957354c25078b3c8
+  data.tar.gz: 9d8667b9c143e2cf7552bda06107eec41d775e8c
 SHA512:
-  metadata.gz: e05a643f97da28a3866c4fef0c979f74287893c7f6c6be5a0accbbf10cec9a7a2a584386672141a5cc45494810af317e4087164a77bca7d67eb39af1850ec4fb
-  data.tar.gz: ad207fc6af4e429e12a6917ff55fe1d73eacf4384f8bc5ce7af6c275582b5f057e49388f56fa3055400ffb341bae689a6c5c2734723ac4f1061fc1f1fba645d5
+  metadata.gz: e32a753577f48d056b9c2b3a4bf1f9fbf1c267e9d73fe5e9bcac49758b1b1344c118e8b7ce2797ff67cc854db9555030ff559b3eb4d1165d3127ae39850b122a
+  data.tar.gz: edaf5b5aa7209bc640e3a743437c9818bc0587d3f37e39f15e0cfcc1bc89d973a18b53de96e5f6850e29a1ff283dc8b3cd920e4cefd2d3695594f55ad03b517a

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.69   2018-09-29
+RuneBlog v 0.0.70   2018-10-01

data/lib/post.rb

@@ -11,7 +11,9 @@ class RuneBlog::Post
     result
   end
   
-  def initialize(title, view_name)
+  def initialize(title, view_name, 
+                 teaser = "Teaser goes here.",
+                 remainder = "Remainder of post goes here.")
     raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @title = title
@@ -26,9 +28,9 @@ class RuneBlog::Post
       .views #@view
  
       .teaser
-      Teaser goes here.
+      #{teaser}
       .end
-      Remainder of post goes here.
+      #{remainder}
     EOS
  
     @draft = "#{@blog.root}/src/#@slug.lt3"

data/lib/runeblog.rb

@@ -1,11 +1,10 @@
 require 'find'
-require 'yaml'
+require 'yaml'   # get rid of YAML later
 require 'livetext'
 require 'skeleton'
 require 'view'
 require 'deploy'
 require 'post'
-require 'helpers-blog'
 require 'version'
 
 ###
@@ -143,8 +142,10 @@ class RuneBlog
     result
   end
 
-  def create_new_post(title, testing = false)
-    post = RuneBlog::Post.new(title, @view.to_s)
+  def create_new_post(title, testing = false, teaser = nil, remainder = nil)
+    teaser ||= "Teaser goes here."
+    remainder ||= "Remainder of post goes here."
+    post = RuneBlog::Post.new(title, @view.to_s, teaser, remainder)
     post.edit unless testing
     post.publish
     post.num
@@ -279,6 +280,8 @@ class RuneBlog
     [postnum, "#{num}-#{slug}"]
   end
 
+  private
+
   def subdirs(dir)
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
@@ -292,5 +295,22 @@ class RuneBlog
     files
   end
 
+  def create_dir(dir)
+    cmd = "mkdir -p #{dir} >/dev/null 2>&1"
+    result = system(cmd) 
+    raise "Can't create #{dir}" unless result
+  end
+
+  def interpolate(str)
+    wrap = "<<-EOS\n#{str}\nEOS"
+    eval wrap
+  end
+
+  def error(err)  # Hmm, this is duplicated
+    str = "\n  Error: #{err}"
+    puts str
+    puts err.backtrace
+  end
+
 end
 

data/lib/version.rb

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

data/runeblog.gemspec

@@ -1,8 +1,9 @@
 require 'date'
 require 'find'
 
-$: << "."
-require "lib/version"
+$LOAD_PATH << "lib"
+
+require "version"
 
 Gem::Specification.new do |s|
   system("rm -f *.gem")
@@ -25,9 +26,6 @@ Gem::Specification.new do |s|
   test = Find.find("test").to_a
 
   s.files       =  main + misc + test
-STDERR.puts "Files are:"
-s.files.each {|fn| STDERR.puts "  " + fn }
-STDERR.puts
   s.homepage    = 'https://github.com/Hal9000/runeblog'
-  s.license     = "Ruby's license"
+  s.license     = "Ruby license"
 end

data/test/repl.rb

@@ -9,8 +9,11 @@ class TestREPL < Minitest::Test
 
   def setup
     @blog = RuneBlog.new
+    # unpack a tarball here?? data_test
   end
 
+  # Note: "Bang" methods depend on the data_test subtree
+
   def test_001_cmd_help
     out = cmd_help(nil)
     assert out.is_a?(String), "Expected a string returned"
@@ -26,27 +29,27 @@ class TestREPL < Minitest::Test
            "Couldn't find version number"
   end
 
-  def test_003_list_views
+  def test_003_list_views!
     out = cmd_list_views(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines >= 2, "Expecting at least 2 lines"
   end
 
-  def test_004_change_view
+  def test_004_change_view!
     out = cmd_change_view(nil)  # no param
     assert out.is_a?(String), "Expected a string; got: #{out.inspect}"
     assert out =~ /view1/m, "Expecting 'view1' as default; got: #{out.inspect}"
   end
 
-  def test_005_lsd
+  def test_005_lsd!
     out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines >= 2, "Expecting more lines; got: #{out.inspect}"
   end
 
-  def test_006_lsp
+  def test_006_lsp!
     out = cmd_list_posts(nil)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
@@ -99,21 +102,21 @@ class TestREPL < Minitest::Test
     end
   end
 
-  def test_008_current_view
+  def test_008_current_view!
     assert @blog.view.to_s == "view1", "Current view seems wrong (#{@blog.view}, not view1)"
   end
 
-  def test_009_change_view
+  def test_009_change_view!
     assert @blog.change_view("view2")
     assert @blog.view.to_s == "view2", "Current view seems wrong (#{@blog.view}, not view2)"
   end
 
-  def test_010_accessors
+  def test_010_accessors!
     sorted_views = @blog.views.map(&:to_s).sort
     assert sorted_views == ["view1", "view2"], "Got: #{sorted_views.inspect}"
   end
 
-  def test_011_create_delete_view
+  def test_011_create_delete_view!
     @blog.create_view("anotherview")
     sorted_views = @blog.views.map(&:to_s).sort
     assert sorted_views == ["anotherview", "view1", "view2"], "After create: #{sorted_views.inspect}"
@@ -122,7 +125,7 @@ class TestREPL < Minitest::Test
     assert sorted_views == ["view1", "view2"], "After delete: #{sorted_views.inspect}"
   end
 
-  def test_012_create_remove_post   # FIXME - several problems here
+  def test_012_create_remove_post!   # FIXME - several problems here
     @blog.change_view("view2")
     assert @blog.view.to_s == "view2", "Expected view2"
     before = @blog.posts.size 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-29 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -50,7 +50,6 @@ files:
 - lib/deploy.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
-- lib/hmm
 - lib/post.rb
 - lib/repl.rb
 - lib/runeblog.rb
@@ -61,7 +60,7 @@ files:
 - test/repl.rb
 homepage: https://github.com/Hal9000/runeblog
 licenses:
-- Ruby's license
+- Ruby license
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/hmm

@@ -1,102 +0,0 @@
-helpers-repl.rb
-67:  def self.choose_method(cmd)
-84:  def error(err)
-90:  def ask(prompt, meth = :to_s)
-96:  def yesno(prompt, meth = :to_s)
-102:  def reset_output(initial = "")
-107:  def flush_output(initial = "")
-113:  def output(str)  # \n and indent
-118:  def outstr(str)  # \n and indent
-123:  def output!(str)  # red, \n and indent
-128:  def output_newline(n = 1)
-137:  def check_empty(arg)
-141:  def get_integer(arg)
-147:  def check_file_exists(file)
-151:  def error_cant_delete(files)
-160:  def clear
-164:  def red(text)
-168:  def blue(text)
-172:  def bold(str)
-176:  def colored_slug(slug)
-180:  def import(arg = nil)
-200:  def ask_deployment_info   # returns Deployment object
-215:#   def find_asset(asset)    # , views)
-241:#   def find_all_assets(list, views)
-
-repl.rb
-7:  def cmd_quit(arg)
-12:  def cmd_version(arg)
-19:  def cmd_browse
-34:  def cmd_preview(arg)
-44:  def cmd_deploy(arg)  # FIXME non-string return expected in caller?
-74:  def old_cmd_deploy(arg)  # FIXME non-string return expected in caller?
-104:  def cmd_rebuild(arg)
-115:  def cmd_relink(arg)
-124:  def cmd_list_views(arg)
-136:  def cmd_change_view(arg)
-153:  def cmd_new_view(arg)
-163:  def cmd_new_post(arg)
-173:  def cmd_kill(arg)
-185:  def cmd_remove_post(arg, safe=true)
-226:  def cmd_edit_post(arg)
-247:  def cmd_list_posts(arg)
-262:  def cmd_list_drafts(arg)
-280:  def cmd_INVALID(arg)
-285:  def cmd_help(arg)
-
-runeblog.rb
-5:def create_dir(dir)   # FIXME move later
-11:def interpolate(str)
-16:def error(err)  # FIXME - this is duplicated
-43:  def self.create_new_blog
-55:  def get_config(file)
-60:  def initialize(cfg_file = ".blog")   # assumes existing blog
-69:  def view?(name)
-73:  def view(name = nil)
-77:  def str2view(str)
-81:  def view=(arg)
-94:  def get_sequence
-98:  def next_sequence
-103:  def viewdir(v)
-107:  def self.exist?
-111:  def create_view(arg)
-127:  def delete_view(name, force = false)
-134:  def deployment_url
-141:  def view_files
-150:  def files_by_id(id)
-157:  def create_new_post(title, testing = false)
-166:  def edit_initial_post(file)
-174:  def posts
-180:  def drafts
-185:  def change_view(view)
-189:  def process_post(file)
-203:  def publish_post(meta)
-211:  def link_post_view(view)
-225:  def generate_index(view)
-248:  def relink
-252:  def index_entry(view, meta)
-267:  def rebuild_post(file)
-274:  def remove_post(num)
-281:  def post_exists?(num)
-286:  def make_slug(title, postnum = nil)
-293:  def subdirs(dir)
-299:  def find_src_slugs
-313:  def initialize(user, server, root, path, protocol = "http")
-319:  def url
-323:  def deploy(files)
-345:  def initialize(name)
-352:  def dir
-356:  def index
-360:  def to_s
-364:  def files(recent = false)
-373:  def deploy
-384:  def recent?(file)
-388:  def read_config
-395:  def write_config
-408:  def self.files(num, root)
-414:  def initialize(title, view_name)
-438:  def edit
-446:  def publish
-469:  def create_post_subtree(vdir)
-477:  def make_slug(postnum = nil)
-484:  def tag(num)