RubyGems - runeblog - Versions diffs - 0.0.81 → 0.0.82 - Mend

runeblog 0.0.81 → 0.0.82

Files changed (12) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad0ac59c820b552c49a9b5bddd5834e7cc6304f
-  data.tar.gz: 48bf95d2249de54d88cc9cf68a64c370c20c0a6f
+  metadata.gz: e2691b40f636554604986a978b477b1696171cf2
+  data.tar.gz: 2cef5f6ebc60afc93e125453b6614589e3f6a420
 SHA512:
-  metadata.gz: fb0ea9ec99450aee211bf5a7896efc121237864ca58174d26df4afa6fbe83ea3bdd51e86912204da13ba15fa0e3fdda601b1a85bb33efc347aabcb7f89ec79d9
-  data.tar.gz: f1ac88ad0e372483897f290f52f278d31f3221ee8e71e65c233a4b1b2a747c783e985693c2b137378fa69e34f40b105b2a5492d0c9645838492bf865fca7b906
+  metadata.gz: 6e2850ad2ae3f999e155214e9bfd76ad83d5dd814f23cbb711a5aafb5d08524453da8bdacba4f0d747f6a1a35249f57c5467633a89351dcee47fd6381eeaf58e
+  data.tar.gz: 50fc4ef26de135a92fa08f860be97fb04999fe2bbe15ef21ba44683a4de9fa853fa6bfb54c4410cfc04b6483acca62748e9bfb4804d8babd04057464c666e89d

data/lib/default.rb CHANGED Viewed

@@ -30,10 +30,25 @@ BlogHeader = <<-TEXT
 TEXT
 BlogTrailer = <<-TEXT
-<!-- no trailer -->
+<!-- no blog trailer -->
 TEXT
-PostTemplate = <<-'TEXT'
+PostTemplate = <<-'TEXT'  # interpolate later
+.mixin liveblog
+.title #@title
+.pubdate #@date
+.views #@view
+.tags
+.teaser
+#{@meta.teaser}
+.end
+#{@meta.remainder}
+TEXT
+TeaserTemplate = <<-'TEXT'  # interpolate later
 <html>
 <body>

data/lib/deploy.rb CHANGED Viewed

@@ -2,15 +2,27 @@ require 'helpers-blog'
 require 'runeblog'
 class RuneBlog::Deployment
-  attr_reader :user, :server, :root, :path
+  attr_reader :user, :server, :docroot, :path
   BadRemoteLogin = Exception.new("Can't login remotely")
   BadRemotePerms = Exception.new("Bad remote permissions")
-  def initialize(user, server, root, path, protocol = "http")
+  def initialize(*params)
     @blog = RuneBlog.blog
-    @user, @server, @root, @path =
-      user, server, root, path
+    # 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 = *obj
+    end
+  end
+  def to_h
+    {user: @user, server: @server, docroot: @docroot,
+     path: @path, proto: @proto}
   end
   def url
@@ -19,7 +31,7 @@ class RuneBlog::Deployment
   def deploy(files)
     reset_output
-    dir = "#@root/#@path"
+    dir = "#@docroot/#@path"
     result = system("ssh #@user@#@server -x mkdir #{dir}")
     list = files.join(' ')
     cmd = "scp -r #{list} #@user@##server:#{dir} >/dev/null 2>&1"
@@ -40,11 +52,11 @@ class RuneBlog::Deployment
   end
   def remote_permissions?
-    dir = "#@root/#@path"
+    dir = "#@docroot/#@path"
     temp = "#@path/__only_testing"
-    try1 = system("ssh -o BatchMode=yes -o ConnectTimeout=2 #@user@#@server -x mkdir -p #{temp} >/dev/null 2>&1")
+    try1 = system("ssh -o BatchMode=yes -o ConnectTimeout=1 #@user@#@server -x mkdir -p #{temp} >/dev/null 2>&1")
     return nil unless try1
-    try2 = system("ssh -o BatchMode=yes -o ConnectTimeout=2 #@user@#@server -x rmdir #{temp} >/dev/null 2>&1")
+    try2 = system("ssh -o BatchMode=yes -o ConnectTimeout=1 #@user@#@server -x rmdir #{temp} >/dev/null 2>&1")
     return nil unless try2
     true
   end

data/lib/helpers-blog.rb CHANGED Viewed

@@ -15,3 +15,28 @@ def error(err)  # FIXME - this is duplicated
   puts err.backtrace  # [0]
 end
+def read_config(file, *syms)
+  lines = File.readlines(file).map(&:chomp)
+  obj = OpenStruct.new
+  lines.each do |line|
+    key, val = line.split(" ", 2)
+    key = key[0..-2] # remove colon
+    obj.send(key+"=", val)
+  end
+  @deployer = RuneBlog::Deployment.new(obj)
+  obj
+rescue => err
+  puts "Something hit the fan: #{err}"
+  puts err.backtrace
+  exit
+end
+def write_config(obj, file)
+  hash = obj.to_h
+  File.open(file, "w") do |f|
+    hash.each_pair do |key, val|
+      f.puts "#{key}: #{val}"
+    end
+  end
+end

data/lib/post.rb CHANGED Viewed

@@ -18,22 +18,12 @@ class RuneBlog::Post
     @title = meta.title
     @view = @blog.str2view(view_name)
     @num, @slug = make_slug
-    date = Time.now.strftime("%Y-%m-%d")
-    template = <<-EOS.gsub(/^ */, "")
-      .mixin liveblog
-      .title #@title
-      .pubdate #{date}
-      .views #@view
-      .teaser
-      #{meta.teaser}
-      .end
-      #{meta.remainder}
-    EOS
+    @date = Time.now.strftime("%Y-%m-%d")
+    template = RuneBlog::Default::PostTemplate
+    @meta = meta
+    html = interpolate(template)
     @draft = "#{@blog.root}/src/#@slug.lt3"
-    File.write(@draft, template)
+    File.write(@draft, html)
   end
   def edit
@@ -72,7 +62,7 @@ class RuneBlog::Post
     File.write("metadata.yaml", @meta.to_yaml)
     File.write("teaser.txt", @meta.teaser)
     File.write("remainder.txt", @meta.remainder)
-    template = RuneBlog::Default::PostTemplate
+    template = RuneBlog::Default::TeaserTemplate
     text = interpolate(template)
     File.write("index.html", text)
   end

data/lib/repl.rb CHANGED Viewed

@@ -72,36 +72,6 @@ module RuneBlog::REPL
     error(err)
   end
-  def old_cmd_deploy(arg)  # FIXME non-string return expected in caller?
-    # TBD clunky FIXME
-    reset_output
-    check_empty(arg)
-    user, server, sroot, spath = *@deploy[@blog.view]
-    if files.empty?    # FIXME  baloney
-      output! "No files to deploy"
-      return @out
-    end
-    output "Files:"
-    files.each {|f| output "    #{f}\n" }
-    output_newline
-    dir = "#{sroot}/#{spath}"
-    # FIXME - may or may not already exist
-    result = system("ssh root@#{server} mkdir #{dir}")
-    # ^ needs -c??
-    cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
-    output! "Deploying #{files.size} files...\n"
-    result = system(cmd)
-    raise "Problem occurred in deployment" unless result
-    File.write("#{vdir}/last_deployed", files)
-    output! "...finished.\n"
-    @out
-  rescue => err
-    error(err)
-  end
   def cmd_rebuild(arg)
     reset_output
     check_empty(arg)
@@ -156,8 +126,8 @@ module RuneBlog::REPL
     @blog.create_view(arg)
     resp = yesno("Add deployment info now? ")
     @blog.view.deployer = ask_deployment_info
-    @blog.view.write_config  # change this?
-    @blog.view.read_config   # was: get_deployment_info
+    write_config(@blog.view.deployer,  @blog.view.dir + "/deploy")  # change this?
+#   read_config(@blog.view.dir + "/deploy")  # unnessary?
     nil
   rescue => err
     error(err)

data/lib/runeblog.rb CHANGED Viewed

@@ -1,7 +1,10 @@
+require 'pp'
 require 'find'
 require 'yaml'   # get rid of YAML later
 require 'livetext'
 require 'skeleton'
+require 'helpers-blog'
 require 'default'
 require 'view'
 require 'deploy'
@@ -20,7 +23,9 @@ class RuneBlog
   attr_accessor :view  # overridden
   def self.create_new_blog(dir = "data")
-    File.write(".blog", "#{dir}\nno_default\n")  # .blog lives above subtree
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = dir, "no_default", "vi"
+    write_config(x, ".blog")
     create_dir(dir)
     Dir.chdir(dir) do
       create_dir("views")
@@ -31,15 +36,12 @@ class RuneBlog
     end
   end
-  def get_config(file)
-    lines = File.readlines(file).map(&:chomp)
-    root, view_name = *lines
-  end
   def initialize(cfg_file = ".blog")   # assumes existing blog
     # Crude - FIXME later - What views are there? Deployment, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    @root, view_name = get_config(cfg_file)
+    obj = read_config(cfg_file)
+    vals = obj.to_h.values_at(:root, :current_view, :editor)
+    @root, view_name, @editor = *vals
     @views = subdirs("#@root/views/").sort.map {|name| RuneBlog::View.new(name) }
     @view = str2view(view_name)
     @sequence = get_sequence
@@ -61,12 +63,13 @@ class RuneBlog
     case arg
       when RuneBlog::View
         @view = arg
+        raise "Problem here?"
         @view.read_config
       when String
         new_view = str2view(arg)
         raise "Can't find view #{arg}" if new_view.nil?
         @view = new_view
-        @view.read_config
+        @view.deployer = read_config(@view.dir + "/deploy")
       else
         raise "#{arg.inspect} was not a View or a String"
     end
@@ -123,7 +126,7 @@ class RuneBlog
     vdir = @blog.viewdir(@view)
     # meh
     files = ["#{vdir}/index.html"]
-    files += Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
+    files += Dir.entries(vdir).grep(/^\d{4}/).map {|x| "#{vdir}/#{x}" }
     # Huh?
     files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
   end
@@ -148,7 +151,7 @@ class RuneBlog
   end
   def edit_initial_post(file)
-    result = system("vi #@root/src/#{file} +8 ")
+    result = system("#@editor #@root/src/#{file} +8")
     raise "Problem editing #@root/src/#{file}" unless result
     nil
   rescue => err
@@ -167,7 +170,9 @@ class RuneBlog
   end
   def change_view(view)
-    File.write(".blog", "#@root\n#{view}\n")
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = @root, view, @editor   # dumb - FIXME later
+    write_config(x, ".blog")
     self.view = view   # error checking?
   end
@@ -210,7 +215,7 @@ class RuneBlog
   def generate_index(view)
     # Gather all posts, create list
     vdir = "#@root/views/#{view}"
-    posts = Dir.entries(vdir).grep /^\d\d\d\d/
+    posts = Dir.entries(vdir).grep /^\d{4}/
     posts = posts.sort.reverse
     # Add view header/trailer
@@ -262,8 +267,11 @@ class RuneBlog
   def remove_post(num)
     list = files_by_id(num)
     return nil if list.empty?
-    result = system("rm -rf #{list.join(' ')}")
-    error_cant_delete(files) unless result
+    dest = list.map {|f| f.sub(/(?<num>\d{4}-)/, "_\\k<num>") }
+    list.each.with_index do |src, i|
+      cmd = "mv #{src} #{dest[i]} 2>/dev/null"
+      system(cmd)
+    end
     # FIXME - update index/etc
     true
   end
@@ -288,6 +296,7 @@ class RuneBlog
   private
   def subdirs(dir)
+raise Exception.new("hell") if dir == "/views/"
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
@@ -296,7 +305,7 @@ class RuneBlog
   end
   def find_src_slugs
-    files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
+    files = Dir.entries("#@root/src/").grep /\d{4}.*.lt3$/
     files.map! {|f| File.basename(f) }
     files = files.sort.reverse
     files

data/lib/version.rb CHANGED Viewed

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

data/lib/view.rb CHANGED Viewed

@@ -9,7 +9,8 @@ class RuneBlog::View
     raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
-    @deploy = read_config
+    dep_file = @blog.root + "/views/#@name/deploy"
+    @deployer = read_config(dep_file)
   end
   def dir
@@ -48,16 +49,5 @@ class RuneBlog::View
     File.mtime(file) < File.mtime("#{dir()}/last_deployed")
   end
-  def read_config
-    file = self.dir + "/deploy"
-    lines = File.readlines(file).map(&:chomp)
-    user, server, root, path, proto = *lines
-    @deploy = RuneBlog::Deployment.new(user, server, root, path, proto)
-  end
-  def write_config
-    file = @blog.view.dir + "/deploy"
-    File.open(file, "w") {|f| f.puts [@user, @server, @root, @path, @proto] }
-  end
 end

data/test/general.rb CHANGED Viewed

@@ -191,7 +191,10 @@ class TestREPL < Minitest::Test
   end
   def test_016_can_deploy
-    dep = RuneBlog::Deployment.new("root", "rubyhacker.com", "/var/www", "whatever")
+    x = OpenStruct.new
+    x.user, x.server, x.docroot, x.docroot, x.path, x.proto =
+      "root", "rubyhacker.com", "/var/www", "whatever", "http"
+    dep = RuneBlog::Deployment.new(x)
     result = dep.remote_login?
     assert result == true, "Valid login doesn't work"
     result = dep.remote_permissions?
@@ -199,13 +202,19 @@ class TestREPL < Minitest::Test
   end
   def test_017_cannot_deploy_wrong_user
-    dep = RuneBlog::Deployment.new("bad_user", "rubyhacker.com", "/var/www", "whatever")
+    x = OpenStruct.new
+    x.user, x.server, x.docroot, x.docroot, x.path, x.proto =
+      "bad_user", "rubyhacker.com", "/var/www", "whatever", "http"
+    dep = RuneBlog::Deployment.new(x)
     result = dep.remote_login?
     assert result.nil?, "Expected to detect login error (bad user)"
   end
   def test_018_cannot_deploy_bad_server
-    dep = RuneBlog::Deployment.new("root", "nonexistent123.com", "/var/www", "whatever")
+    x = OpenStruct.new
+    x.user, x.server, x.docroot, x.docroot, x.path, x.proto =
+      "root", "nonexistent123.com", "/var/www", "whatever", "http"
+    dep = RuneBlog::Deployment.new(x)
     result = dep.remote_login?
     assert result.nil?, "Expected to detect login error (bad server)"
   end

data/test/make_blog.rb CHANGED Viewed

@@ -6,6 +6,7 @@ def make_post(x, title)
   meta = OpenStruct.new
   meta.title = title
   num = x.create_new_post(meta, true)
+  num
 end
 def show_lines(text)

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext