Merge pull request #327 from waj/feature/renamed-shards

Support shard renames

Author: waj

spec/integration/install_spec.cr

@@ -341,6 +341,66 @@ describe "install" do
     end
   end
 
+  it "test install old with version when shard was renamed" do
+    metadata = {
+      dependencies: {
+        old_name: {git: git_url(:renamed), version: "0.1.0"},
+      },
+    }
+    with_shard(metadata) do
+      run "shards install"
+      assert_installed "old_name", "0.1.0"
+    end
+  end
+
+  it "test install new when shard was renamed" do
+    metadata = {
+      dependencies: {
+        new_name: {git: git_url(:renamed)},
+      },
+    }
+    with_shard(metadata) do
+      run "shards install"
+      assert_installed "new_name", "0.2.0"
+    end
+  end
+
+  it "fail install old version when shard was renamed" do
+    metadata = {
+      dependencies: {
+        new_name: {git: git_url(:renamed), version: "0.1.0"},
+      },
+    }
+    with_shard(metadata) do
+      ex = expect_raises(FailedCommand) { run "shards install --no-color" }
+      ex.stdout.should contain("Error shard name (old_name) doesn't match dependency name (new_name)")
+    end
+  end
+
+  it "fail install new version when shard was renamed" do
+    metadata = {
+      dependencies: {
+        old_name: {git: git_url(:renamed), version: "0.2.0"},
+      },
+    }
+    with_shard(metadata) do
+      ex = expect_raises(FailedCommand) { run "shards install --no-color" }
+      ex.stdout.should contain("Error shard name (new_name) doesn't match dependency name (old_name)")
+    end
+  end
+
+  it "install untagged version when shard was renamed" do
+    metadata = {
+      dependencies: {
+        another_name: {git: git_url(:renamed), branch: "master"},
+      },
+    }
+    with_shard(metadata) do
+      run "shards install"
+      assert_installed "another_name", "0.3.0"
+    end
+  end
+
   it "installs executables at version" do
     metadata = {
       dependencies: {binary: "0.1.0"},

spec/integration/spec_helper.cr

@@ -61,6 +61,11 @@ private def setup_repositories
   create_file "version", "src/version.cr", %(module Version; STRING = "version @ 0.1.0"; end)
   create_git_release "version", "0.1.0"
 
+  create_git_repository "renamed"
+  create_git_release "renamed", "0.1.0", "name: old_name\nversion: 0.1.0"
+  create_git_release "renamed", "0.2.0", "name: new_name\nversion: 0.2.0"
+  create_git_version_commit "renamed", "0.3.0", "name: another_name\nversion: 0.3.0"
+
   create_git_repository "transitive"
   create_file "transitive", "src/version.cr", %(require "version"; puts Version::STRING)
   create_git_release "transitive", "0.2.0", <<-YAML

spec/support/factories.cr

@@ -28,7 +28,7 @@ def create_git_repository(project, *versions)
   versions.each { |version| create_git_release project, version }
 end
 
-def create_git_release(project, version, shard = true)
+def create_git_version_commit(project, version, shard = true)
   Dir.cd(git_path(project)) do
     if shard
       contents = shard.is_a?(String) ? shard : "name: #{project}\nversion: #{version}\n"
@@ -39,6 +39,10 @@ def create_git_release(project, version, shard = true)
     end
     create_git_commit project, "release: v#{version}"
   end
+end
+
+def create_git_release(project, version, shard = true)
+  create_git_version_commit(project, version, shard)
   create_git_tag(project, "v#{version}")
 end
 

src/molinillo_solver.cr

@@ -45,7 +45,12 @@ module Shards
 
       packages = [] of Package
       result.each do |v|
-        spec = v.payload.as(Spec) || raise "BUG: returned graph payload was not a Spec"
+        spec = v.payload.as?(Spec) || raise "BUG: returned graph payload was not a Spec"
+        v.requirements.each do |dependency|
+          unless dependency.name == spec.name
+            raise Error.new("Error shard name (#{spec.name}) doesn't match dependency name (#{dependency.name})")
+          end
+        end
         resolver = spec.resolver || raise "BUG: returned Spec has no resolver"
         version = spec.version
 
@@ -60,7 +65,11 @@ module Shards
       packages
     end
 
-    def name_for(dependency)
+    def name_for(spec : Shards::Spec)
+      spec.resolver.not_nil!.dependency.name
+    end
+
+    def name_for(dependency : Shards::Dependency)
       dependency.name
     end
 
@@ -74,9 +83,6 @@ module Shards
         result = versions.map do |version|
           @specs[{dependency.name, version}] ||= begin
             resolver.spec(version).tap do |spec|
-              unless dependency.name == spec.name
-                raise Error.new("Error shard name (#{spec.name}) doesn't match dependency name (#{dependency.name})")
-              end
               spec.version = version
             end
           end