crystal-lang · straight-shoota · Mar 17, 2022 · Oct 28, 2021 · Oct 28, 2021 · Oct 28, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,10 +50,12 @@ jobs:
   test:
     docker:
       - image: crystallang/crystal:latest
+    environment:
+      USER: shardsuser
     steps:
       - run:
-          name: Install mercurial
-          command: apt-get update && apt-get install mercurial -y
+          name: Install mercurial and fossil
+          command: apt-get update && apt-get install mercurial fossil -y
       - shards-make-test
 
   test-on-osx:
@@ -63,17 +65,19 @@ jobs:
       - with-brew-cache:
           steps:
             - run:
-                name: Install Crystal and Mercurial
-                command: brew install crystal mercurial
+                name: Install Crystal, Mercurial, and Fossil
+                command: brew install crystal mercurial fossil
       - shards-make-test
 
   test-on-nightly:
     docker:
       - image: crystallang/crystal:nightly
+    environment:
+      USER: shardsuser
     steps:
       - run:
-          name: Install mercurial
-          command: apt-get update && apt-get install mercurial -y
+          name: Install mercurial and fossil
+          command: apt-get update && apt-get install mercurial fossil -y
       - shards-make-test
 
 workflows:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,22 @@ jobs:
         with:
           crystal: ${{ matrix.crystal }}
 
+      - name: Install Fossil
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install fossil
+
+      - name: Install Fossil
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          brew update
+          brew install fossil
+
+      - name: Install Fossil
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: choco install fossil
+
       - name: Download source
         uses: actions/checkout@v2
 

diff --git a/docs/shard.yml.adoc b/docs/shard.yml.adoc
@@ -335,6 +335,21 @@ required. When missing, Shards will install the _@_ bookmark or _tip_.
 +
 *Example:* _hg: https://hg.example.org/crystal-library_
 
+*fossil*::
+
+A https://www.fossil-scm.org[Fossil] repository URL (string).
++
+The URL may be https://fossil-scm.org/home/help/clone[any protocol]
+supported by Fossil, which includes SSH and HTTPS.
++
+The Fossil repository will be cloned, the list of versions (and associated
+_shard.yml_) will be extracted from Fossil tags (e.g., _v1.2.3_).
++
+One of the other attributes (_version_, _tag_, _branch_, or _commit_) is
+required. When missing, Shards will install _trunk_.
++
+*Example:* _fossil: https://fossil.example.org/crystal-library_
+
 *version*::
 A version requirement (string).
 +
@@ -357,14 +372,16 @@ the _~>_ operator has a special meaning, best shown by example:
 --
 
 *branch*::
-  Install the specified branch of a git dependency or the named branch
-  of a mercurial dependency (string).
+  Install the specified branch of a git dependency, or the named branch
+  of a mercurial or fossil dependency (string).
 
 *commit*::
-  Install the specified commit of a git or mercurial dependency (string).
+  Install the specified commit of a git, mercurial, or fossil dependency
+  (string).
 
 *tag*::
-  Install the specified tag of a git or mercurial dependency (string).
+  Install the specified tag of a git, mercurial, or fossil dependency
+  (string).
 
 *bookmark*::
   Install the specified bookmark of a mercurial dependency (string).

diff --git a/spec/support/factories.cr b/spec/support/factories.cr
@@ -164,6 +164,93 @@ def checkout_hg_rev(project, rev)
   end
 end
 
+def create_fossil_repository(project, *versions)
+  Dir.cd(tmp_path) do
+    run "fossil init #{Process.quote(project)}.fossil"
+
+    # Use a workaround so we don't use --workdir in case the specs are run on a
+    # machine with an old Fossil version.  See the #install_sources method in
+    # src/resolvers/fossil.cr
+    Dir.mkdir(fossil_path(project)) unless Dir.exists?(fossil_path(project))
+    Dir.cd(fossil_path(project)) do
+      run "fossil open #{Process.quote(File.join(tmp_path, project))}.fossil"
+    end
+  end
+
+  Dir.mkdir(File.join(fossil_path(project), "src"))
+  File.write(File.join(fossil_path(project), "src", "#{project}.cr"), "module #{project.capitalize}\nend")
+
+  Dir.cd(fossil_path(project)) do
+    run %|fossil add #{Process.quote("src/#{project}.cr")}|
+  end
+
+  versions.each { |version| create_fossil_release project, version, tag: "v#{version}" }
+end
+
+def create_fossil_release(project, version, shard : Bool | NamedTuple = true, tag : String? = nil)
+  create_fossil_version_commit(project, version, shard, tag)
+end
+
+def create_fossil_version_commit(project, version, shard : Bool | NamedTuple = true, tag : String? = nil)
+  Dir.cd(fossil_path(project)) do
+    if shard
+      contents = shard.is_a?(NamedTuple) ? shard : nil
+  
6DB6
    create_shard project, version, contents
