runeblog 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62fde463d4650be5151082ff3264dac4858951cc922e374631c514e1be69496c
-  data.tar.gz: c21b97c8f632abb8562af9f954c4c002c960a4e184d8522a4188cddbe90555ae
+  metadata.gz: c7e60e928c25021c92aebd529ba8f6055f84c308669621288682b39b0c26f3e7
+  data.tar.gz: 20e95da9e75e8a81cb0b817e5ae14c14966b290e45cd53c1853667d130b20cbf
 SHA512:
-  metadata.gz: 4017885e99583e03ef36a040b1dfc295e2d792a1fff3284ec575548d8fc3323bed79fd2e82ff6d3256fef6502e0828c8c26c657687504150c763c9cf72ef423b
-  data.tar.gz: c85df56291b2dc303a46975ead280669493a122e3828578bdcb95fab7f049e6d2a735bcb643b99a322ca6df741299a47bfb76ba45cc60cd860b636f3e57ba593
+  metadata.gz: ea7b874a79b7578d965f7168d3297e323007c2d508376dee2117f018fd945431f4c11aefb6a003a547ceed1ea242323c94596a9375a18dc3ec330a8e32e4c5d0
+  data.tar.gz: 4b407b0fc756bef01e25e6192ab5fc51c623cc5dd2ac02b0cfae80345b6683d93ca5f4d8fd7d78c1aff0cf63cf9b630801e6aa45886604c9b15af49b16a01858

data/lib/repl.rb

@@ -33,7 +33,7 @@ module RuneBlog::REPL
     check_empty(arg)
     output RuneBlog::VERSION
     puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red) unless testing
-    [true, @out]
+    @out
   end
 
   def cmd_config(arg, testing = false)
@@ -81,11 +81,11 @@ module RuneBlog::REPL
     if url.nil?   
       output! "Publish first."
       puts "\n  Publish first."
-      return [false, @out]
+      return @out
     end
     result = system("open '#{url}'")
     raise CantOpen(url) unless result
-    return [true, @out]
+    return @out
   end
 
   def cmd_preview(arg, testing = false)
@@ -94,7 +94,7 @@ module RuneBlog::REPL
     local = @blog.view.index
     result = system("open #{local}")
     raise CantOpen(local) unless result
-    [true, @out]
+    @out
   end
 
   def cmd_publish(arg, testing = false)
@@ -104,7 +104,7 @@ module RuneBlog::REPL
     unless @blog.view.can_publish?
       puts "Can't publish without entries in #{@blog.view.name}/publish" unless testing
       output! "Can't publish without entries in #{@blog.view.name}/publish"
-      return [false, @out]
+      return @out
     end
     # Need to check dirty/clean status first
     dirty, all, assets = @blog.view.publishable_files
@@ -115,19 +115,19 @@ module RuneBlog::REPL
       yn = RubyText.gets.chomp
       files = all if yn == "y"
     end
-    return [false, @out] if files.empty?
+    return @out if files.empty?
 
     ret = RubyText.spinner(label: " Publishing... ") do
       @blog.view.publisher.publish(files, assets)  # FIXME weird?
     end
-    return [false, @out] unless ret
+    return @out unless ret
     vdir = @blog.view.dir
     dump("fix this later", "#{vdir}/last_published")
     if ! testing || ! ret
       puts "  ...finished.\n " 
       output! "...finished.\n"
     end
-    return [true, @out]
+    return @out
   end
 
   def cmd_rebuild(arg, testing = false)
@@ -138,14 +138,14 @@ module RuneBlog::REPL
     files = @blog.find_src_slugs
     files.each {|file| @blog.rebuild_post(file) }
     File.write("#{@blog.root}/src/last_rebuild", Time.now)
-    [true, @out]
+    @out
   end
 
   def cmd_relink(arg, testing = false)
     reset_output
     check_empty(arg)
     @blog.relink
-    [true, @out]
+    @out
   end
 
   def cmd_change_view(arg, testing = false)
@@ -159,7 +159,7 @@ module RuneBlog::REPL
       @blog.view = name
       output name + "\n"
       puts "\n  ", fx(name, :bold), "\n" unless testing
-      return [false, @out]
+      return @out
     else
       if @blog.view?(arg)
         @blog.view = arg  # reads config
@@ -167,7 +167,7 @@ module RuneBlog::REPL
         puts "\n  ", fx(arg, :bold), "\n" unless testing
       end
     end
-    return [true, @out]
+    return @out
   end
 
   def cmd_new_view(arg, testing = false)
@@ -176,7 +176,7 @@ module RuneBlog::REPL
     resp = yesno("Add publishing info now? ")
     @blog.view.publisher = ask_publishing_info
     write_config(@blog.view.publisher,  @blog.view.dir + "/publish")  # change this?
-    [true, @out]
+    @out
   end
 
   def cmd_new_post(arg, testing = false)
@@ -185,7 +185,7 @@ module RuneBlog::REPL
     title = ask("\nTitle: ")
     @blog.create_new_post(title)
     STDSCR.clear
-    [true, @out]
+    @out
   rescue => err
     puts err
     puts err.backtrace.join("\n")
@@ -200,7 +200,7 @@ module RuneBlog::REPL
       puts ret
       output ret
     end
-    [true, @out]
+    @out
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -212,7 +212,7 @@ module RuneBlog::REPL
     result = @blog.remove_post(id)
     output! "Post #{id} not found" if result.nil?
 #   puts "Post #{id} not found" if result.nil?
-    [true, @out]
+    @out
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -241,7 +241,7 @@ module RuneBlog::REPL
     file = files.first
     result = edit_file("#{@blog.root}/src/#{file}")
     @blog.rebuild_post(file)
-    [true, @out]
+    @out
   end
 
   def cmd_list_views(arg, testing = false)
@@ -255,7 +255,7 @@ module RuneBlog::REPL
       puts "  ", v unless testing
     end
     puts unless testing
-    [true, @out]
+    @out
   end
 
   def cmd_list_posts(arg, testing = false)
@@ -278,7 +278,7 @@ module RuneBlog::REPL
       end
     end
     puts unless testing
-    [true, @out]
+    @out
   end
 
   def cmd_list_drafts(arg, testing = false)
@@ -288,7 +288,7 @@ module RuneBlog::REPL
     if drafts.empty?
       output! "No drafts"
       puts "\n  No drafts\n " unless testing
-      return [false, @out]
+      return @out
     else
       puts unless testing
       drafts.each do |draft| 
@@ -299,7 +299,7 @@ module RuneBlog::REPL
       end
     end
     puts unless testing
-    [true, @out]
+    @out
   end
 
   def cmd_list_assets(arg, testing = false)
@@ -310,7 +310,7 @@ module RuneBlog::REPL
     if assets.empty?
       output! "No assets"
       puts "  No assets" unless testing
-      return [false, @out]
+      return @out
     else
       puts unless testing
       assets.each do |name| 
@@ -320,7 +320,7 @@ module RuneBlog::REPL
       end
     end
     puts unless testing
-    [true, @out]
+    @out
   end
 
   def cmd_ssh(arg, testing = false)
@@ -333,7 +333,7 @@ module RuneBlog::REPL
     print fx("\n  Command ", :bold)
     print fx(arg, Red, :bold)
     puts fx(" was not understood.\n ", :bold)
-    [true, @out]
+    @out
   end
 
   def cmd_help(arg, testing = false)
@@ -387,7 +387,7 @@ module RuneBlog::REPL
       puts s2
     end
     puts unless testing
-    [true, @out]
+    @out
   end
 
 end

data/lib/runeblog_version.rb

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

data/test/{general.rb → general_test.rb}

@@ -1,6 +1,8 @@
 $LOAD_PATH << "."
+# require "test_helper"
 
 require "minitest/autorun"
+require "minitest/fail_fast"
 
 require 'runeblog'
 require 'lib/repl'
@@ -34,15 +36,15 @@ class TestREPL < Minitest::Test
 
   def test_001_cmd_help
 #   puts __method__
-    flag, out = cmd_help(nil, true)
+    out = cmd_help(nil, true)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
-    assert lines > 25, "Expecting lengthy help message"
+    assert lines > 15, "Expecting lengthy help message"
   end
 
   def test_002_cmd_version
 #   puts __method__
-    flag, out = cmd_version(nil, true)
+    out = cmd_version(nil, true)
     assert out.is_a?(String), "Expected a string returned"
     lines = out
     assert lines =~ /\d+\.\d+\.\d+/m,
@@ -51,7 +53,7 @@ class TestREPL < Minitest::Test
 
   def test_003_list_views!
 #   puts __method__
-    flag, out = cmd_list_views(nil, true)
+    out = cmd_list_views(nil, true)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines >= 2, "Expecting at least 2 lines"
@@ -59,14 +61,14 @@ class TestREPL < Minitest::Test
  
   def test_004_change_view!
 #   puts __method__
-    flag, out = cmd_change_view(nil, true)  # no param, but testing
+    out = cmd_change_view(nil, true)  # no param, but testing
     assert out.is_a?(String), "Expected a string; got: #{out.inspect}"
     assert out =~ /alpha_view/m, "Expecting 'alpha_view' as default; got: #{out.inspect}"
   end
 
   def test_005_lsd!
 #   puts __method__
-    flag, out = cmd_list_drafts(nil, true)
+    out = cmd_list_drafts(nil, true)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines == 10, "Expecting 10 lines; got #{show_lines(out)}"
@@ -74,7 +76,7 @@ class TestREPL < Minitest::Test
 
   def test_006_lsp!
 #   puts __method__
-    flag, out = cmd_list_posts(nil, true)
+    out = cmd_list_posts(nil, true)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
     assert lines == 6, "Expecting 6 lines; got #{show_lines(out)}"
@@ -198,19 +200,17 @@ class TestREPL < Minitest::Test
   end
 
   def xtest_014_remove_nonexistent_post!
-#   puts __method__
     @blog.change_view("alpha_view")
-    flag, out = cmd_remove_post(99, true)
+    out = cmd_remove_post(99, true)
     assert out =~ /Post 99 not found/, "Expected error about nonexistent post, got: #{out}"
   end
 
   def xtest_015_kill_multiple_posts!
-#   puts __method__
     @blog.change_view("alpha_view")
-    flag, out = cmd_list_posts(nil, true)
+    out = cmd_list_posts(nil, true)
     before = out.split("\n").length 
-    flag, out = cmd_kill("1  2 7", true)
-    flag, out = cmd_list_posts(nil, true)
+    cmd_kill("1  2 7", true)
+    out = cmd_list_posts(nil, true)
     after = out.split("\n").length 
     expecting = before - 3
     assert after == expecting, "list_posts saw #{before} posts, now #{after} (not #{expecting})"

data/test/make_blog.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << "."
+$LOAD_PATH << "./li"
 
 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.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -72,7 +72,7 @@ files:
 - lib/runeblog.rb
 - lib/runeblog_version.rb
 - lib/view.rb
-- test/general.rb
+- test/general_test.rb
 - test/make_blog.rb
 - test/test
 homepage: https://github.com/Hal9000/runeblog