doing 2.1.89 → 2.1.90

data/lib/helpers/threaded_tests.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'tty-spinner'
 require 'tty-progressbar'
@@ -18,27 +19,25 @@ class ThreadedTests
     start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     @results = File.expand_path('results.log')
 
-    max_threads = 1000 if max_threads.to_i == 0
+    max_threads = 1000 if max_threads.to_i.zero?
 
     c = Doing::Color
     c.coloring = true
 
     shuffle = false
 
-    unless pattern =~ /shuffle/i
-      pattern = "test/doing_*#{pattern}*_test.rb"
-    else
-      pattern = "test/doing_*_test.rb"
+    if pattern =~ /shuffle/i
+      pattern = 'test/doing_*_test.rb'
       shuffle = true
+    else
+      pattern = "test/doing_*#{pattern}*_test.rb"
     end
 
     tests = Dir.glob(pattern)
 
     tests.shuffle! if shuffle
 
-    if max_tests.to_i > 0
-      tests = tests.slice(0, max_tests.to_i - 1)
-    end
+    tests = tests.slice(0, max_tests.to_i - 1) if max_tests.to_i.positive?
 
     puts "#{tests.count} test files".boldcyan
 
@@ -94,16 +93,18 @@ class ThreadedTests
           end
         end
 
-        @threads.each { |t| t.join }
+        @threads.each(&:join)
       end
 
       finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       progress.finish
-    rescue
+    rescue StandardError
       progress.stop
     ensure
-      msg = @running_tests.map { |t| t[1].format.uncolor.sub(/^\[:bar\] (.*?):status/, "#{c.bold}#{c.white}\\1#{c.reset}#{t[2]}") }.join("\n")
+      msg = @running_tests.map do |t|
+        t[1].format.uncolor.sub(/^\[:bar\] (.*?):status/, "#{c.bold}#{c.white}\\1#{c.reset}#{t[2]}")
+      end.join("\n")
 
       Doing::Prompt.clear_screen(msg)
 
@@ -194,20 +195,19 @@ class ThreadedTests
   end
 
   def next_test
-    if @children.count.positive?
-      t = Thread.new do
-        s = @children.shift
-        # s[1].start
-        # s[1].advance(status: ": #{'running'.green}")
-        run_test(s)
-      end
+    return unless @children.count.positive?
 
-      t.join
+    t = Thread.new do
+      s = @children.shift
+      # s[1].start
+      # s[1].advance(status: ": #{'running'.green}")
+      run_test(s)
     end
+
+    t.join
   end
 end
 
-
 # require 'pastel'
 ### Individual tests, multiple spinners
 # pastel = Pastel.new

data/lib/helpers/threaded_tests_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThreadedTestString
   class ::String
     include Doing::Color

data/rdoc_to_mmd.rb

@@ -8,7 +8,7 @@ input.gsub!(/^===== Options/, "##### Options\n\n")
 input.gsub!(/^===== Commands/, "### Commands\n")
 input.gsub!(/^=== Commands/, "## Commands\n")
 
-input.gsub!(/^(?<pre>={4,6}) Command: <tt>(?<cmd>.*?) (?<arg> .*?)?<\/tt>\n(?<after>.*?)$/) do
+input.gsub!(%r{^(?<pre>={4,6}) Command: <tt>(?<cmd>.*?) (?<arg> .*?)?</tt>\n(?<after>.*?)$}) do
   m = Regexp.last_match
   level = m['pre'].length == 6 ? '####' : '###'
   r = "#{level} #{m['cmd'].sub(/\|(.*?)$/, ' (*or* \1)')}"
@@ -28,15 +28,16 @@ input.gsub!(/^=== (.*?)\n+(.*?)$/) do
   m = Regexp.last_match
   "`#{m[1]}`\n: #{m[2].gsub(/\|/, '\\|')}"
 end
