Merge remote-tracking branch 'origin/master' into react-document-colors

cucumber · Mar 6, 2021 · c8d8e3b · c8d8e3b
2 parents c4cddac + b90e447
commit c8d8e3b
Show file tree

Hide file tree

Showing 66 changed files with 91 additions and 8,460 deletions.
diff --git a/.templates/elixir/.gitignore b/.templates/elixir/.gitignore
@@ -28,3 +28,5 @@ erl_crash.dump
 
 .deps
 .tested
+.compile_messages
+.setup_mix_and_get_dependencies
diff --git a/gherkin/elixir/.gitignore b/gherkin/elixir/.gitignore
@@ -28,3 +28,5 @@ erl_crash.dump
 
 .deps
 .tested
+.compile_messages
+.setup_mix_and_get_dependencies
diff --git a/messages/CHANGELOG.md b/messages/CHANGELOG.md
@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+* [Elixir] Make sure messages.proto is updated with ../messages.proto
+* [Elixir] Generated new message modules based on the new messages.proto file
+
 ## [14.0.1] - 2021-02-08
 
 ### Fixed

diff --git a/messages/elixir/.gitignore b/messages/elixir/.gitignore
@@ -28,3 +28,5 @@ erl_crash.dump
 
 .deps
 .tested
+.compile_messages
+.setup_mix_and_get_dependencies
diff --git a/messages/elixir/.rsync b/messages/elixir/.rsync
@@ -1,3 +1,4 @@
 ../../LICENSE LICENSE
 ../../.templates/github/ .github/
 ../../.templates/elixir/ .
+../messages.proto messages.proto
diff --git a/messages/elixir/Makefile b/messages/elixir/Makefile
@@ -1 +1,25 @@
 include default.mk
+
+clean:
+	rm -rf _build deps .deps .tested
+	rm -rf lib/cucumber_messages/generated/*
+
+.deps: setup_mix_and_get_dependencies update_proto_file compile_messages revert_proto_file
+	touch .deps
+
+setup_mix_and_get_dependencies:
+	mix local.hex --force
+	mix deps.get
+.PHONY: setup_mix_and_get_dependencies
+
+update_proto_file: messages.proto
+	mv $< $<.bak
+	cat $<.bak | sed "s/package io.cucumber.messages/package cucumber_messages/" > $<
+
+compile_messages:
+	MIX_ENV=prod mix protox.generate --multiple-files --output-path=lib/cucumber_messages/generated messages.proto
+.PHONY: compile_messages
+
+revert_proto_file: messages.proto.bak
+	mv messages.proto.bak messages.proto
+.PHONY: revert_proto_file
diff --git a/messages/elixir/README.md b/messages/elixir/README.md
@@ -1,5 +1,7 @@
 # CucumberMessages
 
+This package is released at [hex.pm](https://hex.pm/packages/cucumber_messages).
+
 ## Credits
 
 This library is originally funded by [UCLL](https://www.ucll.be) its "First Time Right" research project.
diff --git a/messages/elixir/lib/cucumber_message.ex b/messages/elixir/lib/cucumber_message.ex
@@ -1,12 +1,6 @@
 defmodule CucumberMessages do
   @moduledoc """
   This small library its sole purpose is to convert the protobuf schema to Elixir code. In order to use this library, you do not need protoc installed at all!
-
-  If you want to contribute to this library (or just update the protobuf schema and code), make sure you have `protoc` installed and run:
-
-  `MIX_ENV=prod mix protox.generate --output-path=lib/cucumber_messages/messages.ex messages.proto`
-
-  If you want to contribute, please be so kind to run `mix format` as well (this can take a while with an unformatted `messages.ex` file).
   """
 
   @doc """

diff --git a/messages/elixir/lib/cucumber_messages/generated/.gitignore b/messages/elixir/lib/cucumber_messages/generated/.gitignore
@@ -0,0 +1 @@
+/*.ex
diff --git a/messages/elixir/lib/cucumber_messages/generated/elixir_cucumber_messages_attachment.ex b/messages/elixir/lib/cucumber_messages/generated/elixir_cucumber_messages_attachment.ex
diff --git a/...r/lib/cucumber_messages/generated/elixir_cucumber_messages_attachment_content_encoding.ex b/...r/lib/cucumber_messages/generated/elixir_cucumber_messages_attachment_content_encoding.ex