hammer_cli 3.7.0 → 3.8.0

data/test/unit/output/adapter/table_test.rb

@@ -5,7 +5,7 @@ describe HammerCLI::Output::Adapter::Table do
   let(:adapter) { HammerCLI::Output::Adapter::Table.new }
 
   it "allows default pagination" do
-    adapter.paginate_by_default?.must_equal true
+    _(adapter.paginate_by_default?).must_equal true
   end
 
   context "print_collection" do
@@ -40,11 +40,11 @@ describe HammerCLI::Output::Adapter::Table do
     let(:empty_data) { HammerCLI::Output::RecordCollection.new [] }
 
     it "should print column name " do
-      proc { adapter.print_collection(fields, data) }.must_output(/.*NAME.*/, "")
+      _{ adapter.print_collection(fields, data) }.must_output(/.*NAME.*/, "")
     end
 
     it "should print field value" do
-      proc { adapter.print_collection(fields, data) }.must_output(/.*John Doe.*/, "")
+      _{ adapter.print_collection(fields, data) }.must_output(/.*John Doe.*/, "")
     end
 
     it "does not print fields which data are missing from api by default" do
@@ -58,7 +58,7 @@ describe HammerCLI::Output::Adapter::Table do
         ''
       ].join("\n")
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "prints fields which data are missing from api when field has hide_missing flag set to false" do
@@ -72,18 +72,18 @@ describe HammerCLI::Output::Adapter::Table do
         ''
       ].join("\n")
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     context "pagination" do
       it "should print pagination info if data are not complete" do
         data = HammerCLI::Output::RecordCollection.new([record], { :total => 2, :page => 1, :per_page => 1, :subtotal => 2 })
-        proc { adapter.print_collection(fields, data) }.must_output(/.*Page 1 of 2 (use --page and --per-page for navigation)*/, "")
+        _{ adapter.print_collection(fields, data) }.must_output(/.*Page 1 of 2 (use --page and --per-page for navigation)*/, "")
       end
 
       it "should print pagination info if data are complete" do
         data = HammerCLI::Output::RecordCollection.new([record], { :total => 1, :page => 1, :per_page => 1, :subtotal => 1 })
-        proc { adapter.print_collection(fields, data) }.must_output("--------\nNAME    \n--------\nJohn Doe\n--------\n", "")
+        _{ adapter.print_collection(fields, data) }.must_output("--------\nNAME    \n--------\nJohn Doe\n--------\n", "")
       end
     end
 
@@ -95,7 +95,7 @@ describe HammerCLI::Output::Adapter::Table do
 
       it "should ommit column of type Id by default" do
         out, _ = capture_io { adapter.print_collection(fields, data) }
-        out.wont_match(/.*ID.*/)
+        _(out).wont_match(/.*ID.*/)
       end
 
       it "should ommit column of type Id by default but no data" do
@@ -105,13 +105,13 @@ describe HammerCLI::Output::Adapter::Table do
                            "----",
                            ""
                           ].join("\n")
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
 
       it "should print column of type Id when --show-ids is set" do
         adapter = HammerCLI::Output::Adapter::Table.new( { :show_ids => true } )
         out, _ = capture_io { adapter.print_collection(fields, data) }
-        out.must_match(/.*ID.*/)
+        _(out).must_match(/.*ID.*/)
       end
 
       it "should print column of type ID when --show-ids is set but no data" do
@@ -122,19 +122,19 @@ describe HammerCLI::Output::Adapter::Table do
                            "",
                           ].join("\n")
         adapter = HammerCLI::Output::Adapter::Table.new( { :show_ids => true } )
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
     end
 
     context "handle headers" do
       it "should print headers by default" do
         out, _ = capture_io { adapter.print_collection(fields, data) }
-        out.must_match(/.*NAME.*/)
+        _(out).must_match(/.*NAME.*/)
       end
 
       it "should print headers by default even if there is no data" do
         out, _ = capture_io { adapter.print_collection(fields, empty_data) }
-        out.must_match(/.*NAME.*/)
+        _(out).must_match(/.*NAME.*/)
       end
 
       it "should print data only when --no-headers is set" do
@@ -143,13 +143,13 @@ describe HammerCLI::Output::Adapter::Table do
                            "",
                           ].join("\n")
         adapter = HammerCLI::Output::Adapter::Table.new( { :no_headers => true } )
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "should print nothing when --no-headers is set but no data" do
         expected_output = ""
         adapter = HammerCLI::Output::Adapter::Table.new( { :no_headers => true } )
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
     end
 
@@ -168,7 +168,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "calculates correct width of czech characters" do
@@ -184,7 +184,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "calculates correct width of colorized strings" do
@@ -200,7 +200,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n").gsub('John', "#{red}John#{reset}")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "truncates two-column characters when it exceeds maximum width" do
@@ -216,7 +216,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "truncates colorized string string when it exceeds maximum width" do
@@ -232,7 +232,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n").gsub('SomeVer', "#{red}SomeVer#{reset}")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "truncates string when it exceeds maximum width" do
@@ -248,7 +248,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "truncates string when it exceeds width" do
@@ -264,7 +264,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "sets width to the longest column name when no data" do
@@ -277,7 +277,7 @@ describe HammerCLI::Output::Adapter::Table do
                            "------------------------|---------",
                            ""
                           ].join("\n")
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
 
       it "sets certain width" do
@@ -293,7 +293,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "sets certain width when no data" do
@@ -307,7 +307,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
 
 
@@ -324,7 +324,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
       it "gives preference to width over maximal width when no data" do
@@ -338,7 +338,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection(fields, empty_data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, empty_data) }.must_output(expected_output)
       end
 
 
@@ -354,7 +354,7 @@ describe HammerCLI::Output::Adapter::Table do
 
         adapter = HammerCLI::Output::Adapter::Table.new({}, { :Field => [ DotFormatter.new ]})
         out, _ = capture_io { adapter.print_collection(fields, data) }
-        out.must_match(/.*-DOT-.*/)
+        _(out).must_match(/.*-DOT-.*/)
       end
 
       it "should not break formatting" do
@@ -375,7 +375,7 @@ describe HammerCLI::Output::Adapter::Table do
           ""
         ].join("\n")
 
-        proc { adapter.print_collection([field_long], data) }.must_output(expected_output)
+        _{ adapter.print_collection([field_long], data) }.must_output(expected_output)
       end
 
     end
@@ -401,9 +401,7 @@ describe HammerCLI::Output::Adapter::Table do
           "---|------------",
         ).join("\n") + "\n---|------------\n"
 
-        proc do
-          adapter.print_collection(fields, collection_data)
-        end.must_output(expected_output)
+        _{adapter.print_collection(fields, collection_data)}.must_output(expected_output)
       end
 
       it 'prints first chunk' do
@@ -417,11 +415,9 @@ describe HammerCLI::Output::Adapter::Table do
           "---|-----------",
         ).join("\n") + "\n"
 
-        proc do
-          adapter.print_collection(
-            fields, collection_data[0...10], current_chunk: :first
-          )
-        end.must_output(expected_output)
+        _{adapter.print_collection(
+          fields, collection_data[0...10], current_chunk: :first
+        )}.must_output(expected_output)
       end
 
       it 'prints another chunk' do
@@ -429,11 +425,9 @@ describe HammerCLI::Output::Adapter::Table do
           r << ["#{t} | John Doe #{t}"]
         end.flatten(1).join("\n") + "\n"
 
-        proc do
-          adapter.print_collection(
-            fields, collection_data[10...20], current_chunk: :another
-          )
-        end.must_output(expected_output)
+        _{adapter.print_collection(
+          fields, collection_data[10...20], current_chunk: :another
+        )}.must_output(expected_output)
       end
       #
       it 'prints last chunk' do
@@ -441,11 +435,9 @@ describe HammerCLI::Output::Adapter::Table do
           r << ["#{t} | John Doe #{t}"]
         end.flatten(1).join("\n") + "\n---|------------\n"
 
-        proc do
-          adapter.print_collection(
-            fields, collection_data[20...30], current_chunk: :last
-          )
-        end.must_output(expected_output)
+        _{adapter.print_collection(
+          fields, collection_data[20...30], current_chunk: :last
+        )}.must_output(expected_output)
       end
     end
 
@@ -458,7 +450,7 @@ describe HammerCLI::Output::Adapter::Table do
       it "should not print to stdout when --output-file is set" do
         fields = [field_firstname]
 
-        proc { adapter.print_collection(fields, data) }.must_output("")
+        _{ adapter.print_collection(fields, data) }.must_output("")
       end
 
       it "should print to file if --output-file is set" do
@@ -474,14 +466,14 @@ describe HammerCLI::Output::Adapter::Table do
 
         adapter.print_collection(fields, data)
         tempfile.close
-        IO.read(tempfile.path).must_equal(expected_output)
+        _(IO.read(tempfile.path)).must_equal(expected_output)
       end
 
     end
 
     context 'print_message' do
       it 'should print message with nil params' do
-        proc { adapter.print_message('MESSAGE', nil) }.must_output(/.*MESSAGE.*/, '')
+        _{ adapter.print_message('MESSAGE', nil) }.must_output(/.*MESSAGE.*/, '')
       end
     end
   end

data/test/unit/output/adapter/yaml_test.rb

@@ -6,7 +6,7 @@ describe HammerCLI::Output::Adapter::Yaml do
   let(:adapter) { HammerCLI::Output::Adapter::Yaml.new(context, HammerCLI::Output::Output.formatters) }
 
   it "forbids default pagination" do
-    adapter.paginate_by_default?.must_equal false
+    _(adapter.paginate_by_default?).must_equal false
   end
 
   context "print_message" do
@@ -19,7 +19,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         ''
       ].join("\n")
 
-      proc { adapter.print_message(msg, params) }.must_output(expected_output)
+      _{ adapter.print_message(msg, params) }.must_output(expected_output)
     end
 
     it "prints the message with name and id" do
@@ -33,7 +33,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         ''
       ].join("\n")
 
-      proc { adapter.print_message(msg, params) }.must_output(expected_output)
+      _{ adapter.print_message(msg, params) }.must_output(expected_output)
     end
 
     it 'prints the message with nil params' do
@@ -44,14 +44,14 @@ describe HammerCLI::Output::Adapter::Yaml do
         ':message: MESSAGE',
         ''
       ].join("\n")
-      proc { adapter.print_message(msg, params) }.must_output(expected_output)
+      _{ adapter.print_message(msg, params) }.must_output(expected_output)
     end
   end
 
   context "print_collection" do
 
     let(:id)            { Fields::Id.new(:path => [:id], :label => "Id") }
-    let(:name)          { Fields::Field.new(:path => [:name], :label => "Name") }
+    let(:firstname)     { Fields::Field.new(:path => [:name], :label => "Name") }
     let(:unlabeled)     { Fields::Field.new(:path => [:name]) }
     let(:surname)       { Fields::Field.new(:path => [:surname], :label => "Surname") }
     let(:address_city)  { Fields::Field.new(:path => [:address, :city], :label => "City") }
@@ -106,15 +106,15 @@ describe HammerCLI::Output::Adapter::Yaml do
     }]}
 
     it "should print one field" do
-      fields = [name]
+      fields = [firstname]
       expected_output = YAML.dump([{ 'Name' => 'John' }])
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should field with nested data" do
       fields = [address_city]
       expected_output = YAML.dump([{ 'City' => 'New York' }])
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print labeled fields" do
@@ -126,7 +126,7 @@ describe HammerCLI::Output::Adapter::Yaml do
                 }
               }]
       expected_output = YAML.dump(hash)
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print collection" do
@@ -146,7 +146,7 @@ describe HammerCLI::Output::Adapter::Yaml do
               }]
 
       expected_output = YAML.dump(hash)
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print collection with one element" do
@@ -162,7 +162,7 @@ describe HammerCLI::Output::Adapter::Yaml do
               }]
 
       expected_output = YAML.dump(hash)
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print unnumbered collection" do
@@ -181,7 +181,7 @@ describe HammerCLI::Output::Adapter::Yaml do
               }]
 
       expected_output = YAML.dump(hash)
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print unnumbered collection with one element" do
@@ -196,24 +196,24 @@ describe HammerCLI::Output::Adapter::Yaml do
               }]
 
       expected_output = YAML.dump(hash)
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
 
     it "hides ids by default" do
-      fields = [id, name]
+      fields = [id, firstname]
       hash = [{'Name' => 'John'}]
       expected_output = YAML.dump(hash)
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "skips blank values" do
-      fields = [name, blank]
+      fields = [firstname, blank]
       hash = [{'Name' => 'John'}]
       expected_output = YAML.dump(hash)
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "does not print fields which data are missing from api by default" do
@@ -221,7 +221,7 @@ describe HammerCLI::Output::Adapter::Yaml do
       hash = [{ 'Surname' => 'Doe' }]
       expected_output = YAML.dump(hash)
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "prints fields which data are missing from api when field has hide_missing flag set to false" do
@@ -229,7 +229,7 @@ describe HammerCLI::Output::Adapter::Yaml do
       hash = [{ 'Surname' => 'Doe', 'Missing' => HammerCLI::Output::DataMissing.new }]
       expected_output = YAML.dump(hash)
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     it "should print key -> value" do
@@ -250,11 +250,11 @@ describe HammerCLI::Output::Adapter::Yaml do
               }]
       expected_output = YAML.dump(hash)
 
-      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+      _{ adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
     context 'capitalization' do
-      let(:fields)   { [name, surname] }
+      let(:fields)   { [firstname, surname] }
       let(:raw_hash) { { 'Name' => 'John', 'Surname' => 'Doe' } }
       let(:settings) { HammerCLI::Settings }
       let(:context) { { :capitalization => HammerCLI.capitalization } }
@@ -266,7 +266,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, = capture_io do
           adapter.print_collection(fields, data)
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'should respect selected capitalize capitalization' do
@@ -276,7 +276,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, = capture_io do
           adapter.print_collection(fields, data)
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'should respect selected upcase capitalization' do
@@ -286,7 +286,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, = capture_io do
           adapter.print_collection(fields, data)
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'should print a warn for not supported capitalization' do
@@ -297,8 +297,8 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, err = capture_io do
           adapter.print_collection(fields, data)
         end
-        out.must_equal(expected_output)
-        err.must_equal(expected_error)
+        _(out).must_equal(expected_output)
+        _(err).must_equal(expected_error)
       end
 
       it "shouldn't change capitalization if wasn't selected" do
@@ -308,7 +308,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, = capture_io do
           adapter.print_collection(fields, data)
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
     end
 
@@ -326,7 +326,7 @@ describe HammerCLI::Output::Adapter::Yaml do
       let(:collection_data) do
         HammerCLI::Output::RecordCollection.new(collection)
       end
-      let(:fields) { [id, name] }
+      let(:fields) { [id, firstname] }
 
       it 'prints single chunk' do
         expected_output = YAML.dump(prepared_collection)
@@ -334,7 +334,7 @@ describe HammerCLI::Output::Adapter::Yaml do
         out, _err = capture_io do
           adapter.print_collection(fields, collection_data)
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'prints first chunk' do
@@ -345,7 +345,7 @@ describe HammerCLI::Output::Adapter::Yaml do
             fields, collection_data[0...10], current_chunk: :first
           )
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'prints another chunk' do
@@ -356,7 +356,7 @@ describe HammerCLI::Output::Adapter::Yaml do
             fields, collection_data[10...20], current_chunk: :another
           )
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
 
       it 'prints last chunk' do
@@ -367,7 +367,7 @@ describe HammerCLI::Output::Adapter::Yaml do
             fields, collection_data[20...30], current_chunk: :last
           )
         end
-        out.must_equal(expected_output)
+        _(out).must_equal(expected_output)
       end
     end
 
@@ -376,13 +376,13 @@ describe HammerCLI::Output::Adapter::Yaml do
       let(:context) { {:show_ids => true} }
 
       it "shows ids if it's required in the context" do
-        fields = [id, name]
+        fields = [id, firstname]
         hash = [{
                   'Id' => 112,
                   'Name' => 'John'
                 }]
         expected_output = YAML.dump(hash)
-        proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+        _{ adapter.print_collection(fields, data) }.must_output(expected_output)
       end
 
     end
@@ -393,13 +393,13 @@ describe HammerCLI::Output::Adapter::Yaml do
       let(:context) { {:output_file => tempfile} }
 
       it "should not print to stdout when --output-file is set" do
-        fields = [name]
+        fields = [firstname]
 
-        proc { adapter.print_collection(fields, data) }.must_output("")
+        _{ adapter.print_collection(fields, data) }.must_output("")
       end
 
       it "should print to file if --output-file is set" do
-        fields = [name]
+        fields = [firstname]
         hash = [{
                   'Name' => 'John'
                 }]
@@ -407,7 +407,7 @@ describe HammerCLI::Output::Adapter::Yaml do
 
         adapter.print_collection(fields, data)
         tempfile.close
-        IO.read(tempfile.path).must_equal(expected_output)
+        _(IO.read(tempfile.path)).must_equal(expected_output)
       end
 
     end