-input.gsub!(/^== (.*?) - (.*?)$\n\n(.*?)$/, "**\\1: \\2**\n\n*\\3*\n\n## Table of Contents\n{:.no_toc}\n\n* Table of Contents\n{:toc}")
+input.gsub!(/^== (.*?) - (.*?)$\n\n(.*?)$/,
+            "**\\1: \\2**\n\n*\\3*\n\n## Table of Contents\n{:.no_toc}\n\n* Table of Contents\n{:toc}")
 input.gsub!(/^\[(Default Value|Must Match)\] (.*?)$/, ': *\1:* `\2`')
 input.gsub!(/\n  (?=\S)/, ' ')
 input.gsub!(/^([^:`\n#*](.*?))$/, "\\1\n")
 input.gsub!(/\n{3,}/, "\n\n")
 input.gsub!(/^(: .*?)\n\n(:.*?)$/, "\\1\n\\2")
 input.gsub!(/^\[Default Command\] (.*?)$/, '> **Default Command:** [`\1`](#\1)')
-input.gsub!(/\/Users\/ttscoff\/scripts\/editor.sh/, '$EDITOR')
-input.gsub!(/\/Users\/ttscoff/, '~')
+input.gsub!(%r{/Users/ttscoff/scripts/editor.sh}, '$EDITOR')
+input.gsub!(%r{/Users/ttscoff}, '~')
 puts %(---
 layout: page
 title: "Doing - All Commands"

data/rdocfixer.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 input = $stdin.read
 
@@ -9,5 +10,3 @@ input.gsub!(/## @returns? +(.*?)$/, '## Returns \1')
 input.gsub!(/(?<= )##(?= |\n)/, '#')
 
 puts input
-
-

data/scripts/deploy.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'tty-spinner'
 require 'tty-cursor'
@@ -6,7 +7,7 @@ require 'pastel'
 require 'fileutils'
 
 pastel = Pastel.new
-format = "[#{pastel.yellow(':spinner')}] " + pastel.white("Release Gem")
+format = "[#{pastel.yellow(':spinner')}] " + pastel.white('Release Gem')
 spinners = TTY::Spinner::Multi.new(format, format: :dots, success_mark: pastel.green('✔'), error_mark: pastel.red('✖'))
 sp_v = spinners.register "[#{pastel.cyan(':spinner')}] :msg"
 sp_t = spinners.register "[#{pastel.cyan(':spinner')}] Run tests :msg"
@@ -46,7 +47,6 @@ sp_v.run do |spinner|
   spinner.success
 end
 
-
 sp_t.run do |spinner|
   spinner.update(msg: '')
   start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -72,7 +72,6 @@ sp_d.auto_spin
 `rake yard &> results.log`
 sp_d.success
 
-
 sp_w.run do |spinner|
   spinner.update(msg: '- Updating All Commands')
   `./rdoc_to_mmd.rb > /Users/ttscoff/Desktop/Code/doing.wiki/commands.source`
@@ -90,7 +89,7 @@ sp_w.run do |spinner|
   sp_w.success
 end
 
-sp_r = spinners.register "[:spinner] Releasing gem :msg"
+sp_r = spinners.register '[:spinner] Releasing gem :msg'
 
 sp_r.run do |spinner|
   spinner.update(msg: '- Preparing git release')

data/scripts/generate_bash_completions.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'tty-progressbar'
 require 'shellwords'
 
@@ -27,37 +29,34 @@ class BashCompletions
     first = true
     out = []
     logic = []
-    need_export = []
 
-    @commands.each_with_index do |cmd, i|
+    @commands.each_with_index do |cmd, _i|
       @bar.advance(status: cmd[:commands].first)
 
       data = get_help_sections(cmd[:commands].first)
 
       arg = data[:synopsis].join(' ').strip.split(/ /).last
-      case arg
-      when /(path|file)/i
-        type = :file
-      when /sect/i
-        type = 'sections'
-      when /view/i
-        type = 'views'
+      type = case arg
+             when /(path|file)/i
+               :file
+             when /sect/i
+               'sections'
+             when /view/i
+               'views'
+             end
+
+      next unless data[:command_options]
+
+      options = parse_options(data[:command_options])
+      out << command_function(cmd[:commands].first, options, type)
+
+      if first
+        op = 'if'
+        first = false
       else
-        type = nil
-      end
-
-      if data[:command_options]
-        options = parse_options(data[:command_options])
-        out << command_function(cmd[:commands].first, options, type)
-
-        if first
-          op = 'if'
-          first = false
-        else
-          op = 'elif'
-        end
-        logic << %(#{op} [[ $last =~ (#{cmd[:commands].join('|')}) ]]; then _doing_#{cmd[:commands].first})
+        op = 'elif'
       end
+      logic << %(#{op} [[ $last =~ (#{cmd[:commands].join('|')}) ]]; then _doing_#{cmd[:commands].first})
     end
 
     out << <<~EOFUNC
@@ -81,7 +80,7 @@ class BashCompletions
   def command_function(command, options, type)
     long_options = []
     short_options = []
-    
+
     options.each do |o|
       next if o.nil?
 
@@ -89,25 +88,23 @@ class BashCompletions
       short_options << o[:short] if o[:short]
     end
 
-    long = long_options.map! {|o| "--#{o}"}.join(' ')
-    short = short_options.map! {|o| "-#{o}"}.join(' ')
+    long = long_options.map! { |o| "--#{o}" }.join(' ')
+    short = short_options.map! { |o| "-#{o}" }.join(' ')
     words = ''
     logic = ''
-    words, logic = get_words(type) if type && type.is_a?(String)
-
-    func = <<~ENDFUNC
-    _doing_#{command}() {
-      #{words}
-      if [[ "$token" == --* ]]; then
-        COMPREPLY=( $( compgen -W '#{long}' -- $token ) )
-      elif [[ "$token" == -* ]]; then
-        COMPREPLY=( $( compgen -W '#{short} #{long}' -- $token ) )
-      #{logic}
-      fi
-    }
+    words, logic = get_words(type) if type.is_a?(String)
+
+    <<~ENDFUNC
+      _doing_#{command}() {
+        #{words}
+        if [[ "$token" == --* ]]; then
+          COMPREPLY=( $( compgen -W '#{long}' -- $token ) )
+        elif [[ "$token" == -* ]]; then
+          COMPREPLY=( $( compgen -W '#{short} #{long}' -- $token ) )
+        #{logic}
+        fi
+      }
     ENDFUNC
-
-    func
   end
 
   def get_words(type)
@@ -140,8 +137,6 @@ class BashCompletions
     [func, logic]
   end
 
-
-
   def get_help_sections(command = '')
     res = `doing help #{command}`.strip
     scanned = res.scan(/(?m-i)^([A-Z ]+)\n([\s\S]*?)(?=\n+[A-Z]+|\Z)/)
@@ -157,6 +152,7 @@ class BashCompletions
   def parse_option(option)
     res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
+
     {
       short: res['short'],
       long: res['long'],
@@ -188,7 +184,8 @@ class BashCompletions
     data = get_help_sections
     @global_options = parse_options(data[:global_options])
     @commands = parse_commands(data[:commands])
-    @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count, bar_format: :blade, status: '')
+    @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar] :status\033[0m",
+                                total: @commands.count, bar_format: :blade, status: '')
     @bar.resize(25)
   end
 

data/scripts/generate_fish_completions.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'tty-progressbar'
 require 'shellwords'
 
@@ -21,7 +23,6 @@ class ::String
 end
 
 class FishCompletions
-
   attr_accessor :commands, :global_options
 
   def generate_helpers
@@ -102,6 +103,7 @@ class FishCompletions
   def parse_option(option)
     res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
+
     {
       short: res['short'],
       long: res['long'],
@@ -131,7 +133,7 @@ class FishCompletions
 
   def generate_subcommand_completions
     out = []
-    @commands.each_with_index do |cmd, i|
+    @commands.each_with_index do |cmd, _i|
       out << "complete -xc doing -n '__fish_doing_needs_command' -a '#{cmd[:commands].join(' ')}' -d #{Shellwords.escape(cmd[:description])}"
     end
 
@@ -139,29 +141,28 @@ class FishCompletions
   end
 
   def generate_subcommand_option_completions
-
     out = []
     need_export = []
 
-    @commands.each_with_index do |cmd, i|
+    @commands.each_with_index do |cmd, _i|
       @bar.advance
       data = get_help_sections(cmd[:commands].first)
 
       if data[:synopsis].join(' ').strip.split(/ /).last =~ /(path|file)/i
-        out << "complete -c doing -F -n '__fish_doing_using_command #{cmd[:commands].join(" ")}'"
+        out << "complete -c doing -F -n '__fish_doing_using_command #{cmd[:commands].join(' ')}'"
       end
 
-      if data[:command_options]
-        parse_options(data[:command_options]).each do |option|
-          next if option.nil?
+      next unless data[:command_options]
 
-          arg = option[:arg] ? '-r' : ''
-          short = option[:short] ? "-s #{option[:short]}" : ''
-          long = option[:long] ? "-l #{option[:long]}" : ''
-          out << "complete -c doing #{long} #{short} -f #{arg} -n '__fish_doing_using_command #{cmd[:commands].join(' ')}' -d #{Shellwords.escape(option[:description])}"
+      parse_options(data[:command_options]).each do |option|
+        next if option.nil?
 
-          need_export.concat(cmd[:commands]) if option[:long] == 'output'
-        end
+        arg = option[:arg] ? '-r' : ''
+        short = option[:short] ? "-s #{option[:short]}" : ''
+        long = option[:long] ? "-l #{option[:long]}" : ''
+        out << "complete -c doing #{long} #{short} -f #{arg} -n '__fish_doing_using_command #{cmd[:commands].join(' ')}' -d #{Shellwords.escape(option[:description])}"
+
+        need_export.concat(cmd[:commands]) if option[:long] == 'output'
       end
     end
 
@@ -177,7 +178,8 @@ class FishCompletions
     data = get_help_sections
     @global_options = parse_options(data[:global_options])
     @commands = parse_commands(data[:commands])
-    @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+    @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar]\033[0m",
+                                total: @commands.count, bar_format: :blade)
     @bar.resize(25)
   end
 

data/scripts/generate_zsh_completions.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'tty-progressbar'
 require 'shellwords'
 
@@ -21,11 +23,10 @@ class ::String
 end
 
 class ZshCompletions
-
   attr_accessor :commands, :global_options
 
   def generate_helpers
-    out=<<~EOFUNCTIONS
+    out = <<~EOFUNCTIONS
       compdef _doing doing
 
       function _doing() {
@@ -103,7 +104,7 @@ class ZshCompletions
 
   def generate_subcommand_completions
     out = []
-    @commands.each_with_index do |cmd, i|
+    @commands.each_with_index do |cmd, _i|
       cmd[:commands].each do |c|
         out << "'#{c}:#{cmd[:description].gsub(/'/, '\\\'')}'"
       end
@@ -112,10 +113,9 @@ class ZshCompletions
   end
 
   def generate_subcommand_option_completions(indent: '        ')
-
     out = []
 
-    @commands.each_with_index do |cmd, i|
+    @commands.each_with_index do |cmd, _i|
       @bar.advance
 
       data = get_help_sections(cmd[:commands].first)
@@ -130,7 +130,8 @@ class ZshCompletions
           option_arr << if option[:short]
                           %({-#{option[:short]},--#{option[:long]}#{arg}}"[#{option[:description].gsub(/'/, '\\\'')}]")
                         else
-                          %("(--#{option[:long]}#{arg})--#{option[:long]}#{arg}}[#{option[:description].gsub(/'/, '\\\'')}]")
+                          %("(--#{option[:long]}#{arg})--#{option[:long]}#{arg}}[#{option[:description].gsub(/'/,
+                                                                                                             '\\\'')}]")
                         end
         end
       end
@@ -147,7 +148,8 @@ class ZshCompletions
     data = get_help_sections
     @global_options = parse_options(data[:global_options])
     @commands = parse_commands(data[:commands])
-    @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+    @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar]\033[0m",
+                                total: @commands.count, bar_format: :blade)
     @bar.resize(25)
   end
 

data/scripts/setting_replace.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 content = IO.read(ARGV[0])
 

data/scripts/sort_commands.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'awesome_print'
 
-input = STDIN.read.force_encoding('utf-8')
+input = $stdin.read.force_encoding('utf-8')
 
 commands = input.split(/^# @@/).delete_if(&:empty?).sort
 # commands.each do |cmd|
@@ -53,7 +55,7 @@ commands.each do |cmd|
   key = cmd.match(/^(\w+)/)[1]
   idx = indexes.index(key)
   result[idx] = "#@@#{cmd}"
-# puts commands.join('# @@')
+  # puts commands.join('# @@')
 end
 
 puts result.join('')

data/yard_templates/default/method_details/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def source
-  return
+  nil
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.89
+  version: 2.1.90
 platform: ruby
 authors:
 - Brett Terpstra
@@ -498,6 +498,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".irbrc"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - AUTHORS