verkilo 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a804a5fee54435a3809b04e8eeb73bd58f33258
-  data.tar.gz: 7e4a2b03cec74905dc2c7db48572ad00ccce33b3
+  metadata.gz: ea3913e2a234af2fa652f63922086996d971a9ac
+  data.tar.gz: e88c56a82aec9606c00f19055aef43e099d6fb77
 SHA512:
-  metadata.gz: c90f8c77c7c957630df796fe6b5f811a242491f0b45a0b13fb43602e9fa72f6def30dfd6b2824ac6943d9e600012c2cce77a9056d3927bd1eb6a25484d3f16f1
-  data.tar.gz: 81b1d192a9f4ea2ef9845e7c9c546f59709e533ff3923cc7b32e2ae2e2f49228d42bf8840284bbcab0af1c9dd95535831597ceca00fdfc8d29df1dbdd40568c1
+  metadata.gz: 59bf54e43d5fce6fe13b87a9de066501b59147fbac5bd3ff7f34b3f8c509db6fb62eea2f4a322305acb527eee1e92b1a85a528bdeb59f8b2e21fdaf533084183
+  data.tar.gz: a4f115464fd959a322025f09001c9b1a108171674097eef40d960d79f0eb153ce8e200a1fbe1f0ba918c7504d83e6f28b3cdc37384d3cf2060f6c282f7310e48

data/Gemfile.lock

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

data/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rake build;
+gem install pkg/*.gem ;
+# cd ../../Writing/pms-series
+# # basename `git rev-parse --show-toplevel`
+# basename -s .git `git config --get remote.origin.url`
+# verkilo compile
+# cd ../../Verkilo/verkilo-gem

data/lib/verkilo/book.rb

@@ -4,7 +4,9 @@ module Verkilo
       @title = title
       @root_dir = root_dir
       @resource_dir = File.join(File.dirname(File.expand_path(__FILE__)), '../../resources')
-      @contents = ""
+      @contents = nil
+      @wc = nil
+      @files = nil
       @today = Time.now.strftime("%F")
       @repo = repo
       @bib = Dir["#{@root_dir}/**/*.bib"].first || nil
@@ -12,8 +14,7 @@ module Verkilo
     end
 
     def contents
-      @contents unless @contents.nil?
-      @contents = files.map { |f| File.open(f,'r').read }.join("\n\n")
+      @contents ||= files.map { |f| File.open(f,'r').read }.join("\n\n")
     end
 
     def to_s
@@ -22,7 +23,7 @@ module Verkilo
     alias title to_s
 
     def to_i
-      self.contents.gsub(/[^a-zA-Z\s\d]/,"").split(/\W+/).count
+      @wc ||= self.contents.gsub(/[^a-zA-Z\s\d]/,"").split(/\W+/).count
     end
     alias wordcount to_i
 
@@ -44,7 +45,7 @@ module Verkilo
 
     protected
       def files
-        Dir["./#{@root_dir}/**/*.md"].sort
+        @files ||= Dir["#{@root_dir}/**/*.md"].sort
       end
       def epub_image
         fname = File.join(['.', 'covers', "#{@title}-epub.png"])

data/lib/verkilo/cli.rb

@@ -35,33 +35,41 @@ LONGDESC
 
     desc "wordcount", "Wordcount the books in the repository and write to YAML file."
     map %w(-w --wordcount) => :wordcount
+    method_option :log, :type => :boolean
+    method_option :delta, :type => :boolean
     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.
+  \x5 in Markdown files in .book directories.
 
-   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.
+  With the --log flag, the result will be added
+  \x5 to a wordcount log YAML file inside the
+  \x5 project's Verkilo configuration directory.
+
+  With the --offset flag, which will offset the
+  \x5  date based on timezone.This is helpful
+  \x5 when you are running this viaa server or
+  \x5 CI platform that uses a different timezone
+  \x5 from your own. (E.g. Github runs UTC)
 
   See the Verkilo website (https://verkilo.com) for details
 
-  > $ verkilo wordcount --offset=-08:00
+  > $ verkilo wordcount --offset=-08:00 --log
 LONGDESC
     def wordcount
       is_verkilo_project!
+      log = options["log"] || false
       offset = options["offset"] || nil
+      delta = options["delta"] || false
       shelf  = Verkilo::Shelf.new(root_dir)
-      wc_log = Verkilo::Log.new('wordcount',root_dir, offset)
-      wc_log.data = shelf.wordcount
-      wc_log.write
-
-      say "Wordcount for #{shelf}: #{shelf.wordcount.to_yaml}Written to #{wc_log.filename}"
+      say "Wordcount for #{shelf}: #{shelf.wordcount.to_yaml}"
+      if log
+        wc_log = Verkilo::Log.new('wordcount',root_dir, offset)
+        wc_log.data = shelf.wordcount
+        wc_log.delta! unless delta.nil?
+        wc_log.write
+        say "Written to #{wc_log.filename}"
+      end
     end
     desc "version", "Prints the Verkilo's version information"
     map %w(-v --version) => :version

data/lib/verkilo/log.rb

@@ -8,6 +8,26 @@ module Verkilo
       @data = YAML.load(read_file)
       @today = Time.now.getlocal(offset).strftime("%F")
     end
+    def delta!(target='_total')
+      change = 0
+      last = nil
+      keys = @data.keys
+      ckey = target.sub(/_/,'_Δ')
+      until keys.empty? do
+        k = keys.shift
+        total!(k)
+        now = @data[k][target] || 0
+        change = (last.nil?) ? 0 : now - last
+        @data[k].merge!({ckey => change})
+        last = now
+      end
+    end
+    def total!(k=nil)
+      k ||= @today
+      @data[k]["_total"] = @data[k].map {
+        |k,v| (/^_/.match?(k)) ? 0 : v
+      }.inject(0, :+)
+    end
     def data=(h)
       @data = @data.merge({@today => h})
     end

data/lib/verkilo/version.rb

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

data/test.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rake build;
+gem install pkg/*.gem ;
+cd ../../Writing/pms-series
+# basename `git rev-parse --show-toplevel`
+basename -s .git `git config --get remote.origin.url`
+verkilo wordcount --delta #--offset=-08:00
+cd ../../Verkilo/verkilo-gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verkilo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben W
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - bin/console
 - bin/setup
 - bin/verkilo
+- build.sh
 - lib/verkilo.rb
 - lib/verkilo/book.rb
 - lib/verkilo/cli.rb
@@ -101,6 +102,7 @@ files:
 - resources/track-changes.lua
 - resources/user.css
 - resources/yaml.md
+- test.sh
 - verkilo.gemspec
 homepage: https://verkilo.com
 licenses: