Add prerelease and release tasks. Use lein-ver for versions.

Author: tobyclemson

Gemfile

@@ -1,9 +1,12 @@
 source 'https://rubygems.org'
 
+gem 'edn', '~> 1.1'
+gem 'mime-types', '~> 3.3'
 gem 'rake', '~> 13.0'
 gem 'rake_circle_ci', '~> 0.9'
-gem 'rake_github', '~> 0.5'
+gem 'rake_github', '0.8.0.pre.5'
 gem 'rake_gpg', '~> 0.16'
 gem 'rake_ssh', '~> 0.4'
 gem 'rake_leiningen', '~> 0.20'
 gem 'rake_docker', '~> 2.13'
+gem 'semantic', '~> 1.6'

Gemfile.lock

@@ -26,15 +26,17 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
+    edn (1.1.1)
     excon (0.85.0)
-    faraday (1.5.1)
+    faraday (1.7.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -44,6 +46,7 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     i18n (1.8.10)
@@ -52,6 +55,9 @@ GEM
     lino (3.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0704)
     minitar (0.9)
     minitest (5.14.4)
     multi_json (1.15.0)
@@ -80,7 +86,7 @@ GEM
     rake_factory (0.29.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.7.0)
+    rake_github (0.8.0.pre.5)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
@@ -119,13 +125,16 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  edn (~> 1.1)
+  mime-types (~> 3.3)
   rake (~> 13.0)
   rake_circle_ci (~> 0.9)
   rake_docker (~> 2.13)
-  rake_github (~> 0.5)
+  rake_github (= 0.8.0.pre.5)
   rake_gpg (~> 0.16)
   rake_leiningen (~> 0.20)
   rake_ssh (~> 0.4)
+  semantic (~> 1.6)
 
 BUNDLED WITH
    2.2.20

Rakefile

@@ -6,6 +6,10 @@ require 'rake_leiningen'
 require 'rake_ssh'
 require 'yaml'
 
+require_relative 'lib/version'
+
+version = Version.from_file('resources/VERSION')
+
 task :default => [:'library:check', :'library:test:all']
 
 RakeLeiningen.define_installation_tasks(
@@ -131,15 +135,41 @@ namespace :library do
     task all: %w[unit integration]
   end
 
+  namespace :version do
+    task :bump, [:type] do |_, args|
+
+    end
+  end
+
   namespace :publish do
-    RakeLeiningen.define_release_task(
+    RakeGithub.define_release_task(
       name: :prerelease,
-      profile: 'prerelease'
-    )
+      repository: 'logicblocks/kafka.connect.event-feed'
+    ) do |t|
+      github_config =
+        YAML.load_file('config/secrets/github/config.yaml')
+
+      t.access_token = github_config['github_personal_access_token']
+      t.tag_name = version.to_s
+      t.prerelease = true
+      t.assets = [
+        "target/uberjar/kafka.connect.event-feed-#{version}-standalone.jar"
+      ]
+    end
 
-    RakeLeiningen.define_release_task(
+    RakeGithub.define_release_task(
       name: :release,
-      profile: 'release'
-    )
+      repository: 'logicblocks/kafka.connect.event-feed'
+    ) do |t|
+      github_config =
+        YAML.load_file('config/secrets/github/config.yaml')
+
+      t.access_token = github_config['github_personal_access_token']
+      t.tag_name = version.to_s
+      t.prerelease = false
+      t.assets = [
+        "target/uberjar/kafka.connect.event-feed-#{version}-standalone.jar"
+      ]
+    end
   end
 end

TODO.md

@@ -4,6 +4,7 @@ ToDo
 Tasks
 -----
 
-* Use version number from pipeline
 * Allow event offset to be reset?
 * Handle dead letters?
+* Test that restarting the connector (or even just kafka connect) doesn't result
+  in re-ingesting from the beginning of the event feed

config/secrets/github/config.yaml

@@ -0,0 +1,35 @@
+require 'edn'
+require 'semantic'
+
+class Version
+  def self.from_file(path)
+    parts =
+      File.exist?(path) ?
+        File.open(path) { |file| EDN.read(file) } :
+        {
+          major: 0,
+          minor: 0,
+          patch: 0
+        }
+
+    major = parts[:major]
+    minor = parts[:minor]
+    patch = parts[:patch]
+    pre_release = parts[:'pre-release']
+    build = parts[:build]
+
+    string = major.to_s + '.' + minor.to_s + '.' + patch.to_s +
+      (pre_release ? "-#{pre_release}" : '') +
+      (build ? "+#{build}" : '')
+
+    Version.new(string)
+  end
+
+  def initialize(version_string)
+    @version = Semantic::Version.new(version_string)
+  end
+
+  def to_s
+    @version.to_s
+  end
+end

lib/version.rb

@@ -15,6 +15,7 @@
             [lein-cljfmt "0.6.7"]
             [lein-kibit "0.1.8"]
             [lein-bikeshed "0.5.2"]
+            [lein-ver "1.1.0"]
             [jonase/eastwood "0.3.11"]]
 
   :dependencies [[org.clojure/clojure "1.10.3"]

project.clj

@@ -0,0 +1,7 @@
+{
+ :major 0
+ :minor 0
+ :patch 1
+ :pre-release "RC6"
+ :build nil
+}

resources/VERSION

@@ -32,7 +32,7 @@
   (efc/configuration-definition))
 
 (defn version [_]
-  (efv/version))
+  (efv/string))
 
 (defn task-class [_]
   EventFeedSourceTask)

src/clojure/kafka/connect/event_feed/connector.clj

@@ -140,4 +140,4 @@
     (pr-str metadata)))
 
 (defn version [_]
-  (efv/version))
+  (efv/string))

src/clojure/kafka/connect/event_feed/task.clj

@@ -1,4 +1,21 @@
-(ns kafka.connect.event-feed.version)
+(ns kafka.connect.event-feed.version
+  (:require
+   [clojure.java.io :refer [reader resource]]
+   [clojure.string :refer [join]])
+  (:import java.io.PushbackReader))
 
-(defmacro version []
-  `~(System/getProperty "kafka.connect.event-feed.version"))
+(declare version major minor patch pre-release build string)
+
+(let [version-file (resource "VERSION")]
+  (when version-file
+    (with-open [rdr (reader version-file)]
+      (binding [*read-eval* false]
+        (def version (read (PushbackReader. rdr)))
+        (def major (:major version))
+        (def minor (:minor version))
+        (def patch (:patch version))
+        (def pre-release (:pre-release version))
+        (def build (:build version))
+        (def string (str (join "." (filter identity [major minor patch]))
+                      (when pre-release (str "-" pre-release))
+                      (when build (str "+" build))))))))