hammer_cli 3.7.0 → 3.8.0

data/test/unit/apipie/option_definition_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper')
+require File.join(File.dirname(__FILE__), './test_helper')
 
 # require 'hammer_cli/options/option_definition'
 
@@ -8,17 +8,17 @@ describe HammerCLI::Apipie::OptionDefinition do
 
   describe "referenced resource" do
     it "should be nil by default" do
-      opt.referenced_resource.must_equal nil
+      assert_nil opt.referenced_resource
     end
 
     it "should set referenced resource" do
       @referenced_resource = "organization"
-      opt.referenced_resource.must_equal "organization"
+      _(opt.referenced_resource).must_equal "organization"
     end
 
     it "should convert referenced resource name to string" do
       @referenced_resource = :organization
-      opt.referenced_resource.must_equal "organization"
+      _(opt.referenced_resource).must_equal "organization"
     end
 
   end
@@ -27,7 +27,7 @@ describe HammerCLI::Apipie::OptionDefinition do
 
   describe "Option Description should be converted" do
     it "should be converted" do
-      opt2.description.must_equal "'OPT2'"
+      _(opt2.description).must_equal "'OPT2'"
     end
 
   end

data/test/unit/apipie/test_helper.rb

@@ -2,3 +2,6 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 require 'hammer_cli/testing/command_assertions'
 require 'hammer_cli/testing/output_matchers'
+
+include HammerCLI::Testing::OutputMatchers
+include HammerCLI::Testing::CommandAssertions

data/test/unit/bash_test.rb

@@ -33,105 +33,105 @@ describe HammerCLI::Bash::Completion do
 
     it 'returns options when no input given' do
       result = subject.complete('').sort
-      result.must_equal ['host ', '--interactive ', '--help ', '-h '].sort
+      _(result).must_equal ['host ', '--interactive ', '--help ', '-h '].sort
     end
 
     it 'returns filtered options when partial input is given' do
       result = subject.complete('-').sort
-      result.must_equal ['--help ', '-h ', '--interactive '].sort
+      _(result).must_equal ['--help ', '-h ', '--interactive '].sort
     end
 
     it 'returns filtered options when partial input is given' do
       result = subject.complete('host')
-      result.must_equal ['host ']
+      _(result).must_equal ['host ']
     end
 
     it 'returns options when subcommand is given' do
       result = subject.complete('host ').sort
-      result.must_equal ['create ', '--help ', '--dry '].sort
+      _(result).must_equal ['create ', '--help ', '--dry '].sort
     end
 
     it 'returns no options when subcommand is wrong' do
       result = subject.complete('unknown -h')
-      result.must_equal []
+      _(result).must_equal []
     end
 
     it 'returns no options when there are no other params allowed' do
       result = subject.complete('host create /tmp some /tmp extra')
-      result.must_equal []
+      _(result).must_equal []
     end
 
     it 'return hint for option-value pair without value' do
       result = subject.complete('host create -t ')
-      result.must_equal ['--->', 'Add option <value>']
+      _(result).must_equal ['--->', 'Add option <value>']
     end
 
     it 'return no options for option-value pair without complete value' do
       result = subject.complete('host create -t x')
-      result.must_equal []
+      _(result).must_equal []
     end
 
     # multiple options in one subcommand
     it 'allows mutiple options of the same subcommand' do
       result = subject.complete('host create --build --he')
-      result.must_equal ['--help ']
+      _(result).must_equal ['--help ']
     end
 
     # multiple options with values in one subcommand
     it 'allows mutiple options with values of the same subcommand' do
       result = subject.complete('host create -t value --he')
-      result.must_equal ['--help ']
+      _(result).must_equal ['--help ']
     end
 
     # subcommand after options
     it 'allows subcommand after options' do
       result = subject.complete('host --dry crea')
-      result.must_equal ['create ']
+      _(result).must_equal ['create ']
     end
 
     describe 'completion by type' do
       it 'completes :value' do
         result = subject.complete('host create -t ')
-        result.must_equal ['--->', 'Add option <value>']
+        _(result).must_equal ['--->', 'Add option <value>']
       end
 
       it 'completes :flag' do
         result = subject.complete('host --h')
-        result.must_equal ['--help ']
+        _(result).must_equal ['--help ']
       end
 
       it 'completes :schema' do
         result = subject.complete('host create --installed-products-attributes ')
-        result.must_equal ["--->", 'Add value by following schema: "product_id=string\,product_name=string\,arch=string\,version=string, ... "']
+        _(result).must_equal ["--->", 'Add value by following schema: "product_id=string\,product_name=string\,arch=string\,version=string, ... "']
       end
 
       it 'completes :enum' do
         result = subject.complete('host create --managed ')
-        result.must_equal ['yes ', 'no ']
+        _(result).must_equal ['yes ', 'no ']
       end
 
       it 'completes :multienum' do
         result = subject.complete('host create --volume ')
-        result.must_equal ['first', 'second', 'third']
+        _(result).must_equal ['first', 'second', 'third']
 
         result = subject.complete('host create --volume fir')
-        result.must_equal ['first']
+        _(result).must_equal ['first']
 
         result = subject.complete('host create --volume first,')
-        result.must_equal ['second', 'third']
+        _(result).must_equal ['second', 'third']
 
         result = subject.complete('host create --volume first,se')
-        result.must_equal ['first,second']
+        _(result).must_equal ['first,second']
       end
 
       it 'completes :list' do
         result = subject.complete('host create --config-group-ids ')
-        result.must_equal ['--->', 'Add comma-separated list of values']
+        _(result).must_equal ['--->', 'Add comma-separated list of values']
       end
 
       it 'completes :key_value_list' do
         result = subject.complete('host create --params ')
-        result.must_equal ['--->', 'Add comma-separated list of key=value']
+        _(result).must_equal ['--->', 'Add comma-separated list of key=value']
       end
     end
   end

data/test/unit/command_extensions_test.rb

@@ -57,68 +57,68 @@ describe HammerCLI::CommandExtensions do
     it 'should extend options only' do
       cmd.extend_with(CmdExtensions.new(only: :option))
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal true
-      cmd.output_definition.empty?.must_equal true
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal true
+      _(cmd.output_definition.empty?).must_equal true
     end
 
     it 'should extend output only' do
       cmd.extend_with(CmdExtensions.new(only: :output))
-      cmd.output_definition.empty?.must_equal false
+      _(cmd.output_definition.empty?).must_equal false
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal false
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal false
     end
 
     it 'should extend help only' do
       cmd.extend_with(CmdExtensions.new(only: :help))
-      cmd.new('', {}).help.must_match(/.*Section.*/)
-      cmd.new('', {}).help.must_match(/.*text.*/)
+      _(cmd.new('', {}).help).must_match(/.*Section.*/)
+      _(cmd.new('', {}).help).must_match(/.*text.*/)
     end
 
     it 'should extend params only' do
       cmd.extend_with(CmdExtensions.new(only: :request_params))
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal({})
-      cmd.new('', {}).extended_request[2].must_equal({})
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal({})
+      _(cmd.new('', {}).extended_request[2]).must_equal({})
     end
 
     it 'should extend headers only' do
       cmd.extend_with(CmdExtensions.new(only: :request_headers))
-      cmd.new('', {}).extended_request[0].must_equal({})
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal({})
+      _(cmd.new('', {}).extended_request[0]).must_equal({})
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal({})
     end
 
     it 'should extend options only' do
       cmd.extend_with(CmdExtensions.new(only: :request_options))
-      cmd.new('', {}).extended_request[0].must_equal({})
-      cmd.new('', {}).extended_request[1].must_equal({})
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(cmd.new('', {}).extended_request[0]).must_equal({})
+      _(cmd.new('', {}).extended_request[1]).must_equal({})
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend params and options and headers' do
       cmd.extend_with(CmdExtensions.new(only: :request))
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend data only' do
       cmd.extend_with(CmdExtensions.new(only: :data))
-      cmd.new('', {}).help.wont_match(/.*Section.*/)
-      cmd.new('', {}).help.wont_match(/.*text.*/)
-      cmd.output_definition.empty?.must_equal true
+      _(cmd.new('', {}).help).wont_match(/.*Section.*/)
+      _(cmd.new('', {}).help).wont_match(/.*text.*/)
+      _(cmd.output_definition.empty?).must_equal true
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal false
-      cmd.new('', {}).extended_request[0].must_equal({})
-      cmd.new('', {}).extended_request[1].must_equal({})
-      cmd.new('', {}).extended_request[2].must_equal({})
-      cmd.new('', {}).extended_data({}).must_equal('key' => 'value')
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal false
+      _(cmd.new('', {}).extended_request[0]).must_equal({})
+      _(cmd.new('', {}).extended_request[1]).must_equal({})
+      _(cmd.new('', {}).extended_request[2]).must_equal({})
+      _(cmd.new('', {}).extended_data({})).must_equal('key' => 'value')
     end
 
     it 'should extend option family only' do
       cmd.extend_with(CmdExtensions.new(only: :option_family))
-      cmd.output_definition.empty?.must_equal true
-      cmd.recognised_options.map(&:switches).flatten.must_equal ['-h', '--help', '--test-one', '--test-two']
+      _(cmd.output_definition.empty?).must_equal true
+      _(cmd.recognised_options.map(&:switches).flatten).must_equal ['-h', '--help', '--test-one', '--test-two']
     end
   end
 
@@ -126,80 +126,80 @@ describe HammerCLI::CommandExtensions do
     it 'should extend all except options' do
       cmd.extend_with(CmdExtensions.new(except: :option))
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal false
-      cmd.output_definition.empty?.must_equal false
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal false
+      _(cmd.output_definition.empty?).must_equal false
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend all except output' do
       cmd.extend_with(CmdExtensions.new(except: :output))
-      cmd.output_definition.empty?.must_equal true
+      _(cmd.output_definition.empty?).must_equal true
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal true
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal true
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend all except help' do
       cmd.extend_with(CmdExtensions.new(except: :help))
-      cmd.new('', {}).help.wont_match(/.*Section.*/)
-      cmd.new('', {}).help.wont_match(/.*text.*/)
-      cmd.output_definition.empty?.must_equal false
+      _(cmd.new('', {}).help).wont_match(/.*Section.*/)
+      _(cmd.new('', {}).help).wont_match(/.*text.*/)
+      _(cmd.output_definition.empty?).must_equal false
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal true
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal true
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend all except params' do
       cmd.extend_with(CmdExtensions.new(except: :request_params))
-      cmd.new('', {}).extended_request[0].must_equal({})
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(cmd.new('', {}).extended_request[0]).must_equal({})
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend all except headers' do
       cmd.extend_with(CmdExtensions.new(except: :request_headers))
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal({})
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal({})
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
     end
 
     it 'should extend all except options' do
       cmd.extend_with(CmdExtensions.new(except: :request_options))
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal({})
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal({})
     end
 
     it 'should extend all except params and options and headers' do
       cmd.extend_with(CmdExtensions.new(except: :request))
-      cmd.new('', {}).extended_request[0].must_equal({})
-      cmd.new('', {}).extended_request[1].must_equal({})
-      cmd.new('', {}).extended_request[2].must_equal({})
+      _(cmd.new('', {}).extended_request[0]).must_equal({})
+      _(cmd.new('', {}).extended_request[1]).must_equal({})
+      _(cmd.new('', {}).extended_request[2]).must_equal({})
     end
 
     it 'should extend all except data' do
       cmd.extend_with(CmdExtensions.new(except: :data))
-      cmd.new('', {}).help.must_match(/.*Section.*/)
-      cmd.new('', {}).help.must_match(/.*text.*/)
-      cmd.output_definition.empty?.must_equal false
+      _(cmd.new('', {}).help).must_match(/.*Section.*/)
+      _(cmd.new('', {}).help).must_match(/.*text.*/)
+      _(cmd.output_definition.empty?).must_equal false
       opt = cmd.find_option('--ext')
-      opt.is_a?(HammerCLI::Options::OptionDefinition).must_equal true
-      cmd.new('', {}).extended_request[0].must_equal(thin: true)
-      cmd.new('', {}).extended_request[1].must_equal(ssl: true)
-      cmd.new('', {}).extended_request[2].must_equal(with_authentication: true)
-      cmd.new('', {}).extended_data({}).must_equal({})
+      _(opt.is_a?(HammerCLI::Options::OptionDefinition)).must_equal true
+      _(cmd.new('', {}).extended_request[0]).must_equal(thin: true)
+      _(cmd.new('', {}).extended_request[1]).must_equal(ssl: true)
+      _(cmd.new('', {}).extended_request[2]).must_equal(with_authentication: true)
+      _(cmd.new('', {}).extended_data({})).must_equal({})
     end
 
     it 'should extend all except option family' do
       cmd.extend_with(CmdExtensions.new(except: :option_family))
-      cmd.output_definition.empty?.must_equal false
-      cmd.recognised_options.map(&:switches).flatten.must_equal ['--ext', '-h', '--help']
+      _(cmd.output_definition.empty?).must_equal false
+      _(cmd.recognised_options.map(&:switches).flatten).must_equal ['--ext', '-h', '--help']
     end
   end
 
@@ -209,7 +209,7 @@ describe HammerCLI::CommandExtensions do
       cmd.option_family associate: 'test' do
         child '--test-three', '', ''
       end
-      cmd.recognised_options.map(&:switches).flatten.must_equal ['-h', '--help', '--test-one', '--test-two', '--test-three']
+      _(cmd.recognised_options.map(&:switches).flatten).must_equal ['-h', '--help', '--test-one', '--test-two', '--test-three']
     end
   end
 end