verkilo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2f5eb4f0d596951567629d7a89ceb2f56b5f1c
-  data.tar.gz: 4ca518363f9fc626596f09203a649025091aeeff
+  metadata.gz: 8a804a5fee54435a3809b04e8eeb73bd58f33258
+  data.tar.gz: 7e4a2b03cec74905dc2c7db48572ad00ccce33b3
 SHA512:
-  metadata.gz: e7ba6ae387a4007f28f08c6862dc456b8eb95bea7acd30629b83e986a41c6fd0fbd265119430ef780d24b7bd8d8c8db20edee70058c05f5e3d60a8ba67314949
-  data.tar.gz: 3aa465a383910a850d8aeccc02ac682b8e84a9ff37f721345a6daacb87248001c3775f1f0311087281c7d15c3a4793a4dd278e43755e0bb6695a2343ff57e8b2
+  metadata.gz: c90f8c77c7c957630df796fe6b5f811a242491f0b45a0b13fb43602e9fa72f6def30dfd6b2824ac6943d9e600012c2cce77a9056d3927bd1eb6a25484d3f16f1
+  data.tar.gz: 81b1d192a9f4ea2ef9845e7c9c546f59709e533ff3923cc7b32e2ae2e2f49228d42bf8840284bbcab0af1c9dd95535831597ceca00fdfc8d29df1dbdd40568c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    verkilo (0.1.1)
+    verkilo (0.1.3)
       thor (~> 0)
 
 GEM

data/lib/verkilo/book.rb

@@ -117,7 +117,7 @@ module Verkilo
         csl = (@csl.nil?) ? "" : " --csl #{csl}"
 
         cmd = "pandoc -o #{fname} #{flags(action)} #{src}"
-        puts "%15s .. %11s => %s %s" % [@title, action, fname, `#{cmd}`]
+        puts "%#{10}s .. %-11s => %s %s" % [@title, action, fname, `#{cmd}`]
       end
   end
 end

data/lib/verkilo/cli.rb

@@ -3,11 +3,21 @@ require 'verkilo/version'
 module Verkilo
   class CLI < Thor
     desc "compile", "Convert Markdown files in book directory into PDF, EPUB, HTML & DOCX"
+    long_desc <<-LONGDESC
+  `verkilo compile` converts Markdown files in .book
+  \x5 directories into PDF, ePUB, HTML & Word Doc.
+  \x5 The compiled files will be put in the build
+  \x5 directory in the root directory.
+
+  See the Verkilo website (https://verkilo.com) for details
+
+  > $ verkilo compile
+LONGDESC
     map %w(-c --compile) => :compile
-    def compile(root_dir=".")
-      say "Verkilo v#{Verkilo::VERSION}"
+    def compile
+      is_verkilo_project!
       shelf  = Verkilo::Shelf.new(root_dir)
-      puts "Compiling #{shelf}"
+      say "Compiling #{shelf}"
       shelf.books.each do |book|
         fork do
           book.compile
@@ -15,47 +25,63 @@ module Verkilo
       end
       Process.waitall
     end
-    desc "proof", "Convert Markdown files in book directory into PDF, EPUB, HTML & DOCX"
-    map %w(-p --proof) => :proof
-    def proof(root_dir=".")
-      puts "Proofing #{root_dir}"
-    end
 
     desc "merge", "Converts MS Word composite file back into Markdown files."
     map %w(-m --merge) => :merge
-    def merge(root_dir=".")
-      puts "Merging #{root_dir}"
+    def merge
+      is_verkilo_project!
+      say "Merging #{root_dir}"
     end
 
     desc "wordcount", "Wordcount the books in the repository and write to YAML file."
     map %w(-w --wordcount) => :wordcount
-    def wordcount(root_dir=".")
+    method_option :offset
+    long_desc <<-LONGDESC
+  `verkilo wordcount` will count all the words
+  \x5 in Markdown files in .book directories. The
+  \x5 result will be added to a wordcount log YAML
+  \x5 file inside the project's Verkilo configuration
+  \x5 directory.
+
+   You can optionally specify a second parameter,
+  \x5 which will offset the date based on timezone.
+  \x5 This is helpful when you are running this via
+  \x5 a server or CI platform that uses a different
+  \x5 timezone from your own.
+
+  See the Verkilo website (https://verkilo.com) for details
+
+  > $ verkilo wordcount --offset=-08:00
+LONGDESC
+    def wordcount
+      is_verkilo_project!
+      offset = options["offset"] || nil
       shelf  = Verkilo::Shelf.new(root_dir)
-      wc_log = Verkilo::Log.new('wordcount',root_dir)
+      wc_log = Verkilo::Log.new('wordcount',root_dir, offset)
       wc_log.data = shelf.wordcount
       wc_log.write
 
-      puts "Wordcount for #{shelf}: #{shelf.wordcount.to_yaml}Written to #{wc_log.filename}"
+      say "Wordcount for #{shelf}: #{shelf.wordcount.to_yaml}Written to #{wc_log.filename}"
     end
     desc "version", "Prints the Verkilo's version information"
     map %w(-v --version) => :version
     def version
-      say "Verkilo version #{Verkilo::VERSION}"
+      say "Verkilo v#{Verkilo::VERSION}"
     end
 
     private
-      # def config
-      #   YAML.load_file(config_path).with_indifferent_access
-      # end
       def config_path
-        root_dir.join(".verkilo/defaults.yml")
+        root_dir.join(".verkilo")
       end
       def root_dir
         @root ||= Pathname.new(Dir.pwd)
       end
-      def inside_ebook!
+      def is_verkilo_project!
+        say "Verkilo v#{Verkilo::VERSION}"
         unless File.exist?(config_path)
-          raise Error, "You have to run this command from inside a Verkilo directory."
+          say "You must run this command within a Verkilo directory."
+          say "See the Verkilo website (https://verkilo.com) for details"
+          exit 1
         end
       end
   end

data/lib/verkilo/log.rb

@@ -2,11 +2,11 @@
 require 'yaml'
 module Verkilo
   class Log
-    def initialize(type, root_dir)
+    def initialize(type, root_dir, offset)
       @type = type
       @root_dir = root_dir
       @data = YAML.load(read_file)
-      @today = Time.now.strftime("%F")
+      @today = Time.now.getlocal(offset).strftime("%F")
     end
     def data=(h)
       @data = @data.merge({@today => h})

data/lib/verkilo/version.rb

@@ -1,3 +1,3 @@
 module Verkilo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verkilo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben W
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler