Merge branch 'main' into GSOC

shard.lock

@@ -7,4 +7,3 @@ shards:
   version_from_shard:
     git: https://github.com/hugopl/version_from_shard.git
     version: 1.2.5
-

shards.nix

@@ -9,4 +9,4 @@
     rev = "v1.2.5";
     sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
   };
-}
+}

spec/repo_spec.cr

@@ -0,0 +1,37 @@
+require "./spec_helper"
+
+Spectator.describe Repo do
+  context "commit" do
+    let(:with_commit) {
+      <<-EOF
+      git: https://github.com/cadmiumcr/transliterator.git
+      version: 0.1.0+git.commit.46c4c14594057dbcfaf27e7e7c8c164d3f0ce3f1
+      EOF
+    }
+
+    let(:repo) {
+      Crystal2Nix::Repo.new(Crystal2Nix::Shard.from_yaml(with_commit))
+    }
+
+    it "should have the commit as revision" do
+      expect(repo.rev).to eq("46c4c14594057dbcfaf27e7e7c8c164d3f0ce3f1")
+    end
+  end
+
+  context "explicit version" do
+    let(:with_version) {
+      <<-EOF
+      git: https://github.com/crystal-lang/json_mapping.cr.git
+      version: 0.1.1
+      EOF
+    }
+
+    let(:repo) {
+      Crystal2Nix::Repo.new(Crystal2Nix::Shard.from_yaml(with_version))
+    }
+
+    it "should prefix version references with a v" do
+      expect(repo.rev).to eq("v0.1.1")
+    end
+  end
+end

src/crystal2nix.cr

@@ -10,4 +10,4 @@ require "./worker"
 
 module Crystal2Nix
   VersionFromShard.declare
-end
+end

src/data.cr

@@ -19,4 +19,4 @@ module Crystal2Nix
     property hg : String?
     property version : String
   end
-end
+end

src/repo.cr

@@ -29,4 +29,4 @@ module Crystal2Nix
       @url.to_s
     end
   end
-end
+end

src/worker.cr

@@ -91,4 +91,4 @@ module Crystal2Nix
       puts "Processing completed successfully."
     end
   end
-end
+end