nxxd 1.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a908962e81a416580c2987b7523f755e85e1963c20908420fb579710b6a865
-  data.tar.gz: b18d9db546926037e9646a22e6c8394fd6d4ff86ad048b8be22a697d07698a87
+  metadata.gz: 685050d033e011d2247f30c73a30f0e2c96b6b25627bc7802a8b55c74b627080
+  data.tar.gz: c1036f1b327e53e1df7dd3e02c0667ceb98c17e3ede00e6f3a6a3392df73d5f4
 SHA512:
-  metadata.gz: d941c8d1202b8bcbf0b1b0507216665e1c1e81035ff224861e6183d8a82b4354b701a3231e14803c9e7d934dc75cbb1dd8d6210ca46c36f8275c3234d34a25af
-  data.tar.gz: abd20b6a161993d5ab0d8047623c8d137b7eec56512f72269a942feae25521ecd9549faceec3276e4df654008a84dcdf4c37b1c000ef5e473a74251850307380
+  metadata.gz: 72c1a0197350fb05b79154fa96d1b6b3a9081d4c8f644c10e2cfbd7641b76794c457566ceaaa192e8157b98b62912953f61ec21ea34eaf24ab347fcf24fa7830
+  data.tar.gz: c268077a3660aa76323673d17fffeb48424c36d31767c55bfd243b68e05dddb0f91550dca12a26f0391ae65f5d585fac92d19aacaa0a0e5edcf0770fe83ddd36

data/README.md

@@ -55,7 +55,7 @@ nxxd -i someimage.png
 Get help.
 
 ```bash
-nxxd  -h
+nxxd -h
 ```
 
 
@@ -147,4 +147,5 @@ highlighting included in this package [xxd.vim](./vim/syntax/xxd.vim).
 
   * (C) 2025 Bertram Scharpf <software@bertram-scharpf.de>
   * License: [BSD-2-Clause+](./LICENSE)
+  * Repository: [ruby-nxxd](https://github.com/BertramScharpf/ruby-nxxd)
 

data/bin/nxxd

@@ -18,6 +18,7 @@ module Nxxd
       "r" => [ :reverse,     true,     "Reverse operation, pack"],
       "o" => [ :output,      :NAME,    "Output file (- = stdout)"],
       "output" => "o",
+      "n" => [ :noclobber,   true,     "Don't overwrite existing files"],
       "f" => [ :full,        true,     "Full output (no squeeze)"],
       "full" => "f",
       "a" => [ :full,        false,    "Abbreviate (squeeze duplicate lines)"],
@@ -148,10 +149,7 @@ module Nxxd
     def initialize params
       o = Options.new params
       @opts, @args = o.opts, o.args
-      @inputs = []
-      @inputs.push @args.shift
-      @output = (@opts.delete :output) || @args.pop
-      @inputs.push @args.shift until @args.empty?
+      @output = (@opts.delete :output) || last_arg_if_not_existing
     end
 
     def run
@@ -179,6 +177,9 @@ module Nxxd
     rescue Interrupt
       $stderr.puts "Interrupted."
       1
+    rescue RuntimeError
+      $stderr.puts "Runtime Error: #$!"
+      1
     rescue
       $stderr.puts "Error: #$! (#{$!.class})"
       1
@@ -186,9 +187,14 @@ module Nxxd
 
     private
 
+    def last_arg_if_not_existing
+      return if File.exist? @args.last
+      @args.pop
+    end
+
     def open_inputs
       plain = @opts.delete :plain
-      @inputs.each do |i|
+      @args.each do |i|
         i = nil if i == "-"
         if i then
           @opts[ :input] = i unless plain or @opts[ :reverse]
@@ -205,9 +211,12 @@ module Nxxd
     end
 
     def open_output
+      nc = @opts.delete :noclobber
       o = @output unless @output == "-"
       if o then
-        File.open o, "w" do |o| yield o end
+        mode = "w"
+        mode << "x" if nc
+        File.open o, mode do |f| yield f end
       else
         yield $stdout
       end

data/lib/nxxd/nvim.rb

@@ -140,12 +140,12 @@ module Nxxd
       public
 
       def feed a, range
+        $vim.command "#{range.last}"
         popen a do |ro,re|
+          $vim.put [ ""], "l", true, true
           r = Neovim::Lines.new $vim.get_current_buf, range
           Nxxd::Dump.reverse r, ro, consecutive: true
           ro.close_write
-          $vim.command "#{range.last}"
-          $vim.put [ ""], "l", true, true
           ro.each_line { |l|
             l.chomp!
             $vim.put [ l], "l", false, true
@@ -154,6 +154,8 @@ module Nxxd
             l.chomp!
             $vim.put [ "# #{l}"], "l", false, true
           }
+        rescue
+          $vim.put [ "# #{$!.class}: #$!"], "l", false, true
         end
         $?.success? or $vim.put [ "### Exit code: #{$?.exitstatus}"], "l", false, true
       end

data/lib/nxxd/version.rb

@@ -4,8 +4,8 @@
 
 module Nxxd
 
-  VERSION = "1.1".freeze
-  AUTHOR  = "(C) 2025 Bertram Scharpf <software@bertram-scharpf.de>"
+  VERSION = "1.3".freeze
+  AUTHOR  = "(C) 2026 Bertram Scharpf <software@bertram-scharpf.de>"
   LICENSE = "BSD-2-Clause+"
 
 end

data/lib/nxxd.rb

@@ -99,7 +99,7 @@ module Nxxd
             consecutive and
               raise "Addressless undump doesn't allow repeat specifications."
             repeat = true
-          when /^(?:(\h+):)?\s*((?:\h\h ?)*)/ then
+          when /^(?:(\h+):)?\s*((?:\h\h ?)*)((?:  |\t).*)?$/ then
             addr, nibs = $~.captures
             if !consecutive && addr then
               addr = $1.to_i 0x10
@@ -116,7 +116,7 @@ module Nxxd
             r = (nibs.scan /\h\h/).map { |x| x.to_i 0x10 }.pack "C*"
             o.write r
           else
-            raise "Uninterpretable hex dump: #{l.chomp}"
+            raise "Uninterpretable hex dump: #{l.inspect}"
           end
         }
         output

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nxxd
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.3'
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Yet another Xxd reimplementation.
 
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Just Ruby
-rubygems_version: 3.6.3
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Hex Dump Tool
 test_files: []