doing 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8488b18e8f56269941a0179b2c0c9699b63b0e9704d379add7a0b474c0c5b032
-  data.tar.gz: f94eaf8652cc1e0c0436620aee40654d9e01c10f147ccf842430416f48f73a51
+  metadata.gz: a196efa7539ea75803e860bb9f2085433f4810eedf380da90ecf3f73a0981049
+  data.tar.gz: 620c726d10967fb0b7f8ad1256ae6709ec7eb475d1cca75f55941f3436686321
 SHA512:
-  metadata.gz: b441df20808e3f6e0822236acc873032cfffe6b4c6c083f8781a714ca502442e73f8abcb6b1e1da1e912e9985016d20c2aca1c0abd1780d68f28d3718c769e53
-  data.tar.gz: 59e911790a16a38f98da04ab502376eef8e41232ce74456d7db2ba1fff8b9e474702d85743b76e5788b470c4a9128254990dc428d4ba60f74eb9908cccc0e9d3
+  metadata.gz: 4ea8b06c7a10b05978785ad5cbc6cf61f898c221d433b863b8749a5c179620c2319196a171108081c24a8863b7cf9358f703e914c902d460fda2c4f86b56f753
+  data.tar.gz: 8139559b029d38a8802e6b4bb8a9ab8b2e309dd940dac7bf08ad5761771f808d047737fe87e666e630f7d579de73f19cc989bc6e9e1d502366b4173ac3b9a1b8

data/README.md

@@ -272,15 +272,57 @@ Outputs:
 
 You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified in the file.
 
+### Colors
+
+You can use the following colors in view templates. Set a foreground color with a named color:
+
+    %black
+    %red
+    %green
+    %yellow
+    %blue
+    %magenta
+    %cyan
+    %white
+
+You can also add a background color (`%bg[color]`) by placing one after the foreground color:
+
+    %white%bgblack
+    %black%bgred
+    ...etc.
+
+There are bold variants for both foreground and background colors
+
+    %boldblack
+    %boldred
+    ... etc.
+
+    %boldbgblack
+    %boldbgred
+    ... etc.
+
+And a few special colors you'll just have to try out to see:
+
+    %softpurple
+    %hotpants
+    %knightrider
+    %flamingo
+    %yeller
+    %whiteboard
+
+Any time you use one of the foreground colors it will reset the bold and background settings to their default automatically. You can force a reset to default terminal colors using `%default`.
+
 ## Usage
 
     doing [global options] command [command options] [arguments...]
 
 ### Global options:
 
-    --[no-]notes        - Output notes if included in the template (default: enabled)
-    --version           - Display the program version
-    --help              - Show help message and usage summary
+    -f, --doing_file=arg - Specify a different doing_file (default: none)
+    --help               - Show this message
+    --[no-]notes         - Output notes if included in the template (default: enabled)
+    --stdout             - Send results report to STDOUT instead of STDERR
+    --version            - Display the program version
 
 ### Commands:
 
@@ -490,6 +532,11 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
 
 ## Changelog
 
+#### 1.0.18
+
+- Fix `undefined method [] for nil class` error in `doing view`
+- Loosened up the template color resetting a bit more
+
 #### 1.0.17
 
 - Add `--stdout` global option to send reporting to STDOUT instead of STDERR (for use with LaunchBar et al)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.17'
+  VERSION = '1.0.18'
 end

data/lib/doing/wwid.rb

@@ -1051,7 +1051,12 @@ EOT
         output.sub!(/%section/,item['section']) if item['section']
 
         if opt[:tags_color]
-          last_color = output.scan(/(\e\[[\d;]+m)[^\e]+@/)[-1][0]
+          escapes = output.scan(/(\e\[[\d;]+m)[^\e]+@/)
+          if escapes.length > 0
+            last_color = escapes[-1][0]
+          else
+            last_color = colors['default']
+          end
           output.gsub!(/\s(@[^ \(]+)/," #{colors[opt[:tags_color]]}\\1#{last_color}")
         end
         output.sub!(/%note/,note)
@@ -1176,14 +1181,14 @@ EOT
     color['magenta'] = "\033[0;0;35m"
     color['cyan'] = "\033[0;0;36m"
     color['white'] = "\033[0;0;37m"
-    color['bgblack'] = "\033[0;40m"
-    color['bgred'] = "\033[0;41m"
-    color['bggreen'] = "\033[0;42m"
-    color['bgyellow'] = "\033[0;43m"
-    color['bgblue'] = "\033[0;44m"
-    color['bgmagenta'] = "\033[0;45m"
-    color['bgcyan'] = "\033[0;46m"
-    color['bgwhite'] = "\033[0;47m"
+    color['bgblack'] = "\033[40m"
+    color['bgred'] = "\033[41m"
+    color['bggreen'] = "\033[42m"
+    color['bgyellow'] = "\033[43m"
+    color['bgblue'] = "\033[44m"
+    color['bgmagenta'] = "\033[45m"
+    color['bgcyan'] = "\033[46m"
+    color['bgwhite'] = "\033[47m"
     color['boldblack'] = "\033[1;30m"
     color['boldred'] = "\033[1;31m"
     color['boldgreen'] = "\033[0;1;32m"
@@ -1206,7 +1211,7 @@ EOT
     color['flamingo'] = "\033[7;31;47m"
     color['yeller'] = "\033[1;37;43m"
     color['whiteboard'] = "\033[1;30;47m"
-    color['default']="\033[0;39m"
+    color['default'] = "\033[0;39m"
     color
   end
 

metadata

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