runeblog 0.0.74 → 0.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a13b9ee6fc708cd9ff07fb2a47c0766f3c9480
-  data.tar.gz: 5f44f9d028f5d9c1a6d17e3a91df6108a50c97ec
+  metadata.gz: a4f022029eff4356a8b19be4c514270df9ef66c8
+  data.tar.gz: 5d0de42753a94a46d2c0e39618cca82520eb205d
 SHA512:
-  metadata.gz: d0c8fc2fa446cb59168bbbc5dfbf632169a2324ead513603abd810ae7985843853c8a14422803073e868bc4bf0909023199264617fe54fbc9ec273f6c7ed618d
-  data.tar.gz: c4a0bb0d1d47a4bd67801755544af8d1b85701793119957c920f3170746a1f5a0397228d90168c95a894010bae6f69e6426183a9eb3fb89eee563cc514091e51
+  metadata.gz: d5b401630040d46ee91d26a5a36be07afcbf5ccf40e6efae2ceb9aaff09bbe0420b220c0c2325a7ce8e1987dfd3c95c058bedfd283d11c1079409cc3110d572c
+  data.tar.gz: b7e4c67b79cd72d8bcd180a6b9bef1813c3b14c5c8047ea6d7f9b25f8c7aa6edba7fb122c6070d04e46b0914727713a0b643964af3a41101b82b288fabcf5527

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.74   2018-10-02
+RuneBlog v 0.0.75   2018-10-02

data/lib/post.rb

@@ -72,7 +72,7 @@ class RuneBlog::Post
     File.write("metadata.yaml", @meta.to_yaml)
     File.write("teaser.txt", @meta.teaser)
     File.write("remainder.txt", @meta.remainder)
-    template = File.read(vdir + "/custom/post_template.html")
+    template = File.read(@blog.root + "/_default/custom/post_template.html")
     text = interpolate(template)
     File.write("index.html", text)
   end

data/lib/runeblog.rb

@@ -28,16 +28,21 @@ class RuneBlog
   attr_reader :root, :views, :sequence
   attr_accessor :view  # overridden
 
-  def self.create_new_blog
-    #-- what if data already exists?
-    result = system("cp -r #{RuneBlog::DefaultData} .")
-    raise "Error copying default data" unless result
-
-    File.open(".blog", "w") do |f| 
-      f.puts "data" 
-      f.puts "no_default"
+  def self.create_new_blog(dir = "data")
+    File.write(".blog", "#{dir}\nno_default\n")
+    # .blog lives above the entire subtree
+    Dir.mkdir(dir)   #-- what if dir already exists?
+    Dir.chdir(dir) do
+      create_dir("views")
+      create_dir("assets")
+      create_dir("src")
+      File.write("sequence", 0)
+
+      result = system("cp -r #{RuneBlog::DefaultData} .")
+      raise "Error copying default data" unless result
+
+      File.write("VERSION", "#{RuneBlog::VERSION}\nBlog created: " + Time.now.to_s )
     end
-    File.open("data/VERSION", "a") {|f| f.puts "\nBlog created: " + Time.now.to_s }
   end
 
   def get_config(file)
@@ -100,11 +105,11 @@ class RuneBlog
     names = self.views.map(&:to_s)
     raise "view #{arg} already exists" if names.include?(arg)
 
-    dir = @root + "/views/" + arg + "/"
+    dir = "#@root/views/#{arg}/"
+    create_dir(dir)
     create_dir(dir + 'custom')
     create_dir(dir + 'assets')
-    File.open(dir + "deploy", "w") { }  # FIXME
-
+    File.write(dir + "deploy", "")
     File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
     File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
     File.write(dir + "custom/post_template.html", RuneBlog::PostTemplate)
@@ -151,6 +156,7 @@ class RuneBlog
     post.publish
     post.num
   rescue => err
+p :ERROR
     puts err # error(err)
   end
 
@@ -288,6 +294,8 @@ class RuneBlog
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
+  rescue => err
+    p err
   end
 
   def find_src_slugs

data/lib/version.rb

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

data/test/repl.rb

@@ -7,10 +7,46 @@ require 'lib/repl'
 class TestREPL < Minitest::Test
   include RuneBlog::REPL
 
+  def make_post(x, title)
+    meta = OpenStruct.new
+    meta.title = title
+    num = x.create_new_post(meta, true)
+  end
+
+  def show_lines(text)
+    lines = text.split("\n")
+    str = "#{lines.size} lines\n"
+    lines.each {|line| str << "  #{line.inspect}\n" }
+    str
+  end
+
   def setup
     system("rm -rf data_test")
-    system("tar xvf data_test.tar 2>/dev/null")
-    @blog = RuneBlog.new
+#   system("tar xvf data_test.tar 2>/dev/null")
+    RuneBlog.create_new_blog(Dir.pwd + "/data_test")
+    x = RuneBlog.new
+    x.create_view("alpha_view")
+    x.create_view("beta_view")
+    x.create_view("gamma_view")
+
+    x.change_view("alpha_view")    # 1 2 7 8 9 
+    make_post(x, "Post number 1")
+    make_post(x, "Post number 2")
+    x.change_view("beta_view")     # 3 5 6
+    make_post(x, "Post number 3")
+    x.change_view("gamma_view")    # 4 10
+    make_post(x, "Post number 4")
+    x.change_view("beta_view")
+    make_post(x, "Post number 5")
+    make_post(x, "Post number 6")
+    x.change_view("alpha_view")
+    make_post(x, "Post number 7")
+    make_post(x, "Post number 8")
+    make_post(x, "Post number 9")
+    x.change_view("gamma_view")
+    make_post(x, "Post number 10")
+    x.change_view("alpha_view")
+    @blog = x
   end
 
   # Note: "Bang" methods depend on the data_test subtree
@@ -47,14 +83,14 @@ class TestREPL < Minitest::Test
     out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
-    assert lines == 7, "Expecting more lines; got: #{out.inspect}"
+    assert lines == 11, "Expecting 11 lines; got #{show_lines(out)}"
   end
 
   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 
-    assert lines == 6, "Expecting more lines; got: #{out.inspect}"
+    assert lines == 7, "Expecting 7 lines; got #{show_lines(out)}"
   end
 
   def test_007_parser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.74
+  version: 0.0.75
 platform: ruby
 authors:
 - Hal Fulton