zine 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93524d954ddb98f46bfadc6715f4948043ac27c8
-  data.tar.gz: 6cd531d59b6f636ed706c044743d254771e1c340
+  metadata.gz: db5b30774a28f16583540f93a394e24f5d34ae96
+  data.tar.gz: a2330b92a0df349f884af0dc46832f350440a50e
 SHA512:
-  metadata.gz: bfab2b75d98d3cfde98e42533024cfb2edcd2d75d556143fd363149a34ea5de8e036a530db30179a9a6678986939dae50e4508daf94b3ea899e0e951a1dc2117
-  data.tar.gz: 977940bf58cc38f453ff37a5079736ecafb3b27a26a4c170dd816aba2b4db5b4dd5a932b26170ad21de4f8843ded2359738a1a90c3276d1c749ceb1bc4fececc
+  metadata.gz: b1c8600ac22c3e08796fb98f5d5804bee2467254240849a1015a8ead613cbef10d110a726d665ac44a9f14a25683bf94830e130afa2c9af835b0f67c395d3c9e
+  data.tar.gz: ab65b753769cca93a4fde746ac14c1bc347daadb055ec8bca7e34751c4e244437f1975d93a346dbd5472bf01ae13d616a710a0bb994e2fb48354c2fb21e6154d

data/CHANGELOG.md

@@ -107,3 +107,8 @@
 
 - caught an SFTP upload error where SFTP credentials aren't in the keychain
 - updated bundler
+
+## 0.8.0, October 2, 2017
+
+- 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)

data/README.md

@@ -66,6 +66,7 @@ Commands:
   zine build           # Build the site
   zine force           # Build the site, forcing writes & uploads
   zine help [COMMAND]  # Describe available commands or one specific command
+  zine notice POST     # Build the site, then force the one POST
   zine nuke            # Delete the build folder
   zine post TITLE      # Create the file for a new blog post, titled TITLE
   zine site            # Create the skeleton of a new site (overwriting files)

data/lib/zine.rb

@@ -69,6 +69,45 @@ module Zine
       )
     end
 
+    # currently used to say yes on a script's behalf - in #notice
+    class MockHighlineYes
+      def ask(_question)
+        'Y'
+      end
+    end
+
+    # Build the site, noticing this file as having changed
+    # Called by CLI#notice
+    def notice(file)
+      # build
+      init_templates
+      FileUtils.mkdir_p @options['directories']['build']
+      # posts_and_headlines_without_writing
+      posts = Zine::PostsAndHeadlines.new self, @options # starts watcher
+      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...
+
+      # TODO: everywhere
+      guard.listener_array.each(&:stop)
+
+      # preview posts_and_guard -- no preview needed...
+      return if @options['upload']['method'] == 'none' ||
+                (guard.delete_array.empty? && guard.upload_array.empty?)
+      uploader = Zine::Upload.new @options['directories']['build'],
+                                  @options['upload'],
+                                  guard.delete_array,
+                                  guard.upload_array
+      uploader.upload_decision MockHighlineYes
+    end
+
     def write_markdown(default_name, src_dir, file)
       dir = Pathname(File.dirname(file)).relative_path_from(Pathname(src_dir))
       file_name = "#{File.basename(file, '.*')}.html"
@@ -83,7 +122,7 @@ module Zine
 
     def clean_option_paths
       directories = @options['directories']
-      %w(assets posts styles templates).each do |dir|
+      %w[assets posts styles templates].each do |dir|
         directories[dir] = File.join directories['source'], directories[dir]
       end
       directories['blog'] = File.join directories['build'], directories['blog']

data/lib/zine/cli.rb

@@ -37,6 +37,13 @@ module Zine
       puts Rainbow('Site built').green
     end
 
+    desc 'notice POST', 'Build the site, then force the one POST'
+    def notice(file)
+      init_site
+      @the_site.notice(file)
+      puts Rainbow('Site built').green
+    end
+
     desc 'nuke', 'Delete the build folder'
     def nuke
       init_site

data/lib/zine/upload.rb

@@ -52,7 +52,6 @@ module Zine
                                           @credentials,
                                           @delete_file_array,
                                           @upload_file_array)
-      puts '---', uploader.inspect, '---'
       uploader.upload
     end
 

data/lib/zine/uploader_sftp.rb

@@ -25,9 +25,9 @@ module Zine
       delete
       deploy
     rescue Errno::ENETUNREACH
-      puts Rainbow("Unable to connect to #{upload_options['host']}").red
+      puts Rainbow("Unable to connect to #{@host}").red
     rescue Net::SSH::AuthenticationFailed, NameError
-      puts Rainbow("Authentication failed for #{upload_options['host']}").red
+      puts Rainbow("Authentication failed for #{@host}").red
       puts 'Check your credential file, and maybe run ssh-add?'
     end
 
@@ -40,8 +40,10 @@ module Zine
     end
 
     def delete
-      Net::SFTP.start(@host, @credentials['username'],
-                      password: @credentials['password']) do |sftp|
+      Net::SFTP.start(@host,
+                      @credentials['username'],
+                      password: @credentials['password'],
+                      auth_methods: %w[publickey password]) do |sftp|
         @delete_file_array.each do |rel_file_path|
           sftp.remove(File.join(@path, rel_file_path)).wait
           puts "Deleted #{rel_file_path}" if @verbose
@@ -50,8 +52,10 @@ module Zine
     end
 
     def deploy
-      Net::SFTP.start(@host, @credentials['username'],
-                      password: @credentials['password']) do |sftp|
+      Net::SFTP.start(@host,
+                      @credentials['username'],
+                      password: @credentials['password'],
+                      auth_methods: %w[publickey password]) do |sftp|
         deploy_directories sftp
         deploy_files sftp
       end

data/lib/zine/version.rb

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

data/lib/zine/watcher.rb

@@ -5,6 +5,7 @@ module Zine
   # Watch files for changes
   class Watcher
     attr_reader :upload_array, :delete_array
+    attr_accessor :listener_array
 
     def initialize(posts_and_headlines, build_directory, source_directory)
       @posts_and_headlines = posts_and_headlines
@@ -12,6 +13,7 @@ module Zine
       @source_directory = File.join Dir.pwd, source_directory
       @upload_array = []
       @delete_array = []
+      @listener_array = []
     end
 
     # Build a delete list & an upload list for SSH from changes in build,
@@ -74,6 +76,7 @@ module Zine
         on_build_delete removed unless removed.empty?
       end
       listener.start
+      @listener_array << listener
     end
 
     def watch_source_dir
@@ -83,6 +86,7 @@ module Zine
         on_source_delete removed unless removed.empty?
       end
       listener.start
+      @listener_array << listener
     end
   end
 end

metadata

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