hammer_cli 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28417298b7d1b18023350ab1f517ae82f6661b8883f9083fb767cc60aef2e95c
-  data.tar.gz: 9e877483c4e92d62cfb1fca2b0913d75abed07ab0e5af0340240b61b5a583182
+  metadata.gz: '03459f5b492392bd38648599988ac3dd88ef9ed540b3234d7eef0e1140d99cce'
+  data.tar.gz: '08b41fb045c47eba7838eca2216df4153c35bb690acdfb63ff59a3566acbc5fb'
 SHA512:
-  metadata.gz: 1999f20631b422871d571b2fa3fbeecc83c3220b319b092fbe201a0a6429ff478b189e427d2f4c736c08bac701304cce6673ddd999f91dfbecb636e080d4946f
-  data.tar.gz: ad2058c279f4f5cc2c7160dde467017508fe288ee30277a322ee1a433cae698d4808150d769ca15760cb9d7842003fa053f99d7d4843a1ed097cbc49e726c174
+  metadata.gz: 363bfe3e6fbd7bc14910e61672856393789d800ea5ffbfe1a9d4c9f3abc003701c68f39d4282a97bd2732da800b4f48e6ff081e878f32b14e90656afe21aea7d
+  data.tar.gz: 4a55983e8ddaf65825875b0b115bd2994ccf5a7126e1a4ddc88a6270e0b4a985e5f0c688cbc907e1d6eadd07596362ad6799741c1a25cf35eecbcf53354a3da1

data/doc/installation_deb.md

@@ -2,26 +2,29 @@
 
 #### Step 1: setup apt repositories
 
-For Foreman 1.3 stable the hammer packages are part of your installation repo and you can skip this step.
+Since Foreman 1.3 the hammer packages are part of your installation repo.
+It is only necessary to setup apt repositories if you are installing Hammer separatly from Foreman.
 
-You can choose from stable or nightly repo. Nightly has more recent version of hammer packages, but it was subject to less testing so there is a highr risk of issues.
+You can choose from a specific version or nightly repo.
+Nightly has more recent version of hammer packages that have only had limited testing so there is a higher risk of issues.
 
-Choose stable (don't forget to replace "squeeze" with version name of your system)
+Here are a few examples for combinations of Linux-distributions and Foreman releases.
+Remember to adjust these as necessary, visit http://deb.theforeman.org/ for up to date information.
 
-```bash
-echo "deb http://deb.theforeman.org/ squeeze stable" > /etc/apt/sources.list.d/foreman.list
-```
-
-or nightly
+##### Ubuntu Focal (20.04) with Foreman 3.10
 
 ```bash
-echo "deb http://deb.theforeman.org/ squeeze nightly" > /etc/apt/sources.list.d/foreman.list
+mkdir -p /etc/apt/keyrings
+wget -qO- https://deb.theforeman.org/foreman.asc > /etc/apt/keyrings/foreman.asc
+echo "deb [signed-by=/etc/apt/keyrings/foreman.asc] http://deb.theforeman.org/ focal 3.10" > /etc/apt/sources.list.d/foreman.list
 ```
 
-and update the keys
+##### Debian Bullseye (11) with Foreman nightly
 
 ```bash
-wget -q https://deb.theforeman.org/foreman.asc -O- | apt-key add -
+mkdir -p /etc/apt/keyrings
+wget -qO- https://deb.theforeman.org/foreman.asc > /etc/apt/keyrings/foreman.asc
+echo "deb [signed-by=/etc/apt/keyrings/foreman.asc] http://deb.theforeman.org/ bullseye nightly" > /etc/apt/sources.list.d/foreman.list
 ```
 
 #### Step 2: install hammer core
@@ -46,3 +49,4 @@ $ apt-get install ruby-hammer-cli-katello
 ```
 
 To install any other hammer plugin just make sure the appropriate gem is installed and follow with the [configuration](installation.md#configuration).
+

data/doc/release_notes.md

@@ -1,5 +1,12 @@
 Release notes
 =============
+### 3.12.0 (2024-08-14)
+* Log module loading warning to stderr ([PR #385](https://github.com/theforeman/hammer-cli/pull/385))
+* Make clear_cache safe if no completion file is set ([PR #386](https://github.com/theforeman/hammer-cli/pull/386))
+* Define correct timezone behavior in unittest, [#37579](http://projects.theforeman.org/issues/37579)
+* Update deb install instructions ([PR #383](https://github.com/theforeman/hammer-cli/pull/383))
+* Bump to 3.12.0-develop
+
 ### 3.11.0 (2024-05-22)
 * Bump to 3.11.0-develop
 

data/lib/hammer_cli/modules.rb

@@ -54,7 +54,7 @@ module HammerCLI
         require_module(name)
       rescue Exception => e
         logger.error "Error while loading module #{name}."
-        puts _("Warning: An error occured while loading module %s.") % name
+        $stderr.puts _("Warning: An error occurred while loading module %s.") % name
         # with ModuleLoadingError we assume the error is already logged by the issuer
         logger.error e unless e.is_a?(HammerCLI::ModuleLoadingError)
         raise e

data/lib/hammer_cli/utils.rb

@@ -55,8 +55,9 @@ module HammerCLI
   end
 
   def self.clear_cache
-    cache_file = File.expand_path(HammerCLI::Settings.get(:completion_cache_file))
-    File.delete(cache_file) if File.exist?(cache_file)
+    if (completion_file = HammerCLI::Settings.get(:completion_cache_file))
+      FileUtils.rm_f(File.expand_path(completion_file))
+    end
   end
 
   def self.interactive?

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new "3.11.0"
+    @version ||= Gem::Version.new "3.12.0"
   end
 end

data/test/unit/modules_test.rb

@@ -128,26 +128,25 @@ describe HammerCLI::Modules do
       before :each do
         HammerCLI::Modules.stubs(:require_module).raises(RuntimeError)
         @error_msg = "ERROR  Modules : Error while loading module hammer_cli_tom."
-        @warning_msg = "Warning: An error occured while loading module hammer_cli_tom."
+        @warning_msg = "Warning: An error occurred while loading module hammer_cli_tom."
       end
 
       it "must log an error if the load! fails" do
-        out, _ = capture_io do
+        assert_output("", "#{@warning_msg}\n") do
           assert_raises(RuntimeError) { HammerCLI::Modules.load!('hammer_cli_tom') }
         end
-        _(out).must_equal "#{@warning_msg}\n"
         _(@log_output.readline.strip).must_equal @error_msg
       end
 
       it "must log an error if the load fails" do
-        assert_output("#{@warning_msg}\n", "") do
+        assert_output("", "#{@warning_msg}\n") do
           HammerCLI::Modules.load("hammer_cli_tom")
         end
         _(@log_output.readline.strip).must_equal @error_msg
       end
 
       it "must return false when load fails" do
-        assert_output("#{@warning_msg}\n", "") do
+        assert_output("", "#{@warning_msg}\n") do
           _(HammerCLI::Modules.load("hammer_cli_tom")).must_equal false
         end
       end

data/test/unit/options/normalizers_test.rb

@@ -416,6 +416,16 @@ describe HammerCLI::Options::Normalizers do
 
   end
 
+  def mock_env(partial_env_hash)
+    old_env = ENV.to_hash
+    ENV.update partial_env_hash
+    begin
+      yield
+    ensure
+      ENV.replace old_env
+    end
+  end
+
   describe 'datetime' do
 
     let(:formatter) { HammerCLI::Options::Normalizers::DateTime.new }
@@ -429,15 +439,45 @@ describe HammerCLI::Options::Normalizers do
     end
 
     it "should accept and parse iso8601" do
-      _(formatter.format("1986-01-01T08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      mock_env("TZ" => "UTC") do
+        _(formatter.format("1986-01-01T08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      end
     end
 
     it "should accept and parse YYYY-MM-DD HH:MM:SS" do
-      _(formatter.format("1986-01-01 08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      mock_env("TZ" => "UTC") do
+        _(formatter.format("1986-01-01 08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      end
     end
 
     it "should accept and parse YYYY/MM/DD HH:MM:SS" do
-      _(formatter.format("1986/01/01 08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      mock_env("TZ" => "UTC") do
+        _(formatter.format("1986/01/01 08:30:20")).must_equal("1986-01-01T08:30:20+00:00")
+      end
+    end
+
+    it "should parse iso8601 compliant timezones" do
+      mock_env("TZ" => "UTC") do
+        _(formatter.format("1986-01-01 08:30:20 +04:00")).must_equal("1986-01-01T08:30:20+04:00")
+      end
+    end
+
+    it "should not parse non iso8601 formatted timezones" do
+      mock_env("TZ" => "Asia/Tokyo") do
+        _(formatter.format("1986-01-01 08:30:20 foo")).must_equal("1986-01-01T08:30:20+09:00")
+      end
+    end
+
+    it "should use system provided timezone" do
+      mock_env("TZ" => "Asia/Tokyo") do
+        _(formatter.format("1986-01-01 08:30:20")).must_equal("1986-01-01T08:30:20+09:00")
+      end
+    end
+
+    it "should overwrite default timezone" do
+      mock_env("TZ" => "Asia/Tokyo") do
+        _(formatter.format("1986-01-01 08:30:20 +04:00")).must_equal("1986-01-01T08:30:20+04:00")
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp