hammer_cli 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf3be9933ac2bf33cd6a7bd3cd0f3d8fe3bf157
-  data.tar.gz: 3fd10d78572c35d887f0edc9b46d4382e4454006
+  metadata.gz: 3fdeba3063ee3ba211aabb8a6d57d17a70fb7f22
+  data.tar.gz: b085e64553cde11ebed24c0525e461bdcf9ee3e0
 SHA512:
-  metadata.gz: 3f18891b02bd45efcddf967b97bc74b58a277c28cfa8d0d22e4e339ecb9f876565e111cdc9bf670d4f122ae68cf858f398a067c75daf147b694de98573947b62
-  data.tar.gz: e9dee591bf84da08b467a36f155c97068951d9937e128fbb2d7b42d97af1fdd7f03040321daf5457472d66ddba55fb8677981e6180695ee130bfb1f20c32f8ce
+  metadata.gz: 9a706bd9e66688c5642575c9eea4d3d5963847eb93dcac2293b14a3d109d3d52582effa20dd9f69c51448a5497e1555ed769759c58ce9a84b1d70ea96711a2b1
+  data.tar.gz: 967e76b9ee2e0ed6f131b5dced17032bfe288f9e74ac7e831dc92865b0478ee2b5056a6edcae41064e97d0c36092932529bfa07d0fe6002514dde1e8a28ca0ee

data/bin/hammer

@@ -13,6 +13,7 @@ require 'hammer_cli/options/normalizers'
 # Option descriptions are never displayed and thus do not require translation.
 class PreParser < Clamp::Command
   option ['-v', '--[no-]verbose'], :flag, _('Be verbose (or not). True by default')
+  option ['--[no-]use-defaults'], :flag, _('Enable/disable stored defaults. Enabled by default')
   option ['-q', '--quiet'], :flag, _('Completely silent')
   option ["-d", "--debug"], :flag, "show debugging output"
   option ["-c", "--config"], "CFG_FILE", "path to custom config file" do |path|
@@ -92,6 +93,8 @@ HammerCLI::Settings.load({
     :ssl_with_basic_auth => preparser.ssl_with_basic_auth?
   }})
 
+HammerCLI::Settings.load({:use_defaults => preparser.use_defaults?}) unless preparser.use_defaults?.nil?
+
 if HammerCLI::Settings.get(:ui, :mark_translated)
   include HammerCLI::I18n::Debug
 end

data/config/cli_config.template.yml

@@ -32,6 +32,9 @@
 #   2 - data, messages, interactive I/O, progress bars. Equals to --verbose.
 :verbosity: 2
 
+# Enable/disable defaults. Preset default values for the options won't be used.
+#:use_defaults: true
+
 #:log_owner: 'foreman'
 #:log_group: 'foreman'
 

data/doc/release_notes.md

@@ -1,6 +1,10 @@
 Release notes
 =============
-### 0.14.0 (2018-10-24)
+### 0.15.1 (2018-11-06)
+* Helper for editing text in editor ([PR #294](https://github.com/theforeman/hammer-cli/pull/294)) ([#24489](http://projects.theforeman.org/issues/24489))
+* Add ability to disable defaults ([PR #293](https://github.com/theforeman/hammer-cli/pull/293)) ([#25307](http://projects.theforeman.org/issues/25307))
+
+### 0.15.0 (2018-10-24)
 * Correct the gemspec ([PR #286](https://github.com/theforeman/hammer-cli/pull/286))
 * Use the tty for the interactive output ([PR #289](https://github.com/theforeman/hammer-cli/pull/289)) ([#6935](http://projects.theforeman.org/issues/6935))
 * Remove legacy code for ruby < 2.0 ([#21359](http://projects.theforeman.org/issues/21359))

data/lib/hammer_cli/abstract.rb

@@ -245,10 +245,9 @@ module HammerCLI
 
 
     def option_sources
-      [
-        HammerCLI::Options::Sources::CommandLine.new(self),
-        HammerCLI::Options::Sources::SavedDefaults.new(context[:defaults], logger)
-      ]
+      sources = [HammerCLI::Options::Sources::CommandLine.new(self)]
+      sources << HammerCLI::Options::Sources::SavedDefaults.new(context[:defaults], logger) if context[:use_defaults]
+      sources
     end
 
     private

data/lib/hammer_cli/context.rb

@@ -7,6 +7,7 @@ module HammerCLI
       :is_tty? => HammerCLI.tty?,
       :api_connection => HammerCLI::Connection.new(Logging.logger['Connection']),
       :no_headers => HammerCLI::Settings.get(:ui, :no_headers),
+      :use_defaults => HammerCLI::Settings.get(:use_defaults),
       :capitalization => HammerCLI.capitalization,
       :verbosity => (HammerCLI::Settings.get(:verbosity) || HammerCLI::V_VERBOSE).to_i
     }

data/lib/hammer_cli/defaults.rb

@@ -9,7 +9,6 @@ module HammerCLI
     attr_reader :defaults_settings
 
     def initialize(settings, file_path = nil)
-
       @defaults_settings = settings || {}
       @path = file_path || DEFAULT_FILE
     end
@@ -100,8 +99,7 @@ module HammerCLI
   end
 
   def self.defaults
-    @defaults ||= Defaults.new(HammerCLI::Settings.settings[:defaults])
-
+    @defaults ||= Defaults.new(HammerCLI::Settings.get(:defaults))
   end
 
   HammerCLI::MainCommand.subcommand "defaults", _("Defaults management"), HammerCLI::DefaultsCommand

data/lib/hammer_cli/main.rb

@@ -10,6 +10,7 @@ module HammerCLI
     option ['-q', '--quiet'], :flag, _('Completely silent') do
       context[:verbosity] = HammerCLI::V_QUIET
     end
+    option ['--[no-]use-defaults'], :flag, _('Enable/disable stored defaults. Enabled by default')
     option ["-d", "--debug"], :flag, _("Show debugging output"), :context_target => :debug
     option ["-r", "--reload-cache"], :flag, _("Force reload of Apipie cache")
 

data/lib/hammer_cli/settings.rb

@@ -46,6 +46,11 @@ module HammerCLI
     end
 
     def self.clear
+      empty
+      load(default_settings)
+    end
+
+    def self.empty
       settings.clear
       path_history.clear
     end
@@ -59,9 +64,16 @@ module HammerCLI
       @path_history
     end
 
+    def self.default_settings
+      {
+        :use_defaults => true
+      }
+    end
+
     private
+
     def self.settings
-      @settings_hash ||= {}
+      @settings_hash ||= default_settings
       @settings_hash
     end
 

data/lib/hammer_cli/utils.rb

@@ -1,4 +1,5 @@
 require 'highline'
+require 'tempfile'
 
 class String
   def format(params)
@@ -84,4 +85,15 @@ module HammerCLI
   def self.interactive_output
     @interactive_output ||= HighLine.new($stdin, IO.new(IO.sysopen('/dev/tty', 'w'), 'w'))
   end
+
+  def self.open_in_editor(content, content_type: '', tempdir: '/tmp', suffix: '.tmp')
+    result = content
+    Tempfile.open([content_type, suffix], tempdir) do |f|
+      f.write(content)
+      f.rewind
+      system("#{ENV['EDITOR'] || 'vi'} #{f.path}")
+      result = f.read
+    end
+    result
+  end
 end

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.15.0'
+    @version ||= Gem::Version.new '0.15.1'
   end
 end

data/test/unit/abstract_test.rb

@@ -373,7 +373,8 @@ describe HammerCLI::AbstractCommand do
     before do
       @defaults = mock()
       @defaults.stubs(:get_defaults).returns(nil)
-      @cmd = TestDefaultsCmd.new("", { :defaults => @defaults })
+      @cmd = TestDefaultsCmd.new("", { :defaults => @defaults, :use_defaults => true })
+      @cmd_no_defaults = TestDefaultsCmd.new("", { :defaults => @defaults, :use_defaults => false })
     end
 
     it 'provides default value for an option flag' do
@@ -381,6 +382,11 @@ describe HammerCLI::AbstractCommand do
       assert_equal({'different_attr_name' => 2}, @cmd.options)
     end
 
+    it 'does not set default value if the defaults are disabled' do
+      @defaults.expects(:get_defaults).never()
+      assert_equal({}, @cmd_no_defaults.options)
+    end
+
     it 'prefers values from command line' do
       @defaults.stubs(:get_defaults).with('--test').returns(2)
       @cmd.run(['--test=1'])

data/test/unit/settings_test.rb

@@ -44,6 +44,7 @@ describe HammerCLI::Settings do
   end
 
   it "dumps all settings" do
+    settings.empty
     data = {:a => 1, :b => 2}
     settings.load(data)
     settings.dump.must_equal data
@@ -69,11 +70,23 @@ describe HammerCLI::Settings do
     settings.get(:x).size.must_equal 4
   end
 
-  it "clear wipes all settings" do
+  it "clear wipes all settings but default values" do
     settings.load({:a => 1, :b => 2})
     settings.clear
     settings.get(:a).must_be_nil
     settings.get(:b).must_be_nil
+    settings.default_settings.each { |key, val| settings.get(key).must_equal val }
+  end
+
+  it "empty wipes all settings including default values" do
+    settings.load({:a => 1, :b => 2})
+    settings.empty
+    settings.dump.must_equal({})
+  end
+
+  it "initializes settings with default settings" do
+    settings.instance_variable_set(:@settings_hash, nil)
+    settings.dump.must_equal settings.default_settings
   end
 
   context "load from paths" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp