refined-refinements 0.0.2.3 → 0.0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc3be8d68c3052ffea8311e45bdef17c25b333e4ae3128f089fb6c6e862a7d5
-  data.tar.gz: a83193ae99ad5ef2e719d1d0524b920ee0942d81ddea3959e582a3a5404788a4
+  metadata.gz: 547988a8cf6bef7cd70cdc4ac0f4dea1a943f1ef4471be71619042f351809050
+  data.tar.gz: 95fe3fae78320daa206d3d929ec05a8a737431a5c687b2c30ef80b3c6d4cdc7f
 SHA512:
-  metadata.gz: 266f550bb3c5878534eb31593c18d1bbe5c0b1dbdf95812a595cc26f100bbe0e7b6cf2f4b1e8b2e34e1aca8e1ad3aa3cc3caea9f8cfedaa6891a60d1f202b3e3
-  data.tar.gz: '084a6326193a094fdd57f92d2f27430f8a08dd489d9a6401ba49967fa16a7f8555a3a3052daab4bcd30009e3123b9401009e037318fd9704b87d27d3f898059b'
+  metadata.gz: 3d0d126efd64be8b2f9e48495088a28916a20f52b1c842e495aaa741f6c387f6092009afd017624c2af75b8f51cd7a7f8e064384de2d5734ef034cf3a2323116
+  data.tar.gz: c5857d2f22d070ee44b2a41fe6dd058671967c5d4185c3baea0ba8960bfbe46406d961b943856544d444af4b218e91cf798818eb7f4292300392a228f736414c

data/lib/refined-refinements/cached_http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'base64'
 require 'socket' # undefined SocketError otherwise, it's weird.

data/lib/refined-refinements/cli/commander.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'refined-refinements/string'
 require 'refined-refinements/colours'
 
@@ -14,18 +16,18 @@ module RR
     end
 
     def help_template(program_name)
-      <<-EOF
-<red.bold>:: #{program_name} ::</red.bold>
+      <<~EOF
+        <red.bold>:: #{program_name} ::</red.bold>
 
-<cyan.bold>Commands</cyan.bold>
+        <cyan.bold>Commands</cyan.bold>
       EOF
     end
 
     def help
-      self.commands.reduce(self.help_template) do |buffer, (command_name, command_class)|
+      self.commands.reduce(self.help_template) { |buffer, (command_name, command_class)|
         command_help = command_class.help && command_class.help.split("\n").map { |line| line.sub(/^ {4}/, '') }.join("\n")
         command_class.help ? [buffer, command_help].join("\n") : buffer
-      end.colourise
+      }.colourise
     end
 
     def commands
@@ -46,7 +48,7 @@ module RR
     class << self
       attr_accessor :help
       def main_command
-        File.basename($0)
+        File.basename($PROGRAM_NAME)
       end
     end
 

data/lib/refined-refinements/cli/prompt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # def prompt_type
 #   @prompt.prompt(:type, 'Type', options: Expense::TYPES) do
 #     clean_value do |raw_value|
@@ -23,7 +25,7 @@ module RR
     def validate_raw_value(*regexps, allow_empty: nil)
       @callbacks[:validate_raw_value] = Proc.new do |raw_value|
         unless (allow_empty && raw_value.empty?) || regexps.any? { |regexp| raw_value.match(regexp) }
-          raise InvalidResponse.new("Doesn't match any of the regexps.")
+          raise InvalidResponse, "Doesn't match any of the regexps."
         end
       end
     end
@@ -41,14 +43,14 @@ module RR
       clean_value = @callbacks[:get_clean_value].call(raw_value)
 
       unless @callbacks[:validate_clean_value].call(clean_value)
-        raise InvalidResponse.new("validate_clean_value failed")
+        raise InvalidResponse, "validate_clean_value failed"
       end
 
       clean_value
     end
 
     def self_or_retrieve_by_index(list, raw_value, default_value = nil)
-      if raw_value.match(/^\d+$/)
+      if /^\d+$/.match?(raw_value)
         list[raw_value.to_i - 1]
       elsif raw_value.empty?
         default_value
@@ -58,19 +60,19 @@ module RR
     end
 
     def retrieve_by_index_or_self_if_on_the_list(list, raw_value, default_value = nil)
-      if raw_value.match(/^\d+$/)
+      if /^\d+$/.match?(raw_value)
         list[raw_value.to_i - 1]
       elsif list.include?(raw_value)
         raw_value
       elsif raw_value.empty? && default_value
         default_value
       else
-        raise InvalidResponse.new(raw_value)
+        raise InvalidResponse, raw_value
       end
     end
 
     def convert_money_to_cents(raw_value)
-      if raw_value.match(/\./)
+      if /\./.match?(raw_value)
         raw_value.delete('.').to_i
       else
         "#{raw_value}00".to_i
@@ -98,7 +100,7 @@ module RR
       help = help(**options)
       prompt = "<bold>#{prompt_text}</bold>#{" (#{help})" if help}: ".colourise
       @data[key] = answer.run(@block.call(prompt))
-      raise InvalidResponse.new if @data[key].nil? && options[:required]
+      raise InvalidResponse if @data[key].nil? && options[:required]
       @data[key]
     rescue InvalidResponse => error
       puts "<red>Invalid response</red> (#{error.message}), try again.".colourise
@@ -113,7 +115,7 @@ module RR
     # TODO: If it evals as nil, shall we still add it to the data?
     def help(help: nil, options: Array.new, default: nil, **rest)
       if help then help
-      elsif help.nil? && ! options.empty?
+      elsif help.nil? && !options.empty?
         options = options.map.with_index { |key, index|
           if default == key
             "<green.bold>#{key}</green.bold> <bright_black>default</bright_black>"
@@ -122,7 +124,7 @@ module RR
           end
         }.join(' ').colourise
         # default ? "#{options}; defaults to #{default}" : options
-      else end
+      end
     end
 
     def set_completion_proc(proc, character = ' ', &block)

data/lib/refined-refinements/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'forwardable'
 require 'pathname'
@@ -22,11 +24,9 @@ module RR
 
     def items(&block)
       @items ||= self.load_raw_collection.map do |data|
-        begin
           block.call(data)
-        rescue => error
+      rescue StandardError => error
           abort "Loading item #{data.inspect} failed: #{error.message}.\n\n#{error.backtrace}"
-        end
       end
     end
 
@@ -48,7 +48,7 @@ module RR
     end
 
     def filter_out(filter_name, &block)
-      @activity_filters[filter_name] = Proc.new { |item| ! block.call(item) } if block
+      @activity_filters[filter_name] = Proc.new { |item| !block.call(item) } if block
       self
     end
 
@@ -57,7 +57,7 @@ module RR
     end
 
     def has_filter?(filter_name)
-      @activity_filters.has_key?(filter_name)
+      @activity_filters.key?(filter_name)
     end
 
     def filtered_out_items(filter_name)
@@ -99,7 +99,7 @@ module RR
 
     def save_to(path)
       updated_data = self.serialise
-      if (! File.exist?(path)) || File.read(path) != updated_data
+      if !File.exist?(path) || File.read(path) != updated_data
         path.open('w') do |file|
           file.write(updated_data)
         end

data/lib/refined-refinements/colours.rb

@@ -48,7 +48,7 @@ module RR
 
         # block.call(result, Array.new, options) #unless was_called
 
-        result.match(RR::ColourExts::REGEXP) ? result.colourise(options.merge(recursed: true)) : result #block.call(result, [options[:bold] ? :bold : nil].compact, options)
+        result.match?(RR::ColourExts::REGEXP) ? result.colourise(options.merge(recursed: true)) : result #block.call(result, [options[:bold] ? :bold : nil].compact, options)
       end
 
       # FIXME: bold true doesn't do anything for the text that is not wrapped
@@ -56,7 +56,7 @@ module RR
       def colourise(options = Hash.new)
         colours = RR::ColourExts.colours
 
-        self.parse_colours(options) do |inner_text, methods, options|
+        self.dup.parse_colours(options) do |inner_text, methods, options|
           methods.reduce(inner_text) do |result, method|
             # (print '  '; p [:r, result, method]) if result.match(/(<\/[^>]+>)/) ####
             result.gsub!(/(<\/[^>]+>)/, "#{colours.send(method)}\\1")
@@ -127,7 +127,7 @@ module RR
 
     def titlecase
       @template_string.sub(/>(#{self.remove_tags[0]})/) do |match|
-        ">#{$1.upcase}"
+        ">#{Regexp.last_match(1).upcase}"
       end
     end
 
@@ -178,3 +178,7 @@ end
 # puts s1.colourise, ''
 # puts s2.colourise(bold: true), ''
 # puts s3.colourise, ''
+#
+# OR DIRECT (without .colourise):
+# using RR::ColouredTerminal
+# puts "<green>Test</green>"

data/lib/refined-refinements/curses/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curses'
 require 'refined-refinements/curses/colours'
 require 'refined-refinements/curses/commander'
@@ -45,7 +47,7 @@ class App
   end
 
   def destroy
-    raise QuitAppError.new
+    raise QuitAppError
   end
 
   def set_up
@@ -68,7 +70,7 @@ class App
 
     until (char = window.getch) == 13 || @quit
       begin
-        if (190..200).include?(char) # Reading unicode.
+        if (190..200).cover?(char) # Reading unicode.
           char_buffer = [char]
         else
           char_buffer << char
@@ -77,7 +79,7 @@ class App
         end
       rescue KeyboardInterrupt => interrupt
         begin
-          unknown_key_handler.call(interrupt) if unknown_key_handler
+          unknown_key_handler&.call(interrupt)
         rescue QuitError
           @quit = true
         end
@@ -111,7 +113,7 @@ class App
     # window.write([:input, buffer].inspect + "\n")
     # window.refresh
     # sleep 2.5
-    return buffer
+    buffer
   end
 
   def commander
@@ -142,11 +144,11 @@ class App
       cursor = buffer.length
     when 11 # Ctrl+k.
       # yank_register = buffer[cursor..-1] # Ctrl+y suspends it currently.
-      if cursor == 0
-        buffer = ''
+      buffer = if cursor == 0
+        ''
       else
-        buffer = buffer[0..(cursor - 1)]
-      end
+        buffer[0..(cursor - 1)]
+               end
     when 127 # Backspace.
       unless buffer.empty?
         buffer = buffer[0..-2]; cursor -= 1
@@ -160,11 +162,11 @@ class App
       @history_index ||= @history.length - 1
 
       window.setpos(window.cury + 1, 0)
-      window.write("DBG: #{@history_index}, #{(0..@history.length).include?(@history_index)}")
+      window.write("DBG: #{@history_index}, #{(0..@history.length).cover?(@history_index)}")
       window.setpos(window.cury - 1, cursor + original_x)
       window.refresh
 
-      if (0..@history.length).include?(@history_index)
+      if (0..@history.length).cover?(@history_index)
         @buffer_before_calling_history = buffer
         buffer = @history[@history_index - 1]
       else
@@ -188,9 +190,9 @@ class App
       # window.addch(char)
       buffer.insert(cursor, char); cursor += 1
     else
-      raise KeyboardInterrupt.new(char) # TODO: Just return it, it's not really an error.
+      raise KeyboardInterrupt, char # TODO: Just return it, it's not really an error.
     end
 
-    return buffer, cursor
+    [buffer, cursor]
   end
 end

data/lib/refined-refinements/curses/colours.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'refined-refinements/colours'
 
 module RR
@@ -28,7 +30,7 @@ module RR
             attributes << (Curses.color_pair(fg_colour) | Curses::COLOR_WHITE)
           end
 
-          if ! attributes.empty? && ! colours.include?(:clear)
+          if !attributes.empty? && !colours.include?(:clear)
             self.multi_attron(*attributes) do
               self.addstr(chunk)
             end

data/lib/refined-refinements/curses/commander.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'refined-refinements/string'
 
 class QuitError < StandardError
@@ -92,7 +94,7 @@ class Commander
   def available_commands_help
     commands_help = @commands.reduce(Array.new) { |buffer, command|
       keys_text = command.keys.join_with_and('or') { |word| "<yellow.bold>#{word}</yellow.bold>" }
-      buffer << "#{keys_text}"
+      buffer << keys_text.to_s
     }.join_with_and
 
     "<green>Available commands</green> are #{commands_help}. Press <yellow>?</yellow> for <red>help</red>."

data/lib/refined-refinements/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module RR
@@ -8,7 +10,7 @@ module RR
       end
 
       def weekday?
-        ! self.weekend?
+        !self.weekend?
       end
     end
   end

data/lib/refined-refinements/homepath.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module RR
   class Homepath
     def initialize(path)
-      if path.start_with?('~')
-        @path = File.expand_path(path)
+      @path = if path.start_with?('~')
+        File.expand_path(path)
       else
-        @path = path # Can be relative.
-      end
+        path # Can be relative.
+              end
     end
 
     def to_s
       @path.sub(ENV['HOME'], '~')
     end
-    alias_method :inspect, :to_s
+    alias inspect to_s
 
     def expand
       @path

data/lib/refined-refinements/hour.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hour
   def self.parse(string)
     hours, minutes = string.split(':')
@@ -42,7 +44,7 @@ class Hour
       elsif hour_or_minutes.is_a?(Integer)
         self.class.new(0, @minutes.send(method_name, hour_or_minutes))
       else
-        raise TypeError.new("Hour or Integer (for minutes) expected, got #{hour_or_minutes.class}.")
+        raise TypeError, "Hour or Integer (for minutes) expected, got #{hour_or_minutes.class}."
       end
     end
   end
@@ -71,7 +73,7 @@ class Hour
       elsif anotherHour.is_a?(Time)
         self.send(method_name, Hour.now)
       else
-        raise TypeError.new("#{self.class}##{method_name} expects #{self.class} or Time object.")
+        raise TypeError, "#{self.class}##{method_name} expects #{self.class} or Time object."
       end
     end
   end
@@ -79,7 +81,7 @@ class Hour
   def inspect
     "#{self.hours}:#{format('%02d', self.minutes_over_the_hour)}"
   end
-  alias_method :to_s, :inspect
+  alias to_s inspect
 
   def to_time(today = Time.now)
     Time.new(today.year, today.month, today.day, self.hours, self.minutes_over_the_hour)

data/lib/refined-refinements/matching.rb

@@ -1,3 +1,5 @@
+# rubocop:disable all
+
 module RR
   module MatchingExts
     # Counter-intuitively when regexp replacement methods are called with a block,

data/lib/refined-refinements/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RR
   module StringExts
     refine String do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refined-refinements
 version: !ruby/object:Gem::Version
-  version: 0.0.2.3
+  version: 0.0.2.4
 platform: ruby
 authors:
 - James C Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies: []
 description: "."
 email: james@101ideas.cz