zine 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db5b30774a28f16583540f93a394e24f5d34ae96
-  data.tar.gz: a2330b92a0df349f884af0dc46832f350440a50e
+  metadata.gz: 1d0c74eb3ad2448eca853a98779f43fc8536e39e
+  data.tar.gz: 5bfbce5f7b26a6289aba3b652b4c13c32e7d1c9a
 SHA512:
-  metadata.gz: b1c8600ac22c3e08796fb98f5d5804bee2467254240849a1015a8ead613cbef10d110a726d665ac44a9f14a25683bf94830e130afa2c9af835b0f67c395d3c9e
-  data.tar.gz: ab65b753769cca93a4fde746ac14c1bc347daadb055ec8bca7e34751c4e244437f1975d93a346dbd5472bf01ae13d616a710a0bb994e2fb48354c2fb21e6154d
+  metadata.gz: 2316b8ac4c8c8dd10fb6761ec77de852dda18dcced1d5b3ef0862ef2e01446ee04b65e32583e5e0495a43f22674ac278a8c4e1f776ab8f565fdbefd347bfecc2
+  data.tar.gz: d63c8be31dc262b119bb536999c6ccfc3f0a85b3008c72ede9d873625c1495ebb210062df521e66f2b65c9ca27987edf6937441650cf79e5a3dabb7ebe5efb5e

data/CHANGELOG.md

@@ -112,3 +112,8 @@
 
 - SFTP upload error wasn't caught in 0.7.0... TODO
 - added a notice command, zine notice [FILE], which adds that file to the build queue without having to force a general build, so zine can be called in scripts to upload particular files (a rake script in Ripley, specifically)
+
+# 0.9.0, January 1, 2018
+
+- a bug in 'zine notice' involving full & partial paths that duplicated the post to notice on the history page, fixed
+- minor code clean-up in cli.rb and server.rb

data/lib/zine.rb

@@ -78,6 +78,7 @@ module Zine
 
     # Build the site, noticing this file as having changed
     # Called by CLI#notice
+    # TODO: common function call across other methods
     def notice(file)
       # build
       init_templates
@@ -87,13 +88,13 @@ module Zine
       posts_and_guard = posts.writeless
       guard = posts_and_guard[:guard]
 
-      # give the file watchers something to notice
-      file_to_notice = File.join Dir.getwd,
-                                 @options['directories']['posts'],
-                                 file
-      posts.one_new_post file_to_notice
-      sleep 0.25
-      posts.one_new_post file_to_notice # overcome latency in the watcher...
+      # build the file & add it to the upload array
+      posts_dir = @options['directories']['posts']
+      file_to_notice = File.join posts_dir, file
+      path_to_notice = File.join Dir.getwd, file_to_notice
+
+      dest_path = posts.one_new_post file_to_notice, path_to_notice
+      guard.notice(dest_path)
 
       # TODO: everywhere
       guard.listener_array.each(&:stop)

data/lib/zine/cli.rb

@@ -55,20 +55,22 @@ module Zine
     desc 'post TITLE', 'Create the file for a new blog post, titled TITLE'
     def post(name)
       init_site
-      option_dir = @the_site.options['directories']
+      options = @the_site.options
+      option_dir = options['directories']
       Zine::CLI.source_root option_dir['templates']
       @date = DateTime.now
       @name = name
       file = "#{@date.strftime('%Y-%m-%d')}-#{Zine::Page.slug(name)}.md"
-      new_post_name = @the_site.options['templates']['new_post']
+      new_post_name = options['templates']['new_post']
       template new_post_name,
                File.join(Dir.pwd, option_dir['posts'], file)
     end
 
     desc 'site', 'Create the skeleton of a new site (overwriting files)'
     def site
-      @skeleton_dir = File.join File.dirname(__FILE__), 'skeleton', '/.'
-      FileUtils.cp_r @skeleton_dir, Dir.pwd
+      # @skeleton_dir ?
+      skeleton_dir = File.join File.dirname(__FILE__), 'skeleton', '/.'
+      FileUtils.cp_r skeleton_dir, Dir.pwd
       puts Rainbow('New skeleton site created').green
     end
 

data/lib/zine/page.rb

@@ -12,7 +12,9 @@ module Zine
   # A page on the site where the content comes from a file's markdown, and the
   # destination's location mirrors its own
   class Page
-    attr_reader :dest_path, :formatted_data, :source_file, :template_bundle
+    attr_accessor :source_file # used in zine notice --
+    # PostsAndHeadlines.one_new_post
+    attr_reader :dest_path, :formatted_data, :template_bundle
     # the meta data, passed formatted to the template
     class FormattedData
       include ERB::Util

data/lib/zine/posts_and_headlines.rb

@@ -1,6 +1,7 @@
 require 'zine/data_page'
 require 'zine/post'
 require 'zine/tag'
+require 'zine/watcher'
 
 module Zine
   # The blog posts and their associate headline files (the home page, an
@@ -42,14 +43,24 @@ module Zine
          template_name: templates['rss'], title: '' }]
     end
 
-    def one_new_post(source_file)
+    def once_only(source_file)
+      @post_array = @post_array.delete_if do |post|
+        post.source_file == source_file
+      end
+    end
+
+    def one_new_post(source_file, source_full_path)
+      once_only(source_file)
       post_name = @options['templates']['post']
-      @post_array << Zine::Post.new(source_file,
+      @post_array << Zine::Post.new(source_full_path,
                                     @site.make_template_bundle(post_name),
                                     @options)
+      @post_array.last.source_file = source_file # TODO: path when this's frozen
       @tags_by_post << @post_array.last.process(File)
-      # TODO: may need to reorder posts by date, and therefor redo tags
+      dest_path = @post_array.last.dest_path
+      sort_posts_by_date
       write_tags_and_headlines
+      dest_path
     end
 
     # get build file from post or location, delete build, remove form post_array
@@ -121,8 +132,8 @@ module Zine
       @post_array[index] = Zine::Post.new post.source_file,
                                           post.template_bundle, @options
       @tags_by_post[index] = @post_array[index].process File
+      sort_posts_by_date
       write_tags_and_headlines
-      # TODO: may need to reorder posts by date... means re-doing tags
     end
 
     # Read markdown files in the posts folder into an array of Posts

data/lib/zine/server.rb

@@ -3,7 +3,6 @@ require 'rainbow'
 require 'rack'
 require 'thin'
 require 'zine/upload'
-require 'zine/watcher'
 
 module Zine
   # Local preview web server

data/lib/zine/version.rb

@@ -1,4 +1,4 @@
 module Zine
   # The version
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/zine/watcher.rb

@@ -16,6 +16,10 @@ module Zine
       @listener_array = []
     end
 
+    def notice(file_name)
+      @upload_array << file_name
+    end
+
     # Build a delete list & an upload list for SSH from changes in build,
     # & rebuild & reload on changes in source
     def start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mike Kreuzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler