Add exec command, minor fixes

zhulik · Jan 2, 2023 · 8d5c821 · 8d5c821
1 parent 7bef776
commit 8d5c821
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 2 deletions.
diff --git a/.env.dhall b/.env.dhall
@@ -0,0 +1,11 @@
+let some_variable = "some value'"
+in  {
+      some_string = some_variable,
+      some_record = {
+        some_string = some_variable,
+        some_naturals = [1,2,3],
+        some_doubles = [1.2, 2.3],
+        some_strings = ["value1", "value2"],
+        some_nil = None
+      }
+    }
diff --git a/lib/dotcrypt/CLI/app.rb b/lib/dotcrypt/CLI/app.rb
@@ -3,4 +3,5 @@
 class Dotcrypt::Cli::App < Thor
   include Dotcrypt::Cli::Commands::Show
   include Dotcrypt::Cli::Commands::Exec
+  include Dotcrypt::Cli::Commands::ENV
 end
diff --git a/lib/dotcrypt/CLI/commands/env.rb b/lib/dotcrypt/CLI/commands/env.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Dotcrypt::Cli::Commands::ENV
+  def self.included(thor)
+    thor.class_eval do
+      include Dotcrypt::Cli::Commands::Globals
+
+      desc "env", "prints exports for ennv"
+
+      def env = Dotcrypt::Cli::Commands::Show::Handler.new(**options.merge(output: :env)).call
+    end
+  end
+end
diff --git a/lib/dotcrypt/CLI/commands/exec.rb b/lib/dotcrypt/CLI/commands/exec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Dotcrypt::Cli::Commands::Exec
+  def self.included(thor)
+    thor.class_eval do
+      include Dotcrypt::Cli::Commands::Globals
+
+      desc "exec COMMAND", "exec command a command with dhall env"
+
+      def exec(*command) = Handler.new(command, **options).call
+    end
+  end
+
+  class Handler
+    def initialize(command, **options)
+      @command = command
+      @options = options
+    end
+
+    def call
+      exec(env, *@command)
+    end
+
+    private
+
+    def env
+      @env ||= Dotcrypt::Dhall.load_from(@options[:file]).then do |c|
+        # TODO: validate variable names
+        Dotcrypt::Flattener.call(c, separator: @options[:separator])
+      end
+    end
+  end
+end
diff --git a/lib/dotcrypt/CLI/commands/globals.rb b/lib/dotcrypt/CLI/commands/globals.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Dotcrypt::Cli::Commands::Globals
+  def self.included(thor)
+    thor.class_eval do
+      option :separator, aliases: :s,
+                         type: :string,
+                         default: "_",
+                         desc: "Separator for flattening"
+
+      option :file, aliases: :f,
+                    type: :string,
+                    default: ".env.dhall",
+                    desc: "Dhall file to read."
+    end
+  end
+end
diff --git a/lib/dotcrypt/CLI/commands/show.rb b/lib/dotcrypt/CLI/commands/show.rb
@@ -18,12 +18,12 @@ def self.included(thor) # rubocop:disable Metrics/MethodLength
                        default: false,
                        desc: "Whether to flatten the output. Always enabled for `env` format"
 
-      def show = Handler.new(options).call
+      def show = Handler.new(**options).call
     end
   end
 
   class Handler
-    def initialize(options)
+    def initialize(**options)
       @options = options
     end