Use Molinillo to resolve dependencies (#322)

Author: waj

.circleci/config.yml

@@ -11,8 +11,8 @@ dry:
   steps: &steps
     - run: *prepare
     - checkout
-    - run: make
     - run: shards install
+    - run: make
     - run: make test
 
 jobs:
@@ -34,7 +34,7 @@ workflows:
   nightly:
     triggers:
       - schedule:
-          cron: "0 2 * * *"
+          cron: '0 2 * * *'
           filters:
             branches:
               only:

.gitignore

@@ -2,6 +2,7 @@
 /.shards
 /lib
 /bin/shards
+/bin/shards.dwarf
 /test/.repositories
 /test/.shards
 /test/.lib

Makefile

@@ -2,7 +2,7 @@
 
 CRYSTAL = crystal
 CRFLAGS =
-SOURCES = src/*.cr src/**/*.cr
+SOURCES = src/*.cr src/**/*.cr lib/molinillo/**/*.cr
 TEMPLATES = src/templates/*.ecr
 
 DESTDIR =

shard.lock

@@ -4,3 +4,7 @@ shards:
     github: ysbaddaden/minitest.cr
     version: 0.5.0
 
+  molinillo:
+    github: crystal-lang/crystal-molinillo
+    commit: 00fbe6c5ef9492d56cc7ec7b9a8b9cf2fe1a36ea
+

shard.yml

@@ -4,6 +4,10 @@ version: 0.9.0
 authors:
   - Julien Portalier <julien@portalier.com>
 
+dependencies:
+  molinillo:
+    github: crystal-lang/crystal-molinillo
+
 development_dependencies:
   minitest:
     github: ysbaddaden/minitest.cr

src/commands/command.cr

@@ -55,5 +55,12 @@ module Shards
       Shards.logger.info { "Writing #{LOCK_FILENAME}" }
       Shards::Lock.write(packages, LOCK_FILENAME)
     end
+
+    def handle_resolver_errors
+      yield
+    rescue e : Molinillo::ResolverError
+      Shards.logger.error e.message
+      raise Shards::Error.new("Failed to resolve dependencies")
+    end
   end
 end

src/commands/install.cr

@@ -1,13 +1,13 @@
 require "./command"
-require "../solver"
+require "../molinillo_solver"
 
 module Shards
   module Commands
     class Install < Command
       def run
         Shards.logger.info { "Resolving dependencies" }
 
-        solver = Solver.new(spec)
+        solver = MolinilloSolver.new(spec)
 
         if lockfile?
           # install must be as conservative as possible:
@@ -16,23 +16,17 @@ module Shards
 
         solver.prepare(development: !Shards.production?)
 
-        if packages = solver.solve
-          return if packages.empty?
+        packages = handle_resolver_errors { solver.solve }
+        return if packages.empty?
 
-          if lockfile?
-            validate(packages)
-          end
+        if lockfile?
+          validate(packages)
+        end
 
-          install(packages)
+        install(packages)
 
-          if generate_lockfile?(packages)
-            write_lockfile(packages)
-          end
-        else
-          solver.each_conflict do |message|
-            Shards.logger.warn { "Conflict #{message}" }
-          end
-          raise Shards::Error.new("Failed to resolve dependencies")
+        if generate_lockfile?(packages)
+          write_lockfile(packages)
         end
       end
 

src/commands/lock.cr

@@ -1,13 +1,13 @@
 require "./command"
-require "../solver"
+require "../molinillo_solver"
 
 module Shards
   module Commands
     class Lock < Command
       def run(shards : Array(String), print = false, update = false)
         Shards.logger.info { "Resolving dependencies" }
 
-        solver = Solver.new(spec)
+        solver = MolinilloSolver.new(spec)
 
         if lockfile?
           if update
@@ -24,19 +24,13 @@ module Shards
 
         solver.prepare(development: !Shards.production?)
 
-        if packages = solver.solve
-          return if packages.empty?
+        packages = handle_resolver_errors { solver.solve }
+        return if packages.empty?
 
-          if print
-            Shards::Lock.write(packages, STDOUT)
-          else
-            write_lockfile(packages)
-          end
+        if print
+          Shards::Lock.write(packages, STDOUT)
         else
-          solver.each_conflict do |message|
-            Shards.logger.warn { "Conflict #{message}" }
-          end
-          raise Shards::Error.new("Failed to resolve dependencies")
+          write_lockfile(packages)
         end
       end
 

src/commands/outdated.cr

@@ -13,24 +13,18 @@ module Shards
 
         Shards.logger.info { "Resolving dependencies" }
 
-        solver = Solver.new(spec, @prereleases)
+        solver = MolinilloSolver.new(spec, @prereleases)
         solver.prepare(development: !Shards.production?)
 
-        if packages = solver.solve
-          packages.each { |package| analyze(package) }
+        packages = handle_resolver_errors { solver.solve }
+        packages.each { |package| analyze(package) }
 
-          if @up_to_date
-            Shards.logger.info "Dependencies are up to date!"
-          else
-            @output.rewind
-            Shards.logger.warn "Outdated dependencies:"
-            puts @output.to_s
-          end
+        if @up_to_date
+          Shards.logger.info "Dependencies are up to date!"
         else
-          solver.each_conflict do |message|
-            Shards.logger.warn { "Conflict #{message}" }
-          end
-          raise Shards::Error.new("Failed to resolve dependencies")
+          @output.rewind
+          Shards.logger.warn "Outdated dependencies:"
+          puts @output.to_s
         end
       end
 

src/commands/update.cr

@@ -1,13 +1,13 @@
 require "./command"
-require "../solver"
+require "../molinillo_solver"
 
 module Shards
   module Commands
     class Update < Command
       def run(shards : Array(String))
         Shards.logger.info { "Resolving dependencies" }
 
-        solver = Solver.new(spec)
+        solver = MolinilloSolver.new(spec)
 
         if lockfile? && !shards.empty?
           # update selected dependencies to latest possible versions, but
@@ -17,17 +17,11 @@ module Shards
 
         solver.prepare(development: !Shards.production?)
 
-        if packages = solver.solve
-          install(packages)
-
-          if generate_lockfile?(packages)
-            write_lockfile(packages)
-          end
-        else
-          solver.each_conflict do |message|
-            Shards.logger.warn { "Conflict #{message}" }
-          end
-          raise Shards::Error.new("Failed to resolve dependencies")
+        packages = handle_resolver_errors { solver.solve }
+        install(packages)
+
+        if generate_lockfile?(packages)
+          write_lockfile(packages)
         end
       end