Update check, list, outdated commands to work against source changes and overrides (#429)

* Fix check command to handle different sources

* Fix check command to handle overrides

* Add list command spec to handle source change and override

No need to check resolver or apply overrides in list command

* Update specs description

* Fix outdated command to handle different sources

* Fix outdated command to detect invalid lock

* Fix outdated command to handle overrides

Author: Brian J. Cardiff

spec/integration/check_spec.cr

@@ -75,4 +75,32 @@ describe "check" do
       run "shards check"
     end
   end
+
+  it "fails when another source was installed" do
+    with_shard({dependencies: {awesome: "0.1.0"}}) do
+      run "shards install"
+    end
+
+    with_shard({dependencies: {awesome: {git: git_url(:forked_awesome)}}}) do
+      ex = expect_raises(FailedCommand) { run "shards check --no-color" }
+      ex.stdout.should contain("Dependencies aren't satisfied")
+      ex.stderr.should be_empty
+    end
+  end
+
+  it "fails when override changes version to use" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+
+    with_shard(metadata) do
+      run "shards install"
+    end
+
+    override = {dependencies: {awesome: "0.2.0"}}
+
+    with_shard(metadata, nil, override) do
+      ex = expect_raises(FailedCommand) { run "shards check --no-color" }
+      ex.stdout.should contain("Dependencies aren't satisfied")
+      ex.stderr.should be_empty
+    end
+  end
 end

spec/integration/list_spec.cr

@@ -60,4 +60,32 @@ describe "list" do
       ex.stdout.should contain("Dependencies aren't satisfied. Install them with 'shards install'")
     end
   end
+
+  it "show previous installed dependency when source has changed" do
+    with_shard({dependencies: {awesome: "0.1.0"}}) do
+      run "shards install"
+    end
+
+    with_shard({dependencies: {awesome: {version: "0.2.0", git: git_url(:forked_awesome)}}}) do
+      stdout = run "shards list --tree"
+      stdout.should contain("  * awesome (0.1.0)")
+      stdout.should contain("    * d (0.2.0)")
+    end
+  end
+
+  it "show previous installed dependency when override is added" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+
+    with_shard(metadata) do
+      run "shards install"
+    end
+
+    override = {dependencies: {awesome: "0.2.0"}}
+
+    with_shard(metadata, nil, override) do
+      stdout = run "shards list --tree"
+      stdout.should contain("  * awesome (0.1.0)")
+      stdout.should contain("    * d (0.2.0)")
+    end
+  end
 end

spec/integration/outdated_spec.cr

@@ -1,7 +1,7 @@
 require "./spec_helper"
 
 describe "outdated" do
-  it "up_to_date" do
+  it "up to date" do
     with_shard({dependencies: {web: "*"}}) do
       run "shards install"
 
@@ -10,7 +10,7 @@ describe "outdated" do
     end
   end
 
-  it "not_latest_version" do
+  it "not latest version" do
     with_shard({dependencies: {orm: "*"}}, {orm: "0.3.1"}) do
       run "shards install"
 
@@ -20,7 +20,7 @@ describe "outdated" do
     end
   end
 
-  it "available_version_matching_pessimistic_operator" do
+  it "available version matching pessimistic operator" do
     with_shard({dependencies: {orm: "~> 0.3.0"}}, {orm: "0.3.1"}) do
       run "shards install"
 
@@ -30,7 +30,7 @@ describe "outdated" do
     end
   end
 
-  it "reports_new_prerelease" do
+  it "reports new prerelease" do
     with_shard({dependencies: {unstable: "0.3.0.alpha"}}) do
       run "shards install"
     end
@@ -41,7 +41,7 @@ describe "outdated" do
     end
   end
 
-  it "wont_report_prereleases_by_default" do
+  it "won't report prereleases by default" do
     with_shard({dependencies: {preview: "*"}}, {preview: "0.2.0"}) do
       run "shards install"
 
@@ -51,7 +51,7 @@ describe "outdated" do
     end
   end
 
-  it "reports_prereleases_when_asked" do
+  it "reports prereleases when asked" do
     with_shard({dependencies: {preview: "*"}}, {preview: "0.2.0"}) do
       run "shards install"
 
@@ -60,4 +60,82 @@ describe "outdated" do
       stdout.should contain("  * preview (installed: 0.2.0, available: 0.4.0.a)")
     end
   end
+
+  it "fails when source has changed" do
+    with_shard({dependencies: {awesome: "0.1.0"}}) do
+      run "shards install"
+    end
+
+    with_shard({dependencies: {awesome: {git: git_url(:forked_awesome)}}}) do
+      ex = expect_raises(FailedCommand) { run "shards outdated --no-color" }
+      ex.stdout.should contain("Outdated shard.lock (awesome source changed)")
+    end
+  end
+
+  it "fails when requirements would require an update" do
+    with_shard({dependencies: {awesome: "0.1.0"}}) do
+      run "shards install"
+    end
+
+    with_shard({dependencies: {awesome: "0.2.0"}}) do
+      ex = expect_raises(FailedCommand) { run "shards outdated --no-color" }
+      ex.stdout.should contain("Outdated shard.lock (awesome requirements changed)")
+    end
+  end
+
+  it "fails when requirements would require an update due to override" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+
+    with_shard(metadata) do
+      run "shards install"
+    end
+
+    override = {dependencies: {awesome: "0.2.0"}}
+
+    with_shard(metadata, nil, override) do
+      ex = expect_raises(FailedCommand) { run "shards outdated --no-color" }
+      ex.stdout.should contain("Outdated shard.lock (awesome requirements changed)")
+    end
+  end
+
+  it "not latest version in override (same source)" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+    lock = {awesome: "0.1.0"}
+    override = {dependencies: {awesome: "*"}}
+
+    with_shard(metadata, lock, override) do
+      run "shards install"
+
+      stdout = run "shards outdated --no-color"
+      stdout.should contain("W: Outdated dependencies:")
+      stdout.should contain("  * awesome (installed: 0.1.0, available: 0.3.0)")
+    end
+  end
+
+  it "not latest version in override (different source)" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+    lock = {awesome: {version: "0.1.0", git: git_url(:forked_awesome)}}
+    override = {dependencies: {awesome: {git: git_url(:forked_awesome)}}}
+
+    with_shard(metadata, lock, override) do
+      run "shards install"
+
+      stdout = run "shards outdated --no-color"
+      stdout.should contain("W: Outdated dependencies:")
+      stdout.should contain("  * awesome (installed: 0.1.0, available: 0.2.0)")
+    end
+  end
+
+  it "up to date in override" do
+    metadata = {dependencies: {awesome: "0.1.0"}}
+    lock = {awesome: {version: "0.2.0", git: git_url(:forked_awesome)}}
+    override = {dependencies: {awesome: {git: git_url(:forked_awesome)}}}
+
+    with_shard(metadata, lock, override) do
+      run "shards install"
+
+      stdout = run "shards outdated --no-color"
+      stdout.should contain("I: Dependencies are up to date!")
+    end
+  end
 end

src/commands/check.cr

@@ -19,7 +19,7 @@ module Shards
       end
 
       private def verify(dependencies)
-        dependencies.each do |dependency|
+        apply_overrides(dependencies).each do |dependency|
           Log.debug { "#{dependency.name}: checking..." }
 
           unless installed?(dependency)
@@ -34,7 +34,10 @@ module Shards
           return false
         end
 
-        if !dependency.matches?(lock.version)
+        if dependency.resolver != lock.resolver
+          Log.debug { "#{dependency.name}: source changed" }
+          return false
+        elsif !dependency.matches?(lock.version)
           Log.debug { "#{dependency.name}: lock conflict" }
           return false
         else
@@ -43,6 +46,16 @@ module Shards
           return true
         end
       end
+
+      # FIXME: duplicates MolinilloSolver#on_override
+      def on_override(dependency : Dependency) : Dependency?
+        override.try(&.dependencies.find { |o| o.name == dependency.name })
+      end
+
+      # FIXME: duplicates MolinilloSolver#apply_overrides
+      def apply_overrides(deps : Array(Dependency))
+        deps.map { |dep| on_override(dep) || dep }
+      end
     end
   end
 end

src/commands/outdated.cr

@@ -34,8 +34,17 @@ module Shards
           return
         end
 
+        if installed_dep.resolver != package.resolver
+          raise LockConflict.new("#{package.name} source changed")
+        end
+
         resolver = package.resolver
         installed = installed_dep.version
+        dependency = dependency_by_name package.name
+
+        if dependency && !dependency.matches?(installed)
+          raise LockConflict.new("#{package.name} requirements changed")
+        end
 
         # already the latest version?
         available_versions =
@@ -68,6 +77,12 @@ module Shards
       private def has_dependencies?
         spec.dependencies.any? || (!Shards.production? && spec.development_dependencies.any?)
       end
+
+      private def dependency_by_name(name : String)
+        override.try(&.dependencies.find { |o| o.name == name }) ||
+          spec.dependencies.find { |o| o.name == name } ||
+          spec.development_dependencies.find { |o| o.name == name }
+      end
     end
   end
 end