runeblog 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72cd82f9c7134b97443bf105553f82e4520ecc3fee581a9a0543c1ea91cf82b
-  data.tar.gz: 31db4f83710a441e5a27305edba5c198e6e62138e2b40ae4c87131229b7033b5
+  metadata.gz: 631b81f8592a8997e7d8c6fee1fc2f71a03e97e42d33e64e221e9971d08319ec
+  data.tar.gz: 64b2c372f7d4f4c1d3cfa7fdd19c178087e0444f712773cb523e990ec220cf5b
 SHA512:
-  metadata.gz: 1a74945ef0c5a2bed46e70987895e1a5bd2886de6dde5a433a03b7e827f94aa6d5c2e16f577ee8f04edb76938b1285acb5f9236ebe970146524ab62e1c03504b
-  data.tar.gz: ef357bcfe3df3a79fe91dfc0287b319327bf403a6f26d402975a5b65a67febf72756cbd04a75c7e2489cc9ad3a54859f9e8576094236f147824f5de1450424da
+  metadata.gz: a27f9f6fd7c8859bacfd7ad112918bfebd416e436b4852523b41f449311ae63cab5d085830947022f87fa1a3c2d70b639e0e5d672176e3fcdbc2ff461cc3effa
+  data.tar.gz: 16eebca900c51bbadbb9ebaa14832b5a91375f726db789c50e9aad188be2f853859bc7dbf8a31798ec79735bae150eccf2a9cbf97c68cff5656af686acc26f26

data/lib/helpers-blog.rb

@@ -67,17 +67,17 @@ module RuneBlog::Helpers
     vals
   end
 
-def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
-  log!(enter: __method__, args: [root, view, editor])
-  Dir.mkdir(root) unless Dir.exist?(root)
-  Dir.chdir(root) do 
-    File.open("config", "w") do |cfg|
-      cfg.puts "root: #{root}"
-      cfg.puts "current_view: #{view}"
-      cfg.puts "editor: #{editor}"
-    end
-  end
-end 
+# def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
+#   log!(enter: __method__, args: [root, view, editor])
+#   Dir.mkdir(root) unless Dir.exist?(root)
+#   Dir.chdir(root) do 
+#     File.open("config", "w") do |cfg|
+#       cfg.puts "root: #{root}"
+#       cfg.puts "current_view: #{view}"
+#       cfg.puts "editor: #{editor}"
+#     end
+#   end
+# end 
 
   def write_config(obj, file)
     log!(enter: __method__, args: [obj, file])
@@ -95,10 +95,10 @@ end
 
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
     log!(enter: __method__, args: [root, current_view, editor])
-    root = Dir.pwd + "/" + root
+    root = Dir.pwd/root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, ".blogs/" + RuneBlog::ConfigFile)
+    write_config(x, root/RuneBlog::ConfigFile)
   end
 
   def new_sequence

data/lib/helpers-repl.rb

@@ -207,19 +207,6 @@ module RuneBlog::REPL
     error(err)
   end
 
-  def ask_publishing_info   # returns Publishing object
-    # user, server, root, path, protocol = "http"
-    puts "Please enter publishing data for view #{@blog.view}..."
-    user = ask("User: ")
-    root = ask("Doc root: ")
-    server = ask("Server: ")
-    path = ask("View path: ")
-    proto = ask("Protocol (ENTER for http): ")
-    [user, root, server, path, proto].each {|x| x.chomp! }
-    proto = "http" if proto.empty?
-    RuneBlog::Publishing.new(user, server, root, path, proto)
-  end
-
   def tags_for_view(vname = @blog.view)
     Dir.chdir(vname) do
       fname = "tagpool"

data/lib/liveblog.rb

@@ -13,7 +13,7 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
   dir = here
   loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
-  Dir.chdir(here)
+  Dir.chdir(here)     #  here??? or dir??
   @blog = RuneBlog.new(dir)
   @root = @blog.root
   @view = @blog.view
@@ -23,21 +23,6 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @theme = @vdir/:themes/:standard
 end
 
-## FIXME - livetext is duplicated from helpers-blog
-#
-#  def livetext(src, dst=nil, cwd=Dir.pwd)
-#    Dir.chdir(cwd) do 
-#      src += ".lt3" unless src.end_with?(".lt3")
-#      if dst
-#        dst += ".html" unless dst.end_with?(".html")
-#      else
-#        dst = src.sub(/.lt3$/, "")
-#      end
-#      return unless stale?(src, dst)
-#      system("livetext #{src} >#{dst}")
-#    end
-#  end
-
 ##################
 # "dot" commands
 ##################

data/lib/publish.rb

@@ -7,18 +7,27 @@ class RuneBlog::Publishing
   BadRemoteLogin = Exception.new("Can't login remotely")
   BadRemotePerms = Exception.new("Bad remote permissions")
 
-  def initialize(*params)
-    log!(enter: __method__, args: [*params])
+  def initialize(view)
+    log!(enter: __method__, args: [view.to_s])
     @blog = RuneBlog.blog
-    # Clunky...
-    if params.size == 1 && params[0].is_a?(OpenStruct)
-      obj = params[0]
-      array = obj.to_h.values_at(:user, :server, :docroot, 
-                                 :path, :proto)
-      @user, @server, @docroot, @path, @proto = *array
-    else
-      @user, @server, @docroot, @path, @proto = *params
-    end
+#     # Clunky...
+#     if params.size == 1 && params[0].is_a?(OpenStruct)
+#       obj = params[0]
+#       array = obj.to_h.values_at(:user, :server, :docroot, 
+#                                  :path, :proto)
+#       @user, @server, @docroot, @path, @proto = *array
+#     else
+#       @user, @server, @docroot, @path, @proto = *params
+#     end
+    # find a better way?
+    gfile = @blog.root/:views/view/"themes/standard/global.lt3"
+    data = File.readlines(gfile)
+    grab = ->(var) { data.grep(/^#{var} /).first.chomp.split(" ", 2)[1] }
+    @user    = grab.call("publish.user")
+    @server  = grab.call("publish.server")
+    @docroot = grab.call("publish.docroot")
+    @path    = grab.call("publish.path")
+    @proto   = grab.call("publish.proto")
   end
 
   def to_h
@@ -44,7 +53,7 @@ class RuneBlog::Publishing
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir/view_name
-    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
+#   result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
     files.each do |file|
       dest = "#@user@#@server:" + dir/view_name

data/lib/repl.rb

@@ -39,10 +39,7 @@ module RuneBlog::REPL
   def cmd_config(arg, testing = false)
     check_empty(arg)
     dir = @blog.view.dir
-# FIXME bad path
-    items = ["publish", 
-             "themes/standard/blogview.lt3", 
-             "themes/standard/post-index.lt3"] 
+    items = ["themes/standard/blogview.lt3", "themes/standard/post-index.lt3"] 
     num, fname = STDSCR.menu(title: "Edit file:", items: items)
     edit_file("#{dir}/#{fname}")
   end
@@ -94,17 +91,26 @@ module RuneBlog::REPL
 
   def cmd_publish(arg, testing = false)
 # Future Hal says please refactor this
+STDERR.puts :CP1
     puts unless testing
+STDERR.puts :CP2
     reset_output
+STDERR.puts :CP3
     check_empty(arg)
+STDERR.puts :CP4
     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"
+STDERR.puts :CP5
+      msg = "Can't publish... see globals.lt3"
+      puts msg unless testing
+      output! msg
       return @out
     end
 
+STDERR.puts :CP6
     # Need to check dirty/clean status first
     dirty, all, assets = @blog.view.publishable_files
+STDERR.puts [dirty, all, assets].inspect
+sleep 8
     files = dirty
     if dirty.empty?
       puts fx("\n  No files are out of date." + " "*20, :bold)
@@ -179,12 +185,6 @@ module RuneBlog::REPL
     reset_output
     @blog.create_view(arg)
     @blog.change_view(arg)
-    resp = yesno("Add publishing/hosting info now? (Y/N): ")
-    if resp
-      @blog.view.publisher = ask_publishing_info
-      out = @blog.view.dir + "/publish"
-      write_config(@blog.view.publisher, out)
-    end
     @out
   rescue ViewAlreadyExists
     puts 'Blog already exists'

data/lib/runeblog.rb

@@ -64,7 +64,10 @@ class RuneBlog
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
-    put_config(root: root)
+#   put_config(root: root)
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
+    write_config(x, root/ConfigFile)
     @blog = self.new(root)
     @blog.create_view("test_view")
     @blog
@@ -101,16 +104,13 @@ class RuneBlog
   def _deploy_local(dir)
     log!(enter: __method__, args: [dir])
     Dir.chdir(dir) do
-#     views = File.readlines("metadata.txt").grep(/^views: /).first[7..-1].split
       views = _retrieve_metadata(:views)
-STDERR.puts "---- deploy: views = #{views.inspect}"
       views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
     end
   end
 
   def _retrieve_metadata(key)
     key = key.to_s
-STDERR.puts "--- retrieve:  key = #{key.inspect}"
     lines = File.readlines("metadata.txt")
     lines = lines.grep(/^#{key}: /)
     case lines.size
@@ -172,10 +172,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
 
   def _set_publisher
     log!(enter: __method__)
-    file = @view.dir/:publish
-    @view.publisher = nil
-    return unless File.exist?(file)
-    @view.publisher = RuneBlog::Publishing.new(read_config(file))
+    @view.publisher = RuneBlog::Publishing.new(@view.to_s)  # FIXME refactor
   end
 
   def view=(arg)
@@ -219,15 +216,6 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
   end
 
-  def make_dummy_publish_file(view_name)
-    log!(enter: __method__, args: [view_name])
-    vdir = @root/:views/view_name
-    pub = [:user, :server, :docroot, :path, :proto]
-    pub = pub.map {|x| x.to_s + ": undefined" }
-    pub = pub.join("\n") + "\n"
-    dump(pub, vdir/:publish)
-  end
-
   def mark_last_published(str)
     log!(enter: __method__, args: [str])
     dump(str, "last_published")
@@ -267,7 +255,6 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     log!(enter: __method__, args: [view_name])
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
-    make_dummy_publish_file(view_name)
     mark_last_published("Initial creation")
     add_view(view_name)
   end
@@ -352,6 +339,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
     log!(enter: __method__, args: [title, testing, teaser, body, other_views])
     meta = nil
+STDERR.puts other_views.inspect
     Dir.chdir(@root/:posts) do
       post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
       post.edit unless testing
@@ -394,7 +382,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
-    write_config(x, ConfigFile)
+    write_config(x, @root/ConfigFile)
     self.view = view   # error checking?
   end
 

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.26"
+  VERSION = "0.2.27"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -12,12 +12,8 @@ class RuneBlog::View
     raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
-    @can_publish = false
-    pub_file = @blog.root + "/views/#@name/publish"
-    if File.exist?(pub_file) && File.size(pub_file) != 0
-      @publisher = RuneBlog::Publishing.new(read_config(pub_file))
-      @can_publish = true
-    end
+    @publisher = RuneBlog::Publishing.new(name)
+    @can_publish = true  # FIXME
   end
 
   def dir

data/test/general_test.rb

@@ -219,7 +219,7 @@ class TestREPL < Minitest::Test
     @blog.undelete_post(7)
   end
 
-if File.exist?("testing.publish")
+if File.exist?("testing.publish")  # FIXME!!!
 
   def xtest_016_can_publish
 #   puts __method__

metadata

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