utils 0.33.1 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ec7fbc2ce6a3e39c4a2ef629e37232bf60ddf491bf3adfcc1ec29d18358f2f
-  data.tar.gz: e5a8b2edef42e1e00a91a88e46078696ec216c0a25032ff6ac17d030e9e75495
+  metadata.gz: '07918bacd055f0bbfac96cd115901ce36b656d9658477a07e11565562b73846e'
+  data.tar.gz: 8016c94eabb23717b14548a2b334a5f2d047808157b803a23980d63a7270847b
 SHA512:
-  metadata.gz: 3f4648b04e39732a399a49c581aec427178ac17ae6ca3d48e84a76bed45301f61f108848ec08bcdcedb650613406de569173333e0aa8f49711062775f8ee0b70
-  data.tar.gz: bca088a6c8cd4226358a70563eff3f5febd7c80057bb277fa97404a0ef3992e2e9be1d8ec63d24093e8de1a85eb0ad1bf4f2607f38f07ecca2be8501fbcf10a7
+  metadata.gz: 1d903b3bf6fd56083203e63930036ed0950dbae533cb7560569c920f4d25ef2267aa12f5e35740f61c9210b9b3df7b94f35050895a0c91b34b02309963b4fac2
+  data.tar.gz: c50f439ffe1168cda867f5470b39e9a642363861901f9371ace1eec95c45b7d2a6556c82b5d108582927cffec02ef405fa35f0b6f5e7a9f75382e91a8f87d72f

data/bin/discover

@@ -79,8 +79,7 @@ finder = -> * {
   )
 }
 
-case
-when args[?s]
+search = -> * {
   f = nil
   pattern = pattern.dup
   args[?n] = Term::ANSIColor.terminal_lines - 1
@@ -112,6 +111,11 @@ when args[?s]
   else
     exit 1
   end
+}
+
+case
+when args[?s]
+  search.()
 when args[?E]
   edit_files *finder.().paths, pick: true
 when args[?e]
@@ -131,7 +135,8 @@ when pattern.empty? && args[?r]
   finder.()
   exit
 when pattern.empty?
-  usage
+  args[?e] = true
+  search.()
 else
   puts finder.().search.output
 end

data/bin/probe

@@ -5,6 +5,10 @@ require 'tins/xt'
 require 'tins/lines_file'
 include Tins::GO
 require 'utils'
+begin
+  require 'utils/line_formatter'
+rescue LoadError
+end
 include Utils
 require 'drb'
 

data/lib/utils/irb.rb

@@ -336,31 +336,17 @@ module Utils
                 STDERR.puts "Loaded '#{f}'."
               end
             end
-            Find.find('.') do |f|
-              File.directory?(f) and next
-              md5_f = Utils::MD5.md5(f)
-              if f.end_with?(file) and !loaded[md5_f]
-                Kernel.load f
-                loaded[md5_f] = true
-                STDERR.puts "Loaded '#{f}'."
-              end
-            end
           end
         end
         nil
       end
 
-      def irb_edit(*files)
-        $editor.full?(:edit, *files)
-      end
-
-      def edit
-        $editor.full?(:edit, self)
-      end
-
-      # List contents of directory
-      def ls(*args)
-        puts `ls #{args.map { |x| "'#{x}'" } * ' '}`
+      def ed(*files)
+        if files.empty?
+          $editor.full?(:edit, self)
+        else
+          $editor.full?(:edit, *files)
+        end
       end
 
       if defined?(ActiveRecord::Base)

data/lib/utils/line_formatter.rb

@@ -9,164 +9,164 @@ rescue LoadError => e
 else
   module Utils
     class LineFormatter
-        ::RSpec::Core::Formatters.register self, :start, :close,
-          :example_passed, :example_pending, :example_failed, :dump_summary
-
-        def initialize(output)
-          @output = output
-          @output.sync = true
-          filename = 'errors.lst'
-          @errors_lst = File.new(filename, 'w')
-          @errors_lst.sync = true
-        end
-
-        attr_reader :output
-
-        def start(_ignore)
-          output.puts "Storing error list in #{@errors_lst.path.inspect}: "
-          output.puts ?- * Tins::Terminal.columns
-        end
-
-        def close(_ignore)
-          @errors_lst.close
-        end
-
-        def dump_summary(summary)
-          line = summary_line(summary)
-          @errors_lst.puts ?= * 80, line
-          output.puts ?= * Tins::Terminal.columns, line
-        end
-
-        def example_passed(example)
-          output.puts format_line(example)
-        end
-
-        def example_pending(example)
-          output.puts format_line(example)
-        end
-
-        def example_failed(example)
-          dump_failure_to_error_file(example)
-          output.puts format_line(example)
-          dump_failure(example)
-        end
-
-        private
-
-        def summary_line(summary)
-          failure_percentage = 100 * summary.failure_count.to_f / summary.example_count
-          failure_percentage.nan? and failure_percentage = 0.0
-          pending_percentage = 100 * summary.pending_count.to_f / summary.example_count
-          pending_percentage.nan? and pending_percentage = 0.0
-          "%u of %u (%.2f %%) failed, %u pending (%.2f %%) in %.3f seconds" % [
-            summary.failure_count,
-            summary.example_count,
-            failure_percentage,
-            summary.pending_count,
-            pending_percentage,
-            summary.duration,
-          ]
-        end
-
-        def dump_failure(example)
-          output.puts(
-            description(example, full: true),
-            dump_failure_for_example(example)
-          )
-        end
-
-        def read_failed_line(example)
-          ''.strip
-        end
-
-        def dump_failure_for_example(example)
-          result = ''
-          exception = execution_result(example).exception
-          exception_class_name = exception.class.name
-          result << "Failure/Error: #{read_failed_line(example)}\n"
-          result << "#{exception_class_name}:\n" unless exception_class_name =~ /RSpec/
-          if m = exception.message
-            m.to_s.split("\n").each { |line| result << "  #{line}\n" }
-          end
-          result
-        end
-
-        def format_backtrace(example, folding: false, limit: nil)
-          backtrace = execution_result(example).exception.backtrace
-          backtrace.nil? and return ''
-          if limit
-            backtrace = backtrace[0, limit]
-          end
-          result = []
-          folding and result << '{{{'
-          for line in backtrace
-            result << RSpec::Core::Metadata::relative_path(line)
-          end
-          folding and result << '}}}'
-          result * ?\n
-        end
-
-        def dump_failure_to_error_file(example)
-          @errors_lst.flock File::LOCK_EX
-          @errors_lst.puts "%s\n%3.3fs %s\n%s\n%s" % [
-            location(example), run_time(example), description(example, full: true),
-            dump_failure_for_example(example), format_backtrace(example, folding: true)
-          ]
-        ensure
-          @errors_lst.flock File::LOCK_UN
-        end
-
-        def execution_result(example)
-          example.example.metadata[:execution_result]
-        end
-
-        def description(example, full: ENV['VERBOSE'].to_i == 1)
-          if full
-            example.example.full_description
-          else
-            example.example.description
-          end
-        end
-
-        def run_time(example)
-          execution_result(example).run_time
-        end
-
-        def format_line(example)
-          args = [ location(example), run_time(example), description(example) ]
-          uncolored = "%s # S %3.3fs %s" % args
-          uncolored = uncolored[0, Tins::Terminal.columns]
-          case execution_result(example).status
-          when :passed
-            success_color(uncolored)
-          when :failed
-            failure_color(uncolored)
-          when :pending
-            pending_color(uncolored)
-          else
-            uncolored % args
-          end
-        end
-
-        def success_color(text)
-          Term::ANSIColor.green(text)
-        end
-
-        def failure_color(text)
-          Term::ANSIColor.red(text)
-        end
-
-        def pending_color(text)
-          Term::ANSIColor.yellow(text)
-        end
-
-        def location(example)
-          location = example.example.metadata[:location]
-          unless location.include?(?/)
-            location = example.example.metadata[:example_group][:location]
-          end
-          RSpec::Core::Metadata::relative_path(location)
-        end
+      ::RSpec::Core::Formatters.register self, :start, :close,
+        :example_passed, :example_pending, :example_failed, :dump_summary
+
+      def initialize(output)
+        @output = output
+        @output.sync = true
+        filename = 'errors.lst'
+        @errors_lst = File.new(filename, 'w')
+        @errors_lst.sync = true
+      end
+
+      attr_reader :output
+
+      def start(_ignore)
+        output.puts "Storing error list in #{@errors_lst.path.inspect}: "
+        output.puts ?- * Tins::Terminal.columns
+      end
+
+      def close(_ignore)
+        @errors_lst.close
+      end
+
+      def dump_summary(summary)
+        line = summary_line(summary)
+        @errors_lst.puts ?= * 80, line
+        output.puts ?= * Tins::Terminal.columns, line
+      end
+
+      def example_passed(example)
+        output.puts format_line(example)
+      end
+
+      def example_pending(example)
+        output.puts format_line(example)
+      end
+
+      def example_failed(example)
+        dump_failure_to_error_file(example)
+        output.puts format_line(example)
+        dump_failure(example)
+      end
+
+      private
+
+      def summary_line(summary)
+        failure_percentage = 100 * summary.failure_count.to_f / summary.example_count
+        failure_percentage.nan? and failure_percentage = 0.0
+        pending_percentage = 100 * summary.pending_count.to_f / summary.example_count
+        pending_percentage.nan? and pending_percentage = 0.0
+        "%u of %u (%.2f %%) failed, %u pending (%.2f %%) in %.3f seconds" % [
+          summary.failure_count,
+          summary.example_count,
+          failure_percentage,
+          summary.pending_count,
+          pending_percentage,
+          summary.duration,
+        ]
+      end
+
+      def dump_failure(example)
+        output.puts(
+          description(example, full: true),
+          dump_failure_for_example(example)
+        )
+      end
+
+      def read_failed_line(example)
+        ''.strip
+      end
+
+      def dump_failure_for_example(example)
+        result = ''
+        exception = execution_result(example).exception
+        exception_class_name = exception.class.name
+        result << "Failure/Error: #{read_failed_line(example)}\n"
+        result << "#{exception_class_name}:\n" unless exception_class_name =~ /RSpec/
+        if m = exception.message
+          m.to_s.split("\n").each { |line| result << "  #{line}\n" }
+        end
+        result
+      end
+
+      def format_backtrace(example, folding: false, limit: nil)
+        backtrace = execution_result(example).exception.backtrace
+        backtrace.nil? and return ''
+        if limit
+          backtrace = backtrace[0, limit]
+        end
+        result = []
+        folding and result << '{{{'
+        for line in backtrace
+          result << RSpec::Core::Metadata::relative_path(line)
+        end
+        folding and result << '}}}'
+        result * ?\n
+      end
+
+      def dump_failure_to_error_file(example)
+        @errors_lst.flock File::LOCK_EX
+        @errors_lst.puts "%s\n%3.3fs %s\n%s\n%s" % [
+          location(example), run_time(example), description(example, full: true),
+          dump_failure_for_example(example), format_backtrace(example, folding: true)
+        ]
+      ensure
+        @errors_lst.flock File::LOCK_UN
+      end
+
+      def execution_result(example)
+        example.example.metadata[:execution_result]
+      end
+
+      def description(example, full: ENV['VERBOSE'].to_i == 1)
+        if full
+          example.example.full_description
+        else
+          example.example.description
+        end
+      end
+
+      def run_time(example)
+        execution_result(example).run_time
+      end
+
+      def format_line(example)
+        args = [ location(example), run_time(example), description(example) ]
+        uncolored = "%s # S %3.3fs %s" % args
+        uncolored = uncolored[0, Tins::Terminal.columns]
+        case execution_result(example).status
+        when :passed
+          success_color(uncolored)
+        when :failed
+          failure_color(uncolored)
+        when :pending
+          pending_color(uncolored)
+        else
+          uncolored % args
+        end
+      end
+
+      def success_color(text)
+        Term::ANSIColor.green(text)
+      end
+
+      def failure_color(text)
+        Term::ANSIColor.red(text)
+      end
+
+      def pending_color(text)
+        Term::ANSIColor.yellow(text)
+      end
+
+      def location(example)
+        location = example.example.metadata[:location]
+        unless location.include?(?/)
+          location = example.example.metadata[:example_group][:location]
+        end
+        RSpec::Core::Metadata::relative_path(location)
+      end
     end
   end
 end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.33.1'
+  VERSION         = '0.35.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/utils.rb

@@ -10,10 +10,6 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_blamer'
-  begin
-    require 'utils/line_formatter'
-  rescue LoadError
-  end
 
   require 'utils/xt/source_location_extension'
   class ::Object

data/utils.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.33.1 ruby lib
+# stub: utils 0.35.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.33.1"
+  s.version = "0.35.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2022-12-17"
+  s.date = "2023-03-01"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ascii7".freeze, "blameline".freeze, "check-yaml".freeze, "classify".freeze, "create_cstags".freeze, "create_tags".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "fix-brew".freeze, "git-empty".freeze, "git-versions".freeze, "irb_connect".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".freeze, "probe".freeze, "rd2md".freeze, "search".freeze, "sedit".freeze, "serve".freeze, "ssh-tunnel".freeze, "strip_spaces".freeze, "untest".freeze, "utils-utilsrc".freeze, "vcf2alias".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.35.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar