pub_grub 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4199b218840d39743919d5befd111f71335aecd06d0f4f09dcc9ae168fc5f04d
-  data.tar.gz: 619cca849d88ab3173f2e71f37ff6acdd3be212d7d099c329de0685a102e85fd
+  metadata.gz: 468d7bf24cf059751c1de78456163c371a4b28427f5c91c1185ff50a2e991a04
+  data.tar.gz: 46a60ee9a399e4a6736cb729d5acbd6f03a23f392c7aad19070856277f191a9a
 SHA512:
-  metadata.gz: d17dc7b3fb90bf613053c5eeb92893468af588a46009c3c847aab45f629eb21871cbca9a3f2a7e525cc77ab14896ad0aec8d0faee786e71cb4b9f81202b759b3
-  data.tar.gz: b76ac52d2b0b8fcdce473c4233f2873c7bd88d6ada06a70b9c610500ec338ebef2f3eea8d3b2185203282ef3acff637c2ad81fd62dee6127a32fa800d545c68b
+  metadata.gz: 74ad2d2ea59a0f5fff3cf1121221d5c092f7056acb41eab9f2c3ac83399e7da3f7b3e0f3333486da68a381d707d9eb85e885621a87c68998220292a7701e43b5
+  data.tar.gz: a081e3c55d491310631d992360c1e63ca5c5afd66e7db954a86962b805ded63fa2c918c6fb6bcd37ffd36efb5fe6d8d4495e257e4ef82e692bdc44c1e4725043

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_grub (0.1.0)
+    pub_grub (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/pub_grub/failure_writer.rb

@@ -25,6 +25,7 @@ module PubGrub
 
         lead = number ? "(#{number}) " : ""
         lead = lead.ljust(padding)
+        message = message.gsub("\n", "\n" + " " * (padding + 2))
         "#{lead}#{message}"
       end.join("\n")
     end
@@ -55,7 +56,7 @@ module PubGrub
         if conflict_line && other_line
           write_line(
             incompatibility,
-            "Because #{cause.conflict} (#{conflict_line}) and #{cause.other} (#{other_line}), #{incompatibility}.",
+            "Because #{cause.conflict} (#{conflict_line})\nand #{cause.other} (#{other_line}),\n#{incompatibility}.",
             numbered: numbered
           )
         elsif conflict_line || other_line
@@ -66,7 +67,7 @@ module PubGrub
           visit(without_line);
           write_line(
             incompatibility,
-            "#{conjunction} because #{with_line} (#{line}), #{incompatibility}.",
+            "#{conjunction} because #{with_line} (#{line}),\n#{incompatibility}.",
             numbered: numbered
           )
         else
@@ -90,7 +91,7 @@ module PubGrub
 
             write_line(
               incompatibility,
-              "#{conjunction} because #{cause.conflict} (#{@line_numbers[cause.conflict]}), #{incompatibility}.",
+              "#{conjunction} because #{cause.conflict} (#{@line_numbers[cause.conflict]}),\n#{incompatibility}.",
               numbered: numbered
             )
           end
@@ -103,7 +104,7 @@ module PubGrub
         if derived_line
           write_line(
             incompatibility,
-            "Because #{ext} and #{derived} (#{derived_line}), #{incompatibility}.",
+            "Because #{ext}\nand #{derived} (#{derived_line}),\n#{incompatibility}.",
             numbered: numbered
           )
         elsif collapsible?(derived)
@@ -120,21 +121,21 @@ module PubGrub
 
           write_line(
             incompatibility,
-            "#{conjunction} because #{collapsed_ext} and #{ext}, #{incompatibility}.",
+            "#{conjunction} because #{collapsed_ext}\nand #{ext},\n#{incompatibility}.",
             numbered: numbered
           )
         else
           visit(derived)
           write_line(
             incompatibility,
-            "#{conjunction} because #{ext}, #{incompatibility}.",
+            "#{conjunction} because #{ext},\n#{incompatibility}.",
             numbered: numbered
           )
         end
       else
         write_line(
           incompatibility,
-          "Because #{cause.conflict} and #{cause.other}, #{incompatibility}.",
+          "Because #{cause.conflict}\nand #{cause.other},\n#{incompatibility}.",
           numbered: numbered
         )
       end

data/lib/pub_grub/solve_failure.rb

@@ -7,7 +7,11 @@ module PubGrub
     end
 
     def to_s
-      "\n" + FailureWriter.new(@incompatibility).write
+      "Could not find compatible versions\n\n#{explanation}"
+    end
+
+    def explanation
+      @explanation ||= FailureWriter.new(@incompatibility).write
     end
   end
 end

data/pub_grub.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "pub_grub"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["John Hawthorn"]
   spec.email         = ["john@hawthorn.email"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Hawthorn