journal-cli 1.0.31 → 1.0.32

data/lib/journal-cli/color.rb

@@ -17,67 +17,67 @@ module Color
   # @example Send a text string as a color
   #   Color.send('red') => "\e[31m"
   ATTRIBUTES = [
-    [:clear,               0], # String#clear is already used to empty string in Ruby 1.9
-    [:reset,               0], # synonym for :clear
-    [:bold,                1],
-    [:dark,                2],
-    [:italic,              3], # not widely implemented
-    [:underline,           4],
-    [:underscore,          4], # synonym for :underline
-    [:blink,               5],
-    [:rapid_blink,         6], # not widely implemented
-    [:negative,            7], # no reverse because of String#reverse
-    [:concealed,           8],
-    [:strikethrough,       9], # not widely implemented
-    [:strike,              9], # not widely implemented
-    [:black,              30],
-    [:red,                31],
-    [:green,              32],
-    [:yellow,             33],
-    [:blue,               34],
-    [:magenta,            35],
-    [:purple,             35],
-    [:cyan,               36],
-    [:white,              37],
-    [:bgblack,            40],
-    [:bgred,              41],
-    [:bggreen,            42],
-    [:bgyellow,           43],
-    [:bgblue,             44],
-    [:bgmagenta,          45],
-    [:bgpurple,           45],
-    [:bgcyan,             46],
-    [:bgwhite,            47],
-    [:boldblack,          90],
-    [:boldred,            91],
-    [:boldgreen,          92],
-    [:boldyellow,         93],
-    [:boldblue,           94],
-    [:boldmagenta,        95],
-    [:boldpurple,         95],
-    [:boldcyan,           96],
-    [:boldwhite,          97],
-    [:boldbgblack,       100],
-    [:boldbgred,         101],
-    [:boldbggreen,       102],
-    [:boldbgyellow,      103],
-    [:boldbgblue,        104],
-    [:boldbgmagenta,     105],
-    [:boldbgpurple,      105],
-    [:boldbgcyan,        106],
-    [:boldbgwhite,       107],
-    [:softpurple,  '0;35;40'],
-    [:hotpants,    '7;34;40'],
-    [:knightrider, '7;30;40'],
-    [:flamingo,    '7;31;47'],
-    [:yeller,      '1;37;43'],
-    [:whiteboard,  '1;30;47'],
-    [:chalkboard,  '1;37;40'],
-    [:led,         '0;32;40'],
-    [:redacted,    '0;30;40'],
-    [:alert,       '1;31;43'],
-    [:error,       '1;37;41'],
-    [:default, '0;39']
+    [:clear, 0], # String#clear is already used to empty string in Ruby 1.9
+    [:reset, 0], # synonym for :clear
+    [:bold, 1],
+    [:dark, 2],
+    [:italic, 3], # not widely implemented
+    [:underline, 4],
+    [:underscore, 4], # synonym for :underline
+    [:blink, 5],
+    [:rapid_blink, 6], # not widely implemented
+    [:negative, 7], # no reverse because of String#reverse
+    [:concealed, 8],
+    [:strikethrough, 9], # not widely implemented
+    [:strike, 9], # not widely implemented
+    [:black, 30],
+    [:red, 31],
+    [:green, 32],
+    [:yellow, 33],
+    [:blue, 34],
+    [:magenta, 35],
+    [:purple, 35],
+    [:cyan, 36],
+    [:white, 37],
+    [:bgblack, 40],
+    [:bgred, 41],
+    [:bggreen, 42],
+    [:bgyellow, 43],
+    [:bgblue, 44],
+    [:bgmagenta, 45],
+    [:bgpurple, 45],
+    [:bgcyan, 46],
+    [:bgwhite, 47],
+    [:boldblack, 90],
+    [:boldred, 91],
+    [:boldgreen, 92],
+    [:boldyellow, 93],
+    [:boldblue, 94],
+    [:boldmagenta, 95],
+    [:boldpurple, 95],
+    [:boldcyan, 96],
+    [:boldwhite, 97],
+    [:boldbgblack, 100],
+    [:boldbgred, 101],
+    [:boldbggreen, 102],
+    [:boldbgyellow, 103],
+    [:boldbgblue, 104],
+    [:boldbgmagenta, 105],
+    [:boldbgpurple, 105],
+    [:boldbgcyan, 106],
+    [:boldbgwhite, 107],
+    [:softpurple, "0;35;40"],
+    [:hotpants, "7;34;40"],
+    [:knightrider, "7;30;40"],
+    [:flamingo, "7;31;47"],
+    [:yeller, "1;37;43"],
+    [:whiteboard, "1;30;47"],
+    [:chalkboard, "1;37;40"],
+    [:led, "0;32;40"],
+    [:redacted, "0;30;40"],
+    [:alert, "1;31;43"],
+    [:error, "1;37;41"],
+    [:default, "0;39"]
   ].map(&:freeze).freeze
 
   # Array of attribute keys only
@@ -109,8 +109,8 @@ module Color
     ##
     def validate_color
       valid_color = nil
-      compiled = ''
-      normalize_color.split('').each do |char|
+      compiled = ""
+      normalize_color.chars.each do |char|
         compiled += char
         valid_color = compiled if Color.attributes.include?(compiled.to_sym) || compiled =~ /^([fb]g?)?#([a-f0-9]{6})$/i
       end
@@ -126,7 +126,7 @@ module Color
     ## @return     [String] Normalized color name
     ##
     def normalize_color
-      gsub(/_/, '').sub(/bright/i, 'bold').sub(/bgbold/, 'boldbg')
+      delete("_").sub(/bright/i, "bold").sub(/bgbold/, "boldbg")
     end
 
     # Get the calculated ANSI color at the end of the
@@ -137,7 +137,7 @@ module Color
     def last_color_code
       m = scan(ESCAPE_REGEX)
 
-      em = ['0']
+      em = ["0"]
       fg = nil
       bg = nil
       rgbf = nil
@@ -145,8 +145,8 @@ module Color
 
       m.each do |c|
         case c
-        when '0'
-          em = ['0']
+        when "0"
+          em = ["0"]
           fg, bg, rgbf, rgbb = nil
         when /^[34]8/
           case c
@@ -158,7 +158,7 @@ module Color
             rgbb = c
           end
         else
-          c.split(/;/).each do |i|
+          c.split(";").each do |i|
             x = i.to_i
             if x <= 9
               em << x
@@ -179,10 +179,10 @@ module Color
         end
       end
 
-      escape = "\e[#{em.join(';')}m"
+      escape = "\e[#{em.join(";")}m"
       escape += "\e[#{rgbb}m" if rgbb
       escape += "\e[#{rgbf}m" if rgbf
-      escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
+      escape + "\e[#{[fg, bg].delete_if(&:nil?).join(";")}m"
     end
   end
 
@@ -230,24 +230,24 @@ module Color
     ## @return     [String] Colorized string
     ##
     def template(input)
-      input = input.join(' ') if input.is_a? Array
-      return input.gsub(/(?<!\\)\{(\w+)\}/i, '') unless Color.coloring?
+      input = input.join(" ") if input.is_a? Array
+      return input.gsub(/(?<!\\)\{(\w+)\}/i, "") unless Color.coloring?
 
       input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
-                hex = Regexp.last_match(1)
-                rgb(hex)
-              end
+        hex = Regexp.last_match(1)
+        rgb(hex)
+      end
 
-      fmt = input.gsub(/%/, '%%')
+      fmt = input.gsub(/%/, "%%")
       fmt = fmt.gsub(/(?<!\\)\{(\w+)\}/i) do
-        Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
+        Regexp.last_match(1).chars.map { |c| "%<#{c}>s" }.join("")
       end
 
-      colors = { w: white, k: black, g: green, l: blue,
-                 y: yellow, c: cyan, m: magenta, r: red,
-                 W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
-                 Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
-                 d: dark, b: bold, u: underline, i: italic, x: reset }
+      colors = {w: white, k: black, g: green, l: blue,
+                y: yellow, c: cyan, m: magenta, r: red,
+                W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
+                Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
+                d: dark, b: bold, u: underline, i: italic, x: reset}
 
       format(fmt, colors)
     end
@@ -275,12 +275,12 @@ module Color
 
     module_eval(new_method)
 
-    next unless c =~ /bold/
+    next unless /bold/.match?(c)
 
     # Accept brightwhite in addition to boldwhite
     new_method = <<-EOSCRIPT
       # color string as #{c}
-      def #{c.to_s.sub(/bold/, 'bright')}(string = nil)
+      def #{c.to_s.sub(/bold/, "bright")}(string = nil)
         result = ''
         result << "\e[#{v}m" if Color.coloring?
         if block_given?
@@ -308,8 +308,8 @@ module Color
   ## @return     [String] ANSI escape string
   ##
   def rgb(hex)
-    is_bg = hex.match(/^bg?#/) ? true : false
-    hex_string = hex.sub(/^([fb]g?)?#/, '')
+    is_bg = /^bg?#/.match?(hex)
+    hex_string = hex.sub(/^([fb]g?)?#/, "")
 
     if hex_string.length == 3
       parts = hex_string.match(/(?<r>.)(?<g>.)(?<b>.)/)
@@ -319,7 +319,7 @@ module Color
         t << parts[e]
         t << parts[e]
       end
-      hex_string = t.join('')
+      hex_string = t.join("")
     end
 
     parts = hex_string.match(/(?<r>..)(?<g>..)(?<b>..)/)
@@ -328,7 +328,7 @@ module Color
       t << parts[e].hex
     end
 
-    "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
+    "\e[#{is_bg ? "48" : "38"};2;#{t.join(";")}m"
   end
 
   # Regular expression that is used to scan for ANSI-sequences while
@@ -339,13 +339,13 @@ module Color
   # ANSI-sequences are stripped from the string.
   def uncolor(string = nil) # :yields:
     if block_given?
-      yield.to_str.gsub(COLORED_REGEXP, '')
+      yield.to_str.gsub(COLORED_REGEXP, "")
     elsif string.respond_to?(:to_str)
-      string.to_str.gsub(COLORED_REGEXP, '')
+      string.to_str.gsub(COLORED_REGEXP, "")
     elsif respond_to?(:to_str)
-      to_str.gsub(COLORED_REGEXP, '')
+      to_str.gsub(COLORED_REGEXP, "")
     else
-      ''
+      ""
     end
   end
 

data/lib/journal-cli/data.rb

@@ -13,7 +13,7 @@ module Journal
     def to_data
       output = {}
       @questions.each do |q|
-        output[q['key']] = self[q['key']]
+        output[q["key"]] = self[q["key"]]
       end
       output
     end

data/lib/journal-cli/question.rb

@@ -13,14 +13,14 @@ module Journal
     ## @return     [Question] the question object
     ##
     def initialize(question)
-      @key = question['key']
-      @type = question['type']
-      @min = question['min']&.to_i || 1
-      @max = question['max']&.to_i || 5
-      @prompt = question['prompt'] || nil
-      @secondary_prompt = question['secondary_prompt'] || nil
-      @gum = TTY::Which.exist?('gum')
-      @condition = question.key?('condition') ? question['condition'].parse_condition : true
+      @key = question["key"]
+      @type = question["type"]
+      @min = question["min"]&.to_i || 1
+      @max = question["max"]&.to_i || 5
+      @prompt = question["prompt"] || nil
+      @secondary_prompt = question["secondary_prompt"] || nil
+      @gum = TTY::Which.exist?("gum")
+      @condition = question.key?("condition") ? question["condition"].parse_condition : true
     end
 
     ##
@@ -41,7 +41,7 @@ module Journal
       when /^(text|string|line)/i
         read_line
       when /^(weather|forecast)/i
-        Weather.new(Journal.config['weather_api'], Journal.config['zip'], Journal.config['temp_in'])
+        Weather.new(Journal.config["weather_api"], Journal.config["zip"], Journal.config["temp_in"])
       when /^multi/i
         read_lines
       when /^(date|time)/i
@@ -92,7 +92,7 @@ module Journal
       Journal.notify("{by}#{prompt}")
 
       line = @gum ? read_line_gum(prompt) : read_line_tty
-      return output.join("\n") if line =~ /^ *$/
+      return output.join("\n") if /^ *$/.match?(line)
 
       output << line
       output << read_line(prompt: @secondary_prompt) unless @secondary_prompt.nil?
@@ -129,7 +129,7 @@ module Journal
     ##
     ##
     def read_number_gum
-      trap('SIGINT') { exit! }
+      trap("SIGINT") { exit! }
       res = `gum input --placeholder "#{@min}-#{@max}"`.strip
       return nil if res.strip.empty?
 
@@ -144,9 +144,9 @@ module Journal
     ## @return     [Number] integer response
     ##
     def read_line_tty
-      trap('SIGINT') { exit! }
+      trap("SIGINT") { exit! }
       reader = TTY::Reader.new
-      res = reader.read_line('>> ')
+      res = reader.read_line(">> ")
       return nil if res.strip.empty?
 
       res
@@ -160,7 +160,7 @@ module Journal
     ## @return     [Number] integer response
     ##
     def read_line_gum(prompt)
-      trap('SIGINT') { exit! }
+      trap("SIGINT") { exit! }
       `gum input --placeholder "#{prompt} (blank to end answer)"`
     end
 
@@ -170,7 +170,7 @@ module Journal
     ## @return     [string] multiline input
     ##
     def read_mutliline_tty
-      trap('SIGINT') { exit! }
+      trap("SIGINT") { exit! }
       reader = TTY::Reader.new
       res = reader.read_multiline
       res.join("\n")
@@ -182,7 +182,7 @@ module Journal
     ## @return     [string] multiline input
     ##
     def read_multiline_gum(prompt)
-      trap('SIGINT') { exit! }
+      trap("SIGINT") { exit! }
       `gum write --placeholder "#{prompt}" --width 80 --char-limit 0`
     end
   end

data/lib/journal-cli/section.rb

@@ -13,10 +13,10 @@ module Journal
     ## @return     [Section] the configured section
     ##
     def initialize(section)
-      @key = section['key']
-      @title = section['title']
-      @condition = section.key?('condition') ? section['condition'].parse_condition : true
-      @questions = section['questions'].map { |question| Question.new(question) }
+      @key = section["key"]
+      @title = section["title"]
+      @condition = section.key?("condition") ? section["condition"].parse_condition : true
+      @questions = section["questions"].map { |question| Question.new(question) }
       @questions.delete_if { |q| q.prompt.nil? }
       @answers = {}
       ask_questions
@@ -29,9 +29,9 @@ module Journal
     ##
     def ask_questions
       @questions.each do |question|
-        if question.key =~ /\./
+        if /\./.match?(question.key)
           res = @answers
-          keys = question.key.split(/\./)
+          keys = question.key.split(".")
           keys.each_with_index do |key, i|
             next if i == keys.count - 1
 

data/lib/journal-cli/string.rb

@@ -5,17 +5,17 @@ class ::String
   def parse_condition
     condition = dup
     time_rx = /(?<comp>[<>=]{1,2}|before|after) +(?<time>(?:noon|midnight|[0-9]+) *(?:am|pm)?)$/i
-    return true unless condition =~ time_rx
+    return true unless condition&.match?(time_rx)
 
     now = Journal.date
     m = condition.match(time_rx)
-    time = Chronic.parse(m['time'])
+    time = Chronic.parse(m["time"])
     now.localtime
     time.localtime
-    time_of_day = Time.parse("#{now.strftime('%Y-%m-%d')} #{time.strftime('%H:%M')}")
-    Journal.notify("{br}Invalid time string in question (#{m['time']})", exit_code: 4) unless time
+    time_of_day = Time.parse("#{now.strftime("%Y-%m-%d")} #{time.strftime("%H:%M")}")
+    Journal.notify("{br}Invalid time string in question (#{m["time"]})", exit_code: 4) unless time
 
-    case m['comp']
+    case m["comp"]
     when /^<=$/
       now <= time_of_day
     when /^(<|bef)/i

data/lib/journal-cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Journal
-  VERSION = '1.0.31'
+  VERSION = "1.0.32"
 end

data/lib/journal-cli/weather.rb

@@ -6,50 +6,50 @@ module Journal
 
     def initialize(api, zip, temp_in)
       Journal.date.localtime
-      if Journal.date.strftime('%Y-%m-%d') == Time.now.strftime('%Y-%m-%d')
-        res = `curl -SsL 'http://api.weatherapi.com/v1/forecast.json?key=#{api}&q=#{zip}&aqi=no'`
+      res = if Journal.date.strftime("%Y-%m-%d") == Time.now.strftime("%Y-%m-%d")
+        `curl -SsL 'http://api.weatherapi.com/v1/forecast.json?key=#{api}&q=#{zip}&aqi=no'`
       else
-        res = `curl -SsL 'http://api.weatherapi.com/v1/history.json?key=#{api}&q=#{zip}&aqi=no&dt=#{Journal.date.strftime('%Y-%m-%d')}'`
+        `curl -SsL 'http://api.weatherapi.com/v1/history.json?key=#{api}&q=#{zip}&aqi=no&dt=#{Journal.date.strftime("%Y-%m-%d")}'`
       end
 
       data = JSON.parse(res)
 
-      raise StandardError, 'invalid JSON response' if data.nil?
+      raise StandardError, "invalid JSON response" if data.nil?
 
-      raise StandardError, 'mising forecast' unless data['forecast']
+      raise StandardError, "missing forecast" unless data["forecast"]
 
-      temp_key = temp_in =~ /^c/ ? 'temp_c' : 'temp_f'
+      temp_key = /^c/.match?(temp_in) ? "temp_c" : "temp_f"
 
-      if Journal.date.strftime('%Y-%m-%d') == Time.now.strftime('%Y-%m-%d')
-        raise StandardError, 'missing conditions' unless data['current']
+      if Journal.date.strftime("%Y-%m-%d") == Time.now.strftime("%Y-%m-%d")
+        raise StandardError, "missing conditions" unless data["current"]
 
-        curr_temp = data['current'][temp_key]
-        curr_condition = data['current']['condition']['text']
+        curr_temp = data["current"][temp_key]
+        curr_condition = data["current"]["condition"]["text"]
       else
-        time = Journal.date.strftime('%Y-%m-%d %H:00')
-        hour = data['forecast']['forecastday'][0]['hour'].filter { |h| h['time'].to_s =~ /#{time}/ }.first
+        time = Journal.date.strftime("%Y-%m-%d %H:00")
+        hour = data["forecast"]["forecastday"][0]["hour"].find { |h| h["time"].to_s =~ /#{time}/ }
         curr_temp = hour[temp_key]
-        curr_condition = hour['condition']['text']
+        curr_condition = hour["condition"]["text"]
       end
 
-      forecast = data['forecast']['forecastday'][0]
+      forecast = data["forecast"]["forecastday"][0]
 
-      moon_phase = forecast['astro']['moon_phase']
+      moon_phase = forecast["astro"]["moon_phase"]
 
-      day = forecast['date']
-      high = temp_in =~ /^c/ ? forecast['day']['maxtemp_c'] : forecast['day']['maxtemp_f']
-      low = temp_in =~ /^c/ ? forecast['day']['mintemp_c'] : forecast['day']['mintemp_f']
-      condition = forecast['day']['condition']['text']
+      day = forecast["date"]
+      high = /^c/.match?(temp_in) ? forecast["day"]["maxtemp_c"] : forecast["day"]["maxtemp_f"]
+      low = /^c/.match?(temp_in) ? forecast["day"]["mintemp_c"] : forecast["day"]["mintemp_f"]
+      condition = forecast["day"]["condition"]["text"]
 
-      hours = forecast['hour']
+      hours = forecast["hour"]
       temps = [
-        { temp: hours[8][temp_key], condition: hours[8]['condition']['text'] },
-        { temp: hours[10][temp_key], condition: hours[10]['condition']['text'] },
-        { temp: hours[12][temp_key], condition: hours[12]['condition']['text'] },
-        { temp: hours[14][temp_key], condition: hours[14]['condition']['text'] },
-        { temp: hours[16][temp_key], condition: hours[16]['condition']['text'] },
-        { temp: hours[18][temp_key], condition: hours[18]['condition']['text'] },
-        { temp: hours[19][temp_key], condition: hours[20]['condition']['text'] }
+        {temp: hours[8][temp_key], condition: hours[8]["condition"]["text"]},
+        {temp: hours[10][temp_key], condition: hours[10]["condition"]["text"]},
+        {temp: hours[12][temp_key], condition: hours[12]["condition"]["text"]},
+        {temp: hours[14][temp_key], condition: hours[14]["condition"]["text"]},
+        {temp: hours[16][temp_key], condition: hours[16]["condition"]["text"]},
+        {temp: hours[18][temp_key], condition: hours[18]["condition"]["text"]},
+        {temp: hours[19][temp_key], condition: hours[20]["condition"]["text"]}
       ]
 
       @data = {
@@ -95,43 +95,43 @@ module Journal
       output << "Forecast for #{@data[:day]}: #{forecast}  "
       output << "Currently: #{current}  "
       output << "Moon Phase: #{moon}  "
-      output << ''
+      output << ""
 
       # Hours
       hours_text = %w[8am 10am 12pm 2pm 4pm 6pm 8pm]
-      step_out = ['|']
+      step_out = ["|"]
       @data[:temps].each_with_index do |_h, i|
         width = @data[:temps][i][:condition].length + 1
         step_out << format("%#{width}s |", hours_text[i])
       end
 
-      output << step_out.join('')
+      output << step_out.join("")
 
       # table separator
-      step_out = ['|']
+      step_out = ["|"]
       @data[:temps].each do |temp|
         width = temp[:condition].length + 1
-        step_out << "#{'-' * width}-|"
+        step_out << "#{"-" * width}-|"
       end
 
-      output << step_out.join('')
+      output << step_out.join("")
 
       # Conditions
-      step_out = ['|']
+      step_out = ["|"]
       @data[:temps].each do |temp|
-        step_out << format(' %s |', temp[:condition])
+        step_out << format(" %s |", temp[:condition])
       end
 
-      output << step_out.join('')
+      output << step_out.join("")
 
       # Temps
-      step_out = ['|']
+      step_out = ["|"]
       @data[:temps].each do |temp|
         width = temp[:condition].length + 1
         step_out << format("%#{width}s |", temp[:temp])
       end
 
-      output << step_out.join('')
+      output << step_out.join("")
 
       output.join("\n")
     end