+    end
+
+    name = shard[:name]? if shard.is_a?(NamedTuple)
+    name ||= project
+    File.touch "src/#{name}.cr"
+    run "fossil addremove"
+
+    create_fossil_commit project, "release: v#{version}", tag
+  end
+end
+
+def create_fossil_commit(project, message = "new commit", tag : String? = nil)
+  Dir.cd(fossil_path(project)) do
+    File.write("src/#{project}.cr", "# #{message}", mode: "a")
+    run "fossil addremove"
+
+    # Use --hash here to work around a file that's changed, but the size and
+    # mtime are the same.  Depending on the resolution of mtime on the
+    # underlying filesystem, shard.yml may fall into this edge case during
+    # testing.
+    #
+    # https://fossil-users.fossil-scm.narkive.com/9ybRAo1U/error-file-is-different-on-disk-compared-to-the-repository-during-commti
+    if tag
+      run "fossil commit --hash --tag #{Process.quote(tag)} -m #{Process.quote(message)}"
+    else
+      run "fossil commit --hash -m #{Process.quote(message)}"
+    end
+  end
+end
+
+def create_fork_fossil_repository(project, upstream)
+  Dir.cd(tmp_path) do
+    run "fossil clone #{Process.quote(fossil_url(upstream))} #{Process.quote(project)}"
+  end
+end
+
+def create_fossil_tag(project, version)
+  Dir.cd(fossil_path(project)) do
+    run "fossil tag add #{Process.quote(version)} current"
+  end
+end
+
+def checkout_new_fossil_branch(project, branch)
+  Dir.cd(fossil_path(project)) do
+    run "fossil branch new #{Process.quote(branch)} current"
+    run "fossil checkout branch"
+  end
+end
+
+def checkout_fossil_rev(project, rev)
+  Dir.cd(fossil_path(project)) do
+    run "fossil checkout #{Process.quote(rev)}"
+  end
+end
+
 def create_shard(project, version, contents : NamedTuple? = nil)
   spec = {name: project, version: version, crystal: Shards.crystal_version}
   spec = spec.merge(contents) if contents
@@ -214,6 +301,29 @@ def hg_path(project)
   File.join(tmp_path, project.to_s)
 end
 
+def fossil_commits(project, rev = "trunk")
+  # This is using the workaround code in case the machine running the specs is
+  # using an old Fossil version.  See the #commit_sha1_at method in
+  # src/resolvers/fossil.cr for info.
+  Dir.cd(fossil_path(project)) do
+    retStr = run("fossil timeline #{Process.quote(rev)} -t ci -W 0").strip.split('\n')
+    retLines = retStr.flat_map do |line|
+      /^.+ \[(.+)\].*/.match(line).try &.[1]
+    end
+
+    retLines.reject! &.nil?
+    [/artifact:\s+(.+)/.match(run("fossil whatis #{retLines[0]}")).not_nil!.[1]]
+  end
+end
+
+def fossil_url(project)
+  "file://#{Path[fossil_path(project)].to_posix}"
+end
+
+def fossil_path(project)
+  File.join(tmp_path, "#{project.to_s}")
+end
+
 def rel_path(project)
   "../../spec/.repositories/#{project}"
 end
@@ -252,6 +362,7 @@ def run(command, *, env = nil)
     # FIXME: Concurrent streams are currently broken on Windows. Need to drop one for now.
     error = nil
   {% end %}
+
   status = Process.run(command, shell: true, env: cmd_env, output: output, error: error || Process::Redirect::Close)
 
   output = output.to_s.gsub("\r\n", "\n")

diff --git a/spec/support/requirement.cr b/spec/support/requirement.cr
@@ -14,6 +14,10 @@ def hg_branch(name)
   Shards::HgBranchRef.new(name)
 end
 
+def fossil_branch(name)
+  Shards::FossilBranchRef.new(name)
+end
+
 def version(version)
   Shards::Version.new(version)
 end