doing 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e702ec6e32cc0f97b0d81ef0e6482fb78ea462916fd2f83a58474759c0b4af
-  data.tar.gz: b50848409e7a8b409bd9f82a77dbf0722ef97ac3a2a9491a5096ad60ca94f563
+  metadata.gz: be908ed31434bd248efe3ebcba66b9022ed35be3651af6ada7e6464b50c91c9f
+  data.tar.gz: 0dcf2ce4915637e2514a8d9735c8ca294a6d5bbc0558afdabeb714d3f1de5b50
 SHA512:
-  metadata.gz: 25b1e4482ee5120b1b8fc6716c6f717235addf893917b8c21116da57ee25fef5d0bca3b29b3dbda39e0fb23c149e4284e17da755a9b1f6a92c89a7e30eda55f7
-  data.tar.gz: 28563fdc3eadec4d60faae9bdb2a38072caea19a98a5084670591851036702d2a46e7ee4f0798e6cd22e7b9eeec1a0c822872d9457b1eb8c890c45b4d5d54998
+  metadata.gz: ef314b60821ba50306c0d6b9704f310a21d6652480e67350f092cfc670c6ddab9024c24f602d68396e555fb624cf316507526a50b241c959639c738699c8602e
+  data.tar.gz: 8474ed1164f978c0359f7826b1c92fd66821bb112ae71938a67245b42a8e342f8e629dd42ec4cc8216b033e6aff20e1c44d0b3d89cdbc7f96b5e6d4513cd1319

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2.0.23
+### 2.0.24
 
 - include fzf source directly, in case git isn't installed
 - fall back to installing fzf with sudo on error

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.23)
+    doing (2.0.24)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.22<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.23<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.0.23
+v2.0.24
 
 === Global Options
 === --config_file arg

data/lib/doing/log_adapter.rb

@@ -72,7 +72,9 @@ module Doing
     end
 
     def adjust_verbosity(options = {})
-      if options[:quiet]
+      if options[:log_level]
+        self.log_level = options[:log_level].to_sym
+      elsif options[:quiet]
         self.log_level = :error
       elsif options[:verbose] || options[:debug]
         self.log_level = :debug

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.23'
+  VERSION = '2.0.24'
 end

data/lib/doing/wwid.rb

@@ -612,21 +612,29 @@ module Doing
     end
 
     def fzf
+      @fzf ||= install_fzf
+    end
+
+    def install_fzf
       fzf_dir = File.join(File.dirname(__FILE__), '../helpers/fzf')
       FileUtils.mkdir_p(fzf_dir) unless File.directory?(fzf_dir)
       fzf_bin = File.join(fzf_dir, 'bin/fzf')
       return fzf_bin if File.exist?(fzf_bin)
 
-      Doing.logger.log_now(:warn, 'Compiling and installing FZF -- this will only happen once')
-      Doing.logger.log_now(:warn, 'fzf is copyright Junegunn Choi <https://github.com/junegunn/fzf/blob/master/LICENSE>')
+      prev_level = Doing.logger.level
+      Doing.logger.adjust_verbosity({ log_level: :info })
+      Doing.logger.log_now(:warn, 'Compiling and installing fzf -- this will only happen once')
+      Doing.logger.log_now(:warn, 'fzf is copyright Junegunn Choi, MIT License <https://github.com/junegunn/fzf/blob/master/LICENSE>')
 
-      res = system("#{fzf_dir}/install --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish")
-      unless res
+      res = system("'#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
+      unless File.exist?(fzf_bin)
         Doing.logger.log_now(:warn, 'Error installing, trying again as root')
-        system("sudo #{fzf_dir}/install --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish")
+        system("sudo '#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
       end
       raise RuntimeError.new('Error installing fzf, please report at https://github.com/ttscoff/doing/issues') unless File.exist?(fzf_bin)
 
+      Doing.logger.info("fzf installed to #{fzf}")
+      Doing.logger.adjust_verbosity({ log_level: prev_level })
       fzf_bin
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml