runeblog 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b3cbc5968e9ae601693f9100c564bd52c78d521fbc51c6ba6e2a92d414c0d4
-  data.tar.gz: c408d74ef879272abc36334d0fbacc8055d28b0529775fc91a77fc3f128bc27c
+  metadata.gz: f04213603ad7442242abfeeff05336fe1c3c47599c1228c1536454a3e15506b7
+  data.tar.gz: 334d6df9b57edf8e8c0c23cb0c74a12623cd152127e6ef5cfde696f54a27946d
 SHA512:
-  metadata.gz: b832c5dee0d21f88ec60185de217135ff28134e96416ad4953a3bc1f67fd2714b6a099801bace01172d16f6bda429af812c6938b0c07ff74f1ff7496bae61f90
-  data.tar.gz: 2150a767245ac855bf3a14707da752409c4a9a30b97ed4f5b2f6e68539326d822aa73b4385dd7e4e6d80e1aa2559152b52728bde0edf957d8f8d6430f3259b9a
+  metadata.gz: d9729e32ff5d6001992bd1ef136f44a6ab9efcdade913862b08b22aaee1b97e87796647b1e6fb425b60fad68af8ee091c1b2aa17019f2f91ad224efbc5dfb7e8
+  data.tar.gz: 2cc280923f48d76cf89cc54ae62089bb047dfdcf1114464f2c6eefe714a2656868c5fcfed0098ccbb7f7ab5ca71dfa56ff08efe42a109554e5f6267d374270d6

data/lib/default.rb

@@ -11,7 +11,7 @@ BlogHeader = <<-TEXT
 <table>
   <tr>
     <td>
-        <img src=fakeimage.jpg width=400 height=300>
+        <img src=../assets/fakeimage.jpg width=400 height=300>
     </td>
     <td>
       <h3>Yet another blog... by Kilgore Trout</h3>

data/lib/helpers-blog.rb

@@ -45,7 +45,6 @@ module RuneBlog::Helpers
     Dir.mkdir(".blog")
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
-puts "config = #{RuneBlog::ConfigFile}"
     write_config(x, RuneBlog::ConfigFile)
   end
 

data/lib/post.rb

@@ -33,10 +33,10 @@ class RuneBlog::Post
   end
 
   def create_post_subtree(viewname = nil) 
+    # FIXME Doesn't really do anything - refactor
     debug "=== create_post_subtree #{viewname.inspect}  pwd = #{Dir.pwd}"
     # We are INSIDE views/myview/000n-mytitle dir now - FIXME later? how did that happen?
     create_dir("assets")
-    system("cp body.txt index.html")  # gahhh FIXME
   end
 
   def write_metadata(meta)

data/lib/publish.rb

@@ -29,26 +29,23 @@ class RuneBlog::Publishing
     url = "#@proto://#@server/#@path"
   end
 
-  def no_files?(files)
-    if files.empty?
-      STDSCR.up
-      puts fx("\n  No files to publish", :bold)
-      true
-    else
-      false
-    end
+  def system!(str)
+    rc = system(str)
+    puts "Running: #{str}"
+    puts "Failed: #{str}" if ! rc
+    rc
   end
- 
-  def publish(files)
-    return false if no_files?(files)
-#   print " Publishing #{files.size} files... "
-#   debug "files = #{files.inspect}"
+
+  def publish(files, assets=[])
     dir = "#@docroot/#@path"
-    result = system("ssh #@user@#@server -x mkdir -p #{dir}") 
+    result = system!("ssh #@user@#@server -x mkdir -p #{dir}") 
+    result = system!("ssh #@user@#@server -x mkdir -p #{dir}/../assets") 
     list = files.join(' ')
-    cmd = "scp -r #{list} #@user@#@server:#{dir} >/dev/null 2>/tmp/wtf"
+    cmd = "scp #{list} #@user@#@server:#{dir} >/dev/null 2>/tmp/wtf"
     debug "cmd = #{cmd.inspect}  - see /tmp/wtf"
-    result = system(cmd)
+    result = system!(cmd)
+    cmd = "scp #{assets.join(' ')} #@user@#@server:#{dir}/../assets >/dev/null 2>/tmp/wtf2"
+    result = system!(cmd)
     raise PublishError if !result
     dump(files, "#{@blog.view.dir}/last_published")
     true

data/lib/repl.rb

@@ -32,7 +32,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     output RuneBlog::VERSION
-    puts RuneBlog::VERSION unless testing
+    puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red) unless testing
     [false, @out]
   end
 
@@ -79,12 +79,25 @@ module RuneBlog::REPL
       output! "Can't publish without entries in #{@blog.view.name}/publish"
       return [false, @out]
     end
-    ret = RubyText.spinner(label: "Publishing... ") { @blog.view.publish }
+    # Need to check dirty/clean status first
+    dirty, all, assets = @blog.view.publishable_files
+    files = dirty
+    if dirty.empty?
+      puts fx("\n  No files are out of date." + " "*20, :bold)
+      print "  Publish anyway? "
+      yn = RubyText.gets.chomp
+      files = all if yn == "y"
+    end
+    return if files.empty?
+
+    ret = RubyText.spinner(label: " Publishing... ") do
+      @blog.view.publisher.publish(files, assets)  # FIXME weird?
+    end
     return [false, @out] unless ret
     vdir = @blog.view.dir
     dump("fix this later", "#{vdir}/last_published")
     if ! testing || ! ret
-      puts " ...finished.\n " 
+      puts "  ...finished.\n " 
       output! "...finished.\n"
     end
     return [false, @out]
@@ -123,6 +136,7 @@ module RuneBlog::REPL
       if @blog.view?(arg)
         @blog.view = arg  # reads config
         output red("View: ") + bold(@blog.view.name.to_s)  # FIXME?
+        puts "\n  ", fx(arg, :bold), "\n" unless testing
       end
     end
     return [false, @out]

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -31,30 +31,24 @@ class RuneBlog::View
     @name
   end
 
-  def files(recent = false)
+  def publishable_files
     vdir = dir()
     files = [index()]
-    others = Dir.entries(vdir).grep(/^\d\d\d\d/)
-    files += others.map {|x| "#{vdir}/#{x}" }
-    files.reject! {|f| ! recent?(f) } if recent
-    files
+    others = Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
+    assets = Dir.entries("#{@blog.root}/assets") - %w[. ..]
+    assets.map! {|x| "#{@blog.root}/assets/#{x}" }
+    assets.reject! {|x| File.directory?(x) }
+#   assets.reject! {|x| ! recent?(x) }
+    files = files + others
+    all = files.dup
+    dirty = files.reject {|f| ! recent?(f) }
+    [dirty, all, assets]
   end
 
   def can_publish?
     @can_publish
   end
 
-  def publish
-    # ?? @blog.view.publisher.publish
-    # output "Files:"
-    # files.each {|f| output "    #{f}\n" }
-    output_newline
-    list = files(true)
-    @publisher.publish(list)
-  rescue => err
-    error(err)
-  end
-
   def recent?(file)
     File.mtime(file) > File.mtime("#{dir()}/last_published")
   rescue

data/test/general.rb

@@ -6,6 +6,7 @@ require 'runeblog'
 require 'lib/repl'
 require 'rubytext'
 
+
 RubyText.start
 
 class TestREPL < Minitest::Test

data/test/make_blog.rb

@@ -5,7 +5,7 @@ require 'global'
 require 'repl'
 
 def debug(str)
-  STDERR.puts str
+# STDERR.puts str
 end
 
 def make_post(x, title)

metadata

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