Vendor lib/molinillo (#663)

Commits the dependency code into this repository, as suggested in crystal-lang/crystal#15344 (comment). We're already doing the same in https://github.com/crystal-lang/crystal.

This simplifies the build process. All code required for building shards is contained in this repository (except for Crystal stdlib). There's no need to bootstrap the initial installation of the molinillo dependency anymore.

Author: straight-shoota

.gitignore

@@ -1,6 +1,5 @@
 /.crystal
 /.shards
-/lib
 /bin/shards
 /bin/shards.dwarf
 /bin/shards.exe

Makefile

@@ -46,9 +46,6 @@ BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/share/man
 INSTALL ?= /usr/bin/install
 
-MOLINILLO_VERSION = $(shell $(CRYSTAL) eval 'require "yaml"; puts YAML.parse(File.read("shard.lock"))["shards"]["molinillo"]["version"]')
-MOLINILLO_URL = "https://github.com/crystal-lang/crystal-molinillo/archive/v$(MOLINILLO_VERSION).tar.gz"
-
 # MSYS2 support (native Windows should use `Makefile.win` instead)
 ifeq ($(OS),Windows_NT)
   EXE := .exe
@@ -71,7 +68,7 @@ clean: ## Remove build artifacts
 clean: clean_docs
 	rm -f bin/shards$(EXE)
 
-bin/shards$(EXE): $(SOURCES) $(TEMPLATES) lib
+bin/shards$(EXE): $(SOURCES) $(TEMPLATES)
 	@mkdir -p bin
 	$(EXPORTS) $(CRYSTAL) build $(FLAGS) src/shards.cr -o "$@"
 
@@ -103,21 +100,14 @@ test: test_unit test_integration
 
 .PHONY: test_unit
 test_unit: ## Run unit tests
-test_unit: lib
+test_unit:
 	$(CRYSTAL) spec ./spec/unit/ $(if $(skip_fossil),--tag ~fossil) $(if $(skip_git),--tag ~git) $(if $(skip_hg),--tag ~hg)
 
 .PHONY: test_integration
 test_integration: ## Run integration tests
 test_integration: bin/shards$(EXE)
 	$(CRYSTAL) spec ./spec/integration/
 
-lib: shard.lock
-	mkdir -p lib/molinillo
-	$(SHARDS) install || (curl -L $(MOLINILLO_URL) | tar -xzf - -C lib/molinillo --strip-components=1)
-
-shard.lock: shard.yml
-	([ $(SHARDS) = false ] && touch $@) || $(SHARDS) update
-
 man/%.gz: man/%
 	gzip -c -9 $< > $@
 

Makefile.win

@@ -48,9 +48,6 @@ SHARDS_CONFIG_BUILD_COMMIT := $(shell git rev-parse --short HEAD)
 SOURCE_DATE_EPOCH := $(shell git show -s --format=%ct HEAD)
 export_vars = $(eval export SHARDS_CONFIG_BUILD_COMMIT SOURCE_DATE_EPOCH)
 
-MOLINILLO_VERSION = $(shell $(CRYSTAL) eval 'require "yaml"; puts YAML.parse(File.read("shard.lock"))["shards"]["molinillo"]["version"]')
-MOLINILLO_URL = "https://github.com/crystal-lang/crystal-molinillo/archive/v$(MOLINILLO_VERSION).tar.gz"
-
 prefix ?= $(or $(ProgramW6432),$(ProgramFiles))\crystal## Install path prefix
 BINDIR ?= $(prefix)
 
@@ -65,7 +62,7 @@ clean: ## Remove build artifacts
 clean:
 	$(call RM,"bin\shards.exe")
 
-bin\shards.exe: $(SOURCES) $(TEMPLATES) lib
+bin\shards.exe: $(SOURCES) $(TEMPLATES)
 	@$(call MKDIR,"bin")
 	$(call export_vars)
 	$(CRYSTAL) build $(FLAGS) -o bin\shards.exe src\shards.cr
@@ -89,21 +86,13 @@ test: test_unit test_integration
 
 .PHONY: test_unit
 test_unit: ## Run unit tests
-test_unit: lib
 	$(CRYSTAL) spec $(if $(skip_fossil),--tag ~fossil )$(if $(skip_git),--tag ~git )$(if $(skip_hg),--tag ~hg ).\spec\unit
 
 .PHONY: test_integration
 test_integration: ## Run integration tests
 test_integration: bin\shards.exe
 	$(CRYSTAL) spec .\spec\integration
 
-lib: shard.lock
-	$(call MKDIR,"lib\molinillo")
-	$(SHARDS) install || (curl -L $(MOLINILLO_URL) | tar -xzf - -C lib\molinillo --strip-components=1)
-
-shard.lock: shard.yml
-	if not "$(SHARDS)" == "false" $(SHARDS) update
-
 .PHONY: help
 help: ## Show this help
 	@setlocal EnableDelayedExpansion &\

README.md

@@ -67,13 +67,6 @@ These requirements are only necessary for compiling Shards.
   Please refer to <https://crystal-lang.org/install/> for
   instructions for your operating system.
 
-* `molinillo`
-
-  The shard `molinillo` needs to be in the Crystal path.
-  It is available at <https://github.com/crystal-lang/crystal-molinillo>
-  You can install it either with a pre-existing `shards` binary (running `shards install`)
-  or just check out the repository at `lib/crystal-molinillo` (`make lib`).
-
 * libyaml
 
   On Debian/Ubuntu Linux you may install the `libyaml-dev` package.
@@ -90,9 +83,7 @@ These requirements are only necessary for compiling Shards.
 ### Getting started
 
 It is strongly recommended to use `make` for building shards and developing it.
-The [`Makefile`](./Makefile) contains recipes for compiling and testing. Building
-with `make` also ensures the source dependency `molinillo` is installed. You don't
-need to take care of this yourself.
+The [`Makefile`](./Makefile) contains recipes for compiling and testing.
 
 Run `make bin/shards` to build the binary.
 * `release=1` for a release build (applies optimizations)

lib/.shards.info

@@ -0,0 +1,6 @@
+---
+version: 1.0
+shards:
+  molinillo:
+    git: https://github.com/crystal-lang/crystal-molinillo.git
+    version: 0.2.0

lib/molinillo/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.cr]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

lib/molinillo/.github/workflows/crystal.yml

@@ -0,0 +1,18 @@
+name: Crystal CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: crystallang/crystal
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: shards install
+    - name: Run tests
+      run: crystal spec

lib/molinillo/.gitignore

@@ -0,0 +1,9 @@
+/docs/
+/lib/
+/bin/
+/.shards/
+*.dwarf
+
+# Libraries don't need dependency lock
+# Dependencies will be locked in applications that use them
+/shard.lock

lib/molinillo/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "spec/fixture"]
+	path = spec/fixture
+	url = https://github.com/CocoaPods/Resolver-Integration-Specs

lib/molinillo/.travis.yml

@@ -0,0 +1,6 @@
+language: crystal
+
+# Uncomment the following if you'd like Travis to run specs and check code formatting
+# script:
+#   - crystal spec
+#   - crystal tool format --check