xrpn 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6f814c240c32360d827999b73c4e639c250961ad411ac5e3b24294b8a9485c
-  data.tar.gz: ea22b560bc4af10f44745acb6c7bbeb963e592fe16db1fccc230881618c2e770
+  metadata.gz: a7a19f8e4bef73ee3b6099d50a418d033d129ecbfb808b7e6ca2e058f1036a74
+  data.tar.gz: 0eda38a9de877944f51b0c7c2407261b60d386edf1a7f7c1e466b9a601bdc01d
 SHA512:
-  metadata.gz: a21aace2e83318a85933a96d720b8315fb38a22226f26be9747f11347e6eb8d0947abba4d95a8b4f381976f44732a0cf9772c6c2b7b0bf83bc7ce08abcc36725
-  data.tar.gz: fdc11995bdaca9f7c3707c5bbd954260ca5392775bf5cf1591470a74f4d3b95f7f51345526e8df0ef478538693e3bd45eae896dc5cd991a491deec97bb8a201d
+  metadata.gz: 0c70decfd7068d4defa8b912cbafa7d30fb2595425f2df8a5a5ebf3ca02f775e1a4acca00cf7710413ba3f06907e11fa534778748da752db24e526788bbd0a9a
+  data.tar.gz: 118569c5be20f93115c304b9072dfae4e9c6254ab2fdd7ca78c75d5e8231ec580f035f252528734465b335b609a5d9187507b016ffa571fa1766b3f78425caa1

data/bin/xrpn

@@ -9,11 +9,28 @@ require 'bigdecimal'
 require 'open-uri'
 require 'json'
 require 'tty-prompt'
-begin
-  require 'xrpn'
-rescue LoadError
-  puts "You may want to install xrpn via `gem install xrpn`"
+
+# Handle the command line options
+options = {}
+optparse = OptionParser.new do |opts|
+  # Set a banner, displayed at the top of the help screen.
+  opts.banner = "Usage: xrpn [options]"
+
+  # Define the options, and what they do
+  opts.on('-f', '--file program', 'Specify the file to process')             { |f| $rfile = f  }
+  opts.on('-l', '--load program(s)', Array, 'File(s) to load, but not run')  { |l| $lfile = l  }
+  opts.on('-s', '--state STATE', 'Load a State file')                        { |s| $sfile = s  }
+  opts.on('-c', '--check program', 'Program file to check for errors')       { |c| check(c); exit }
+  opts.on('-x', '--X X-value', 'Set initial value in the X register')        { |x| @x = x.to_f }
+  opts.on('-y', '--Y Y-value', 'Set initial value in the Y register')        { |y| @y = y.to_f }
+  opts.on('-z', '--Z Z-value', 'Set initial value in the Z register')        { |z| @z = z.to_f }
+  opts.on('-t', '--T T-value', 'Set initial value in the T register')        { |t| @t = t.to_f }
+  opts.on('-a', '--Alpha Alpha-string', 'Set initial string in Alpha')       { |a| @a = a.to_s }
+  opts.on('-h', 'Display SHORT help text')                                   { puts opts; exit }
+  opts.on('--help', 'Display LONG help text')                     { help; puts; puts opts; exit}
+  opts.on('-v', '--version', 'Display the XRPN version number')              { xrpn_version; exit }
 end
+optparse.parse!
 
 # ENSURE DIRs
 Dir.mkdir(Dir.home + "/.xrpn") unless File.exist?(Dir.home + "/.xrpn")
@@ -24,6 +41,10 @@ end
 # INITIALIZE
 $theme = "dark"
 @x, @y, @z, @t, @a = 0, 0, 0, 0, ""
+begin
+  require 'xrpn'
+rescue LoadError
+end
 Dir[Dir.home+"/.xrpn/xlib/*"].each { |file| load file } # Read libraries
 read_cmd                                                # Read XRPN commands
 @p = XRPN.new($rfile)

data/lib/xrpn.rb

@@ -1,3 +1,2 @@
 Dir[__dir__ + "/../xlib/*"].each { |file| load file }
-@x, @y, @z, @t, @a = 0, 0, 0, 0, ""
-Dir[__dir__ + "/../xcmd/*"].each { |file| puts file; load file }
+Dir[__dir__ + "/../xcmd/*"].each { |file| load file }

data/xrpn.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.1.11'
+  s.version     = '1.1.13'
   s.licenses    = ['Unlicense']
   s.summary     = "XRPN - The eXtended RPN (Reverse Polish Notation) programming language"
   s.description = "A full programming language and environment extending the features of the venerable HP calculator programmable calculators. With XRPN you can accomplish a wide range of modern programming tasks as well as running existing HP-41 FOCAL programs directly. XRPN gives modern life to tens of thousands of old HP calculator programs and opens the possibilities to many, many more."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrpn
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -313,7 +313,6 @@ files:
 - xlib/locate_prg
 - xlib/numeric
 - xlib/numformat
-- xlib/optparse
 - xlib/read_cmd
 - xlib/read_state
 - xlib/save_state

data/xlib/optparse

@@ -1,23 +0,0 @@
-# Handle the command line options
-options = {}
-optparse = OptionParser.new do |opts|
-  # Set a banner, displayed at the top of the help screen.
-  opts.banner = "Usage: xrpn [options]"
-
-  # Define the options, and what they do
-  opts.on('-f', '--file program', 'Specify the file to process')             { |f| $rfile = f  }
-  opts.on('-l', '--load program(s)', Array, 'File(s) to load, but not run')  { |l| $lfile = l  }
-  opts.on('-s', '--state STATE', 'Load a State file')                        { |s| $sfile = s  }
-  opts.on('-c', '--check program', 'Program file to check for errors')       { |c| check(c); exit }
-  opts.on('-x', '--X X-value', 'Set initial value in the X register')        { |x| @x = x.to_f }
-  opts.on('-y', '--Y Y-value', 'Set initial value in the Y register')        { |y| @y = y.to_f }
-  opts.on('-z', '--Z Z-value', 'Set initial value in the Z register')        { |z| @z = z.to_f }
-  opts.on('-t', '--T T-value', 'Set initial value in the T register')        { |t| @t = t.to_f }
-  opts.on('-a', '--Alpha Alpha-string', 'Set initial string in Alpha')       { |a| @a = a.to_s }
-  opts.on('-h', 'Display SHORT help text')                                   { puts opts; exit }
-  opts.on('--help', 'Display LONG help text')                     { help; puts; puts opts; exit}
-  opts.on('-v', '--version', 'Display the XRPN version number')              { xrpn_version; exit }
-end
-optparse.parse!
- 
-# vim:ft=ruby: