doing 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36dd66af3e00464697ab6eb89101e501e0b50ee6b21bc8629a13e21b3906c18a
-  data.tar.gz: 758903fc78fd9a812ab723a5af00cdec0c6cd13c1316dc638e9ca10f24bf939a
+  metadata.gz: 47e702ec6e32cc0f97b0d81ef0e6482fb78ea462916fd2f83a58474759c0b4af
+  data.tar.gz: b50848409e7a8b409bd9f82a77dbf0722ef97ac3a2a9491a5096ad60ca94f563
 SHA512:
-  metadata.gz: e755266bcfedb72b69f966a2621af76b5014168cd44898c2ba24b0dfc711482aef6a3694afd8010abbeb3bdeb88749532b15f1699ab6926227679ffb7308758d
-  data.tar.gz: f892efc03f34754866f436603e49c3e3f9b9ec52496ecdcddb1c5783abc485b7996bb5385d531a5814a4ee9b52d262f754545ee4a0a0559e49ccfff56de38bdb
+  metadata.gz: 25b1e4482ee5120b1b8fc6716c6f717235addf893917b8c21116da57ee25fef5d0bca3b29b3dbda39e0fb23c149e4284e17da755a9b1f6a92c89a7e30eda55f7
+  data.tar.gz: 28563fdc3eadec4d60faae9bdb2a38072caea19a98a5084670591851036702d2a46e7ee4f0798e6cd22e7b9eeec1a0c822872d9457b1eb8c890c45b4d5d54998

data/CHANGELOG.md

@@ -1,8 +1,7 @@
-### 2.0.22
-
-#### IMPROVED
+### 2.0.23
 
 - include fzf source directly, in case git isn't installed
+- fall back to installing fzf with sudo on error
 
 ### 2.0.20
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.22)
+    doing (2.0.23)
       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.21<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.22<!--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.22
+v2.0.23
 
 === Global Options
 === --config_file arg

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -614,17 +614,20 @@ module Doing
     def fzf
       fzf_dir = File.join(File.dirname(__FILE__), '../helpers/fzf')
       FileUtils.mkdir_p(fzf_dir) unless File.directory?(fzf_dir)
-      fzf = File.join(fzf_dir, 'bin/fzf')
-      return fzf if File.exist?(fzf)
+      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, '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>')
 
-      res = `#{fzf_dir}/install --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish`
-
-      raise DoingRuntimeError unless File.exist?(fzf)
+      res = system("#{fzf_dir}/install --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish")
+      unless res
+        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")
+      end
+      raise RuntimeError.new('Error installing fzf, please report at https://github.com/ttscoff/doing/issues') unless File.exist?(fzf_bin)
 
-      fzf
+      fzf_bin
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Brett Terpstra