From a8334295cd138b4fe91e832ee511632a19c66283 Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Thu, 14 Feb 2019 13:54:21 -0500 Subject: [PATCH 1/7] Develop branch changes --- CHANGELOG.md | 10 ++++++++++ lib/cisco_node_utils/version.rb | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0abf66b1..8a8eed0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ Changelog ========= +## Unreleased + +### Added + +### Changed + +### Removed + +### Issues Addressed + ## [v2.0.0] ### New Cisco Resources diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb index 67b249a6..043dfc65 100644 --- a/lib/cisco_node_utils/version.rb +++ b/lib/cisco_node_utils/version.rb @@ -14,7 +14,7 @@ # Container module for version number only. module CiscoNodeUtils - VERSION = '2.0.0' + VERSION = '2.0.0-dev' gem_version = Gem::Version.new(Gem::VERSION) min_gem_version = Gem::Version.new('2.1.0') fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version From 1ff0088d2cb9bb6e93b7130d4b7557b4cef8ee6e Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Mon, 8 Apr 2019 13:58:51 -0400 Subject: [PATCH 2/7] rescue facter packages check 'show install patches' command is not available in all environments; treating as a best effort check, returning empty hash on failure. --- lib/cisco_node_utils/platform.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/cisco_node_utils/platform.rb b/lib/cisco_node_utils/platform.rb index 2bf3f575..86d79dbf 100644 --- a/lib/cisco_node_utils/platform.rb +++ b/lib/cisco_node_utils/platform.rb @@ -35,10 +35,13 @@ def self.system_image # Ex: { 'n3000-uk9.6.0.2.U1.1.CSCaa12345.bin' => 'inactive committed', # 'n3000-uk9.6.0.2.U1.1.CSCaa12346.bin' => 'active', } def self.packages + pkg_hsh = {} pkgs = config_get('images', 'packages') return {} if pkgs.nil? - pkg_hsh = {} pkgs.each { |p| pkg_hsh[p[0]] = p[1].downcase } + rescue RuntimeError => e + # best effort + ensure pkg_hsh end From 4bcaba85a6c544f053650b4a80f4714365e97974 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Mon, 8 Apr 2019 14:18:08 -0400 Subject: [PATCH 3/7] raise unless /Invalid command/ --- lib/cisco_node_utils/platform.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cisco_node_utils/platform.rb b/lib/cisco_node_utils/platform.rb index 86d79dbf..9f81ab1b 100644 --- a/lib/cisco_node_utils/platform.rb +++ b/lib/cisco_node_utils/platform.rb @@ -40,7 +40,7 @@ def self.packages return {} if pkgs.nil? pkgs.each { |p| pkg_hsh[p[0]] = p[1].downcase } rescue RuntimeError => e - # best effort + raise unless e.message[/Invalid command/] ensure pkg_hsh end From a2390a8cc7b7d089232e39aba3f94e31c0074e01 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Mon, 8 Apr 2019 14:25:38 -0400 Subject: [PATCH 4/7] version number updates --- CHANGELOG.md | 1 + lib/cisco_node_utils/version.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a8eed0f..bba8619a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Changelog ### Removed ### Issues Addressed +* `facter` may raise when `show install patches` in some environments ## [v2.0.0] diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb index 043dfc65..783cab3c 100644 --- a/lib/cisco_node_utils/version.rb +++ b/lib/cisco_node_utils/version.rb @@ -14,7 +14,7 @@ # Container module for version number only. module CiscoNodeUtils - VERSION = '2.0.0-dev' + VERSION = '2.0.1-dev' gem_version = Gem::Version.new(Gem::VERSION) min_gem_version = Gem::Version.new('2.1.0') fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version From 6e0f4009b37fb437697f2b41edd6a993074b2295 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Mon, 8 Apr 2019 16:19:03 -0400 Subject: [PATCH 5/7] restore /2.0.1-dev/2.0.0-dev/ --- lib/cisco_node_utils/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb index 783cab3c..043dfc65 100644 --- a/lib/cisco_node_utils/version.rb +++ b/lib/cisco_node_utils/version.rb @@ -14,7 +14,7 @@ # Container module for version number only. module CiscoNodeUtils - VERSION = '2.0.1-dev' + VERSION = '2.0.0-dev' gem_version = Gem::Version.new(Gem::VERSION) min_gem_version = Gem::Version.new('2.1.0') fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version From 030c64d53c8c4d1d24c9ee265b5831cbb67c81a1 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Tue, 9 Apr 2019 07:04:12 -0400 Subject: [PATCH 6/7] travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 822d4ae3..847dcf0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,3 +12,6 @@ before_install: script: - bundle exec rake +env: + global: + - "BUNDLE_FORCE_RUBY_PLATFORM=1" From 066f9c5e860c3fff92615c5c21fa1f50f39ca0f8 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Tue, 9 Apr 2019 12:22:06 -0400 Subject: [PATCH 7/7] v2.0.1 --- CHANGELOG.md | 9 ++------- lib/cisco_node_utils/version.rb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bba8619a..100245a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,7 @@ Changelog ========= -## Unreleased - -### Added - -### Changed - -### Removed +## [v2.0.1] ### Issues Addressed * `facter` may raise when `show install patches` in some environments @@ -622,6 +616,7 @@ Cisco::Environment.add_env('default', env) [git-flow]: https://github.com/petervanderdoes/gitflow-avh [SimpleCov]: https://github.com/colszowka/simplecov +[v2.0.1]: https://github.com/cisco/cisco-network-node-utils/compare/v2.0.0...v2.0.1 [v2.0.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.10.0...v2.0.0 [v1.10.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.9.0...v1.10.0 [v1.9.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.8.0...v1.9.0 diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb index 043dfc65..daf644db 100644 --- a/lib/cisco_node_utils/version.rb +++ b/lib/cisco_node_utils/version.rb @@ -14,7 +14,7 @@ # Container module for version number only. module CiscoNodeUtils - VERSION = '2.0.0-dev' + VERSION = '2.0.1' gem_version = Gem::Version.new(Gem::VERSION) min_gem_version = Gem::Version.new('2.1.0') fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version