Add handling of multi-line strings

Author: Kevin Paulisse

lib/octocatalog-diff/catalog-diff/display/text.rb

@@ -336,7 +336,7 @@ def self.diff_two_hashes_with_diffy(opts = {})
           strip_diff = opts.fetch(:strip_diff, false)
 
           # Special case: addition only, no truncation
-          return addition_only_no_truncation(depth, hash2, strip_diff) if hash1 == {} && limit.nil?
+          return addition_only_no_truncation(depth, hash2) if hash1 == {} && limit.nil?
 
           json_old = stringify_for_diffy(hash1)
           json_new = stringify_for_diffy(hash2)
@@ -360,22 +360,20 @@ def self.diff_two_hashes_with_diffy(opts = {})
         # Special case: addition only, no truncation
         # @param depth [Fixnum] Depth, for correct indentation
         # @param hash [Hash] Added object
-        # @param strip_diff [Boolean] Strip leading +/-/" "
         # @return [Array<String>] Displayable result
-        def self.addition_only_no_truncation(depth, hash, strip_diff)
-          plus = strip_diff ? '' : '+ '
+        def self.addition_only_no_truncation(depth, hash)
           result = []
 
           # Single line strings
           hash.keys.sort.map do |key|
             next if hash[key] =~ /\n/
-            result << left_pad(2 * depth + 2, [plus, key.inspect, ': ', hash[key].inspect].join('')).green
+            result << left_pad(2 * depth + 4, [key.inspect, ': ', hash[key].inspect].join('')).green
           end
 
           # Multi-line strings
           hash.keys.sort.map do |key|
             next if hash[key] !~ /\n/
-            result << left_pad(2 * depth + 2, [plus, key.inspect, ': >>>'].join('')).green
+            result << left_pad(2 * depth + 4, [key.inspect, ': >>>'].join('')).green
             result.concat hash[key].split(/\n/).map(&:green)
             result << '<<<'
           end

spec/octocatalog-diff/tests/catalog-diff/display/text_spec.rb

@@ -279,6 +279,49 @@
           end
         end
 
+        context 'with --no-truncate-details and a multi-line string' do
+          describe '#generate' do
+            before(:all) do
+              diff = [
+                [
+                  '+',
+                  'File[/tmp/foo]',
+                  {
+                    'type' => 'File',
+                    'title' => '/tmp/foo',
+                    'parameters' => {
+                      'mode' => '0644',
+                      'content' => "foo\nbar\nbaz",
+                      'owner' => 'root',
+                      'group' => 'wheel'
+                    }
+                  }
+                ]
+              ]
+              @result = OctocatalogDiff::CatalogDiff::Display::Text.generate(
+                diff,
+                display_detail_add: true,
+                color: false,
+                truncate_details: false
+              )
+            end
+
+            it 'should sort keys without newlines before keys with newlines' do
+              expect(@result[2]).to match(/^\s+"group": /)
+              expect(@result[3]).to match(/^\s+"mode": /)
+              expect(@result[4]).to match(/^\s+"owner": /)
+            end
+
+            it 'should display lines on their own' do
+              expect(@result[5]).to match(/^\s+"content": >>>/)
+              expect(@result[6]).to eq('foo')
+              expect(@result[7]).to eq('bar')
+              expect(@result[8]).to eq('baz')
+              expect(@result[9]).to eq('<<<')
+            end
+          end
+        end
+
         context 'without --no-truncate-details' do
           describe '#generate' do
             before(:all) do