Formula/elektra.rb

@@ -1,60 +1,53 @@
 class Elektra < Formula
   desc "Framework to access config settings in a global key database"
   homepage "https://libelektra.org"
-  url "https://www.libelektra.org/ftp/elektra/releases/elektra-0.8.22.tar.gz"
-  sha256 "962598315619d5dff3a575d742720f076dc4ba3702bd01609bfb7a6ddb5d759f"
+  url "https://www.libelektra.org/ftp/elektra/releases/elektra-0.9.1.tar.gz"
+  sha256 "df1d2ec1b4db9c89c216772f0998581a1cbb665e295ff9a418549360bb42f758"
   head "https://github.com/ElektraInitiative/libelektra.git"
 
   bottle do
     root_url("https://github.com/ElektraInitiative/homebrew-elektra/releases/" \
-             "download/0.8.22")
-    sha256 "4171e635d2c652a4b2f34a5c8704ad69661149d267a8b2865336da8461b34d1a" \
-           => :high_sierra
+             "download/0.9.1")
+    sha256 "3f1a181eac8cbfd066a5562a33731f7e7a29e15228c9294bb92113d38027e0ee" => :catalina
   end
 
+  option "with-gitresolver", "Build with gitresolver plugin"
   option "with-qt", "Build GUI frontend"
-
-  # rubocop: disable Style/ClassVars
-  opt = [[:optional], proc {}, []]
-  @@plugin_dependencies = {
-    "augeas" => [Dependency.new("augeas", *opt)],
-    "dbus" => [Dependency.new("dbus", *opt)],
-    "gitresolver" => [Dependency.new("libgit2", *opt)],
-    "tcl" => [Dependency.new("boost", *opt)],
-    "yajl" => [Dependency.new("yajl", *opt)],
-    "yamlcpp" => [Dependency.new("yaml-cpp", *opt)],
-  }
-  # rubocop: enable Style/ClassVars
-  option "with-dep-plugins", \
-         "Build with additional plugins: " \
-         "#{@@plugin_dependencies.keys.join ", "}"
+  option "with-xerces", "Build with xerces plugin"
 
   # Build Dependencies
   depends_on "cmake" => :build
   depends_on "doxygen" => :build
 
-  # Run-Time Dependencies
-  @@plugin_dependencies.values.flatten.each do |dependency|
-    depends_on dependency
-  end
+  depends_on "libgit2" if build.with? "gitresolver"
+  depends_on "xerces-c" if build.with? "xerces"
 
+  depends_on "augeas" => :optional
+  depends_on "dbus" => :optional
   depends_on "lua" => :optional
+
   depends_on "swig" if build.with? "lua"
   depends_on "qt" => :optional
+
   depends_on "discount" if build.with? "qt"
+  depends_on "yajl" => :optional
 
   def install
     bindings = ["cpp"]
-    tools = ["kdb", "gen"]
+    tools = ["kdb"]
     plugins = ["NODEP"]
 
-    plugins += @@plugin_dependencies.keys if build.with? "dep-plugins"
-
     if build.with? "lua"
       bindings << "swig_lua"
       plugins << "lua"
     end
 
+    plugins << "augeas" if build.with? "augeas"
+    plugins << "dbus" << "dbusrecv" if build.with? "dbus"
+    plugins << "gitresolver" if build.with? "gitresolver"
+    plugins << "xerces" if build.with? "xerces"
+    plugins << "yajl" if build.with? "yajl"
+
     tools << "qt-gui" if build.with? "qt"
 
     cmake_args = %W[
@@ -70,16 +63,16 @@ def install
       system "make", "install"
     end
 
-    bash_completion.install "scripts/kdb-bash-completion" => "kdb"
-    fish_completion.install "scripts/kdb.fish"
-    zsh_completion.install "scripts/kdb_zsh_completion" => "_kdb"
+    bash_completion.install "scripts/completion/kdb-bash-completion" => "kdb"
+    fish_completion.install "scripts/completion/kdb.fish"
+    zsh_completion.install "scripts/completion/kdb_zsh_completion" => "_kdb"
   end
 
   test do
     output = shell_output("#{bin}/kdb get system/elektra/version/infos/licence")
     assert_match "BSD", output
-    Utils.popen_read("#{bin}/kdb", "list").split.each do |plugin|
-      system "#{bin}/kdb", "check", plugin
+    Utils.popen_read("#{bin}/kdb", "plugin-list").split.each do |plugin|
+      system "#{bin}/kdb", "plugin-check", plugin
     end
   end
 end

ReadMe.md

@@ -1,6 +1,6 @@
 # Elektra Homebrew Formula
 
-This tap contains a [🍺 Homebrew](https://brew.sh) formula for the configuration framework [⚡️ Elektra](http://web.libelektra.org). The official Homebrew repository [`homebrew/core`](https://github.com/Homebrew/homebrew-core) also includes an [official formula for Elektra](https://github.com/Homebrew/homebrew-core/blob/master/Formula/elektra.rb). We therefore recommend you use this tap, only if you want to use functionality that is not supported by the formula in `homebrew/core`, such as library dependent plugins (e.g. `yajl`, `yamlcpp`).
+This tap contains a [🍺 Homebrew](https://brew.sh) formula for the configuration framework [⚡️ Elektra](http://web.libelektra.org). The official Homebrew repository [`homebrew/core`](https://github.com/Homebrew/homebrew-core) also includes an [official formula for Elektra](https://github.com/Homebrew/homebrew-core/blob/master/Formula/elektra.rb). We therefore recommend you use this tap, only if you want to use functionality that is not supported by the formula in `homebrew/core`, such as library dependent plugins (e.g. `xerces`, `yajl`).
 
 # How to Use
 
@@ -19,13 +19,7 @@ brew install elektrainitiative/elektra/elektra
 
 ## Options
 
-Use the command `brew info elektrainitiative/elektra/elektra`to show a list of optional switches for this Homebrew formula. One of the switches is `--with-dep-plugins`, which you can use  to install plugins that require third party libraries:
-
-```sh
-brew install elektrainitiative/elektra/elektra --with-dep-plugins
-```
-
-.
+Use the command `brew info elektrainitiative/elektra/elektra`to show a list of optional switches for this Homebrew formula.
 
 # Troubleshooting