From 5b769577a2fc8eea2d020222a57b43996ac20b48 Mon Sep 17 00:00:00 2001 From: Michael Fross Date: Mon, 1 Feb 2021 11:44:48 -0600 Subject: [PATCH] Added GitHub lastest release check with -v option --- pom.xml | 4 ++-- snap/snapcraft.yaml | 10 +++++++--- src/main/java/org/fross/rpncalc/Help.java | 4 ++-- src/main/java/org/fross/rpncalc/Main.java | 9 ++++++--- src/main/java/org/fross/rpncalc/Math.java | 2 +- src/main/java/org/fross/rpncalc/Prefs.java | 2 +- src/main/java/org/fross/rpncalc/StackOps.java | 2 +- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index c77b1d9..4b375fa 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.fross rpncalc - 2.1.1 + 2.2.0 jar rpncalc @@ -181,7 +181,7 @@ org.fross library - 2020.12.23 + 2021.02.01 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d070e53..60d8b5c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: rpncalc -version: '2.1.1' +version: '2.2.0' summary: The command line Reverse Polish Notation (RPN) calculator description: | RPNCalc is an easy to use command line based Reverse Polish @@ -9,7 +9,7 @@ grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots base: core18 -# Enable faszter LZO compression +# Enable faster LZO compression compression: lzo apps: @@ -21,7 +21,7 @@ parts: plugin: maven source: https://github.com/frossm/library.git source-type: git - source-tag: 'v2020.12.23' + source-tag: 'v2021.02.01' maven-options: [install] rpncalc: @@ -30,3 +30,7 @@ parts: source-branch: master source-type: git after: [library] + +plugs: + rpncalc-network: + interface: network \ No newline at end of file diff --git a/src/main/java/org/fross/rpncalc/Help.java b/src/main/java/org/fross/rpncalc/Help.java index 1da8e5d..e0712db 100644 --- a/src/main/java/org/fross/rpncalc/Help.java +++ b/src/main/java/org/fross/rpncalc/Help.java @@ -3,7 +3,7 @@ * * RPNCalc is is an easy to use console based RPN calculator * - * Copyright (c) 2013-2020 Michael Fross + * Copyright (c) 2013-2021 Michael Fross * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -57,7 +57,7 @@ public static void Display() { Output.printColorln(Ansi.Color.WHITE, " -a [lrd] Alignment of numbers. (l)eft, (r)ight, or (d)ecmimal. Default: left"); Output.printColorln(Ansi.Color.WHITE, " -m num Set the number of memory slots. Default value is 10"); Output.printColorln(Ansi.Color.WHITE, " -w num Set Width of header / status line. Default is 70 characters"); - Output.printColorln(Ansi.Color.WHITE, " -v Display version information"); + Output.printColorln(Ansi.Color.WHITE, " -v Display version information as well as latest GitHub release"); Output.printColorln(Ansi.Color.WHITE, " -z Disable colorized output"); Output.printColorln(Ansi.Color.YELLOW, "\nOperands:"); diff --git a/src/main/java/org/fross/rpncalc/Main.java b/src/main/java/org/fross/rpncalc/Main.java index 1ad7619..5b672d0 100644 --- a/src/main/java/org/fross/rpncalc/Main.java +++ b/src/main/java/org/fross/rpncalc/Main.java @@ -3,7 +3,7 @@ * * RPNCalc is is an easy to use console based RPN calculator * - * Copyright (c) 2013-2020 Michael Fross + * Copyright (c) 2013-2021 Michael Fross * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,6 +34,7 @@ import org.fross.library.Debug; import org.fross.library.Format; +import org.fross.library.GitHub; import org.fross.library.Output; import org.fusesource.jansi.Ansi; @@ -163,9 +164,11 @@ public static void main(String[] args) { } break; - case 'v': // Version Display - Output.printColorln(Ansi.Color.YELLOW, "Version: v" + VERSION); + case 'v': // Display current program version and latest GitHub release + Output.printColorln(Ansi.Color.WHITE, "RPNCalc Version: v" + VERSION); Output.printColorln(Ansi.Color.CYAN, COPYRIGHT); + Output.printColorln(Ansi.Color.WHITE, "\nLatest Release on GitHub: " + GitHub.updateCheck("rpncalc")); + Output.printColorln(Ansi.Color.CYAN, "HomePage: https://github.com/frossm/rpncalc"); System.exit(0); break; diff --git a/src/main/java/org/fross/rpncalc/Math.java b/src/main/java/org/fross/rpncalc/Math.java index 725a905..3edd273 100644 --- a/src/main/java/org/fross/rpncalc/Math.java +++ b/src/main/java/org/fross/rpncalc/Math.java @@ -3,7 +3,7 @@ * * RPNCalc is is an easy to use console based RPN calculator * - * Copyright (c) 2013-2020 Michael Fross + * Copyright (c) 2013-2021 Michael Fross * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/org/fross/rpncalc/Prefs.java b/src/main/java/org/fross/rpncalc/Prefs.java index c67ee47..f7bc057 100644 --- a/src/main/java/org/fross/rpncalc/Prefs.java +++ b/src/main/java/org/fross/rpncalc/Prefs.java @@ -3,7 +3,7 @@ * * RPNCalc is is an easy to use console based RPN calculator * - * Copyright (c) 2013-2020 Michael Fross + * Copyright (c) 2013-2021 Michael Fross * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/org/fross/rpncalc/StackOps.java b/src/main/java/org/fross/rpncalc/StackOps.java index ac3ab9c..01ee899 100644 --- a/src/main/java/org/fross/rpncalc/StackOps.java +++ b/src/main/java/org/fross/rpncalc/StackOps.java @@ -3,7 +3,7 @@ * * RPNCalc is is an easy to use console based RPN calculator * - * Copyright (c) 2013-2020 Michael Fross + * Copyright (c) 2013-2021 Michael Fross * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal