utils 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7555fc93b044b6664d90d4e459d730a2f0027ba4a266af8577ac972163a91710
-  data.tar.gz: 5c22e9f713f59a2e2cedf64eb0e44746bd86ebd5aa40ea38a88f11524ce53ff7
+  metadata.gz: ba7d9a5d2f90097b79382fce03e1896767030b54cf497a9660ec41fd64ff84b0
+  data.tar.gz: d71a031ff72850f73f9ca0d29b42f45583044910a9c87c75a3860d2318d0567e
 SHA512:
-  metadata.gz: 307f459fab4c993a09590af3b2b4de2a8e1ec263a40085685a95721374c36da8107a0d9a1bdb3ab15c9b8707b46a1ab45bbb1909d6046958a14cbf31c7489214
-  data.tar.gz: 520ca2fa9e534f9341a565c424ab2ba1d7549e72586500cdf2bd41a1c993d4ecbfbd84d8f86b038a0171158bd5a93be268201ce5b35037d8e031bf5c6eaf6bdb
+  metadata.gz: 11cb9e1b968778dda0b0267bde2002c4a53e41da829a6411cd26d92aeb9978c804f3949d4dfc422feceaa526d644fbb624cd284a60e4cbde04bc21e6eb82270a
+  data.tar.gz: d562c45af8b3f7a099dca7057f54508ecb7ccead617b1fe77debef35e3cb01419137718829c68457128ff5f6ea6e469b00ccb559d9b4758776937ee6d062aebb

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/search

@@ -7,6 +7,7 @@ require 'tins/xt'
 include Tins::GO
 require 'term/ansicolor'
 include Term::ANSIColor
+require 'tempfile'
 
 def convert_ruby_to_vim_regexp(pattern)
   regexp = pattern.source.dup
@@ -18,14 +19,14 @@ end
 def read_line(path)
   filename, lineno = path.source_location
   line = File.open(filename) do |file|
-    file.lazy.each_with_index.select { |l, n| n + 1 == lineno }.first&.first 
+    file.lazy.each_with_index.select { |l, n| n + 1 == lineno }.first&.first
   end
 end
 
 def replace_line(path, new_line)
   filename, lineno = path.source_location
-  File.secure_write filename do |output|
-    File.open(filename) do |file|
+  Tempfile.open do |output|
+    File.open(filename, 'r+') do |file|
       file.each_with_index do |line, n|
         if n + 1 == lineno
           output.write new_line
@@ -33,6 +34,11 @@ def replace_line(path, new_line)
           output.write line
         end
       end
+      file.rewind
+      output.rewind
+      output.each do |line|
+        file.write line
+      end
     end
   end
 end
@@ -51,7 +57,7 @@ def replace_ask(editor, path, pattern, replace, all)
       replace_line path, new_line
       break true
     else
-      print "Replace? (#{bold(?y)}/n/e/a) "
+      print "Replace? (#{bold(?y)}/n/e/a/q) "
       case answer = STDIN.gets.chomp
       when ?y, '', ?a
         new_line = line.gsub(pattern.matcher, replace)
@@ -59,6 +65,8 @@ def replace_ask(editor, path, pattern, replace, all)
         break answer == ?a
       when ?n
         break false
+      when ?q
+        throw :quit
       when ?e
         editor.edit(path.strip)
         break false
@@ -78,8 +86,10 @@ def edit_files(pattern, paths, pick: false, replace: nil)
   when replace
     editor.wait = true
     all = false
-    for path in paths
-      all |= replace_ask editor, path, pattern, replace, all
+    catch :quit do
+      for path in paths
+        all |= replace_ask editor, path, pattern, replace, all
+      end
     end
   when pick
     if paths.size > 1

data/lib/utils/version.rb

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

data/utils.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.34.0 ruby lib
+# stub: utils 0.36.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.34.0"
+  s.version = "0.36.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 = "2023-01-05"
+  s.date = "2023-06-09"
   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.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar