runeblog 0.0.83 → 0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e43d12b26a11fa3a918c8770f677a5f22f744e
-  data.tar.gz: ed5d4b517cb59294fc4a632d686f5c8e71a0d06f
+  metadata.gz: 5c8bcdac0cac7185eae4df854af9578b88068e70
+  data.tar.gz: 45499a0fa575d8f2e491300e77ea9108f7eb5ca6
 SHA512:
-  metadata.gz: 6ad7d9bb119e863f66c786a3e06152c9eb2b64725670d7d2f90e27b8ce3a3a86301e0e4020903ac24fd2124241234f49044db1003b062ef4dd41cc10657bfb63
-  data.tar.gz: e517a33878737d6ae901423a9869f5b5cbd13089e01d2f7c313aeb16c9f2e35174376e1eb5780429b7893f3af969c0fecf1529b3e6494516f236c98b5f6974e8
+  metadata.gz: 66ea3cf6ee070ce80f94e7ab99b4d55640394cfd57712c787fbd2409de44a0e74597d440e1cb3d91182188fcca0bffa9a519a2f8820ac668b8dba3beae2b37b7
+  data.tar.gz: edfabd8f929c33f09f2ea86a99e859db2d46e6ee72214fa43268ff0559049c94873ee6967f91fc65a317bd74a57911543d6b55a75907f230775ad60a7ee5f2e6

data/bin/blog

@@ -23,6 +23,8 @@ STDOUT.sync = true
 
 cmd, arg = get_argv
 
+system("tput smcup")  # see: tput rmcup in cmd_quit
+
 if ! RuneBlog.exist?
   print "No blog found. Create new one? (y/n) "
   resp = gets.chomp
@@ -59,3 +61,4 @@ else  # one command
   parse_cmd(ARGV.join(" "))
   execute_command
 end
+

data/lib/helpers-blog.rb

@@ -4,30 +4,19 @@ module RuneBlog::Helpers
     lines = File.readlines(file).map(&:chomp)
     obj = OpenStruct.new
     lines.each do |line|
+      next if line == "\n" || line[0] == "#"
       key, val = line.split(" ", 2)
       key = key[0..-2] # remove colon
       obj.send(key+"=", val)
     end
     return obj if syms.empty?
     vals = []
-    syms.each {|sym| vals << obj.send(sym) }
-    return vals
-  rescue => err
-    puts "Something hit the fan: #{err}"
-    puts err.backtrace
-    exit
-  end
-
-  def huh_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)
+    if syms.empty?
+      vals = obj.to_hash.values
+    else
+      syms.each {|sym| vals << obj.send(sym) }
     end
-    @deployer = RuneBlog::Deployment.new(obj)
-    obj
+    return vals
   rescue => err
     puts "Something hit the fan: #{err}"
     puts err.backtrace
@@ -49,9 +38,11 @@ module RuneBlog::Helpers
   end
 
   def new_dotfile(root: "data", current_view: "no_default", editor: "vi")
+    raise "Blog already exists" if Dir.exist?(".blog")
+    Dir.mkdir(".blog")
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, RuneBlog::DotFile)
+    write_config(x, RuneBlog::DotDir + "/config")
   end
 
   def new_sequence
@@ -64,6 +55,9 @@ module RuneBlog::Helpers
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
+  rescue
+    STDERR.puts "Can't find dir '#{dir}'"
+    exit
   end
 
   def find_src_slugs
@@ -74,7 +68,7 @@ module RuneBlog::Helpers
   end
 
   def create_dir(dir)
-    return if File.exist?(dir) && File.directory?(dir)
+    return if Dir.exist?(dir)  #  && File.directory?(dir)
     cmd = "mkdir -p #{dir} >/dev/null 2>&1"
     result = system(cmd) 
     raise "Can't create #{dir}" unless result

data/lib/repl.rb

@@ -6,6 +6,7 @@ module RuneBlog::REPL
 
   def cmd_quit(arg)
     check_empty(arg)
+    system("tput rmcup")
     abort "\n "
   end
 
@@ -127,7 +128,6 @@ module RuneBlog::REPL
     resp = yesno("Add deployment info now? ")
     @blog.view.deployer = ask_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

@@ -13,7 +13,7 @@ require 'version'
 
 class RuneBlog
  
-  DotFile = ".blog"
+  DotDir = ".blog"
 
   class << self
     attr_accessor :blog
@@ -25,8 +25,8 @@ class RuneBlog
 
   include Helpers
 
-  def self.create_new_blog(dir = "data")
-    new_dotfile(root: dir)
+  def self.create_new_blog(dir)
+    new_dotfile(root: Dir.pwd + "/" + dir)
     create_dir(dir)
     Dir.chdir(dir) do
       create_dir("views")
@@ -34,6 +34,9 @@ class RuneBlog
       create_dir("src")
       new_sequence
     end
+  rescue => err
+    puts "Can't create blog: '#{dir}' - #{err}"
+    puts err.backtrace
   end
 
   def initialize   # assumes existing blog
@@ -41,7 +44,7 @@ class RuneBlog
     # What views are there? Deployment, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root, @view_name, @editor = 
-      read_config(DotFile, :root, :current_view, :editor)
+      read_config(DotDir + "/config", :root, :current_view, :editor)
     @views = get_views
     @view = str2view(@view_name)
     @sequence = get_sequence
@@ -63,8 +66,7 @@ class RuneBlog
     case arg
       when RuneBlog::View
         @view = arg
-        raise "Problem here?"
-        @view.read_config
+        @view.deployer = read_config(@view.dir + "/deploy")
       when String
         new_view = str2view(arg)
         raise "Can't find view #{arg}" if new_view.nil?
@@ -89,7 +91,9 @@ class RuneBlog
   end
 
   def self.exist?
-    File.exist?(DotFile)
+    File.exist?(DotDir) && 
+    File.directory?(DotDir) &&
+    File.exist?(DotDir + "/config")
   end
 
   def create_view(arg)
@@ -172,7 +176,7 @@ class RuneBlog
   def change_view(view)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view, @editor   # dumb - FIXME later
-    write_config(x, DotFile)
+    write_config(x, DotDir + "/config")
     self.view = view   # error checking?
   end
 

data/lib/version.rb

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

data/test/make_blog.rb

@@ -16,8 +16,8 @@ def show_lines(text)
   str
 end
 
-system("rm -rf data_test")
-RuneBlog.create_new_blog(Dir.pwd + "/data_test")
+system("rm -rf .blog")
+RuneBlog.create_new_blog(".blog/data_test")
 x = RuneBlog.new
 x.create_view("alpha_view")
 x.create_view("beta_view")

metadata

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