dotcrypt 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d752eefc90fdbf76a3a5c76918dc2f9eae4019e7499792d83988df718ae150
-  data.tar.gz: 83df8ddd949aa0fe563f7990f2b37f5de8a82a9283cf5725336688cf2c3d8f7a
+  metadata.gz: 4b24c31b9acd45de3b473e8479ee752e0392fe34f2e66ee3f6b39759b15bf487
+  data.tar.gz: c54a1ebbee56f32e27f7f0dfb9aad26d8158648abcf6e95e7029035d58798c20
 SHA512:
-  metadata.gz: b2d3883214e7630e4a0cb07b0f3bc5e5f57e7bdee9a7886cafd9c92a0dae8832246fd87159eb09013b017e4b0ac3ac60f38a1d6636cacae60fb633f8fd69140b
-  data.tar.gz: 48278cc6b8d382a8bf47bbadd8e9b8e9808b9bfcf16dc0b560c62d95a99c8edba8bfbb8d60e781635ce863a8c90c71c26839816f5aabb840cacf489271dad758
+  metadata.gz: 43aab882593c8c4820407ec4162156da5ea497c392f7b4d58e3b5d4b60dd623024bc105a61f3070c17de4c431577632b9e80d2c3ed678932050c5aeac399674a
+  data.tar.gz: a119ce9f2d3e7eea65c0d25efb36dab5945b3a6cd3d57a55d3fe99de1f56467634c363f88131b7ef0459acb56527c5dde0d5440f5222a0dd33a571518a251b02

data/.env.jsonnet

@@ -0,0 +1,11 @@
+local some_variable = "some value'";
+
+{
+  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']
+  },
+}

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dotcrypt (0.1.3)
+    dotcrypt (0.2.0)
       bootsnap (~> 1.15.0)
-      dhall (~> 0.5.0)
+      jsonnet (~> 0.5.0)
       thor (~> 1.2.0)
       zeitwerk (~> 2.6.0)
 
@@ -12,35 +12,23 @@ GEM
   specs:
     ast (2.4.2)
     backport (1.2.0)
-    base32 (0.3.4)
     benchmark (0.2.0)
     bootsnap (1.15.0)
       msgpack (~> 1.2)
-    cbor (0.5.9.6)
     childprocess (4.1.0)
-    citrus (3.0.2)
-    dhall (0.5.5)
-      base32 (~> 0.3.2)
-      cbor (~> 0.5.9.3)
-      citrus (~> 3.0)
-      lazy_object (>= 0.0.1, < 0.2.0)
-      multihashes (~> 0.2.0)
-      promise.rb (~> 0.7.4)
-      value_semantics (~> 3.0)
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
     iniparse (1.5.0)
     jaro_winkler (1.5.4)
     json (2.6.2)
+    jsonnet (0.5.2)
+      mini_portile2 (>= 2.2.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    lazy_object (0.1.0)
+    mini_portile2 (2.8.1)
     msgpack (1.6.0)
-    multicodecs (0.2.1)
-    multihashes (0.2.0)
-      multicodecs (>= 0.2.0, < 1)
     nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     overcommit (0.59.1)
@@ -50,7 +38,6 @@ GEM
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
-    promise.rb (0.7.4)
     racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -107,7 +94,6 @@ GEM
     thor (1.2.1)
     tilt (2.0.11)
     unicode-display_width (2.3.0)
-    value_semantics (3.6.1)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)

data/Rakefile

@@ -9,20 +9,4 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-namespace :dhall do
-  dhall_files = Dir["./**/.*.dhall"] + Dir["./**/*.dhall"]
-
-  def dhall(*args)
-    system("dhall", *args, exception: true)
-  end
-
-  task :check_fmt do
-    dhall("format", "--check", *dhall_files)
-  end
-
-  task :fmt do
-    dhall("format", *dhall_files)
-  end
-end
-
-task default: ["dhall:fmt", :spec, :rubocop]
+task default: [:spec, :rubocop]

data/lib/dotcrypt/CLI/commands/exec.rb

@@ -5,7 +5,7 @@ module Dotcrypt::Cli::Commands::Exec
     thor.class_eval do
       include Dotcrypt::Cli::Commands::Globals
 
-      desc "exec COMMAND", "exec command a command with dhall env"
+      desc "exec COMMAND", "exec command a command with env"
 
       def exec(*command) = Handler.new(command, **options).call
     end
@@ -24,7 +24,7 @@ module Dotcrypt::Cli::Commands::Exec
     private
 
     def env
-      @env ||= Dotcrypt::Dhall.load_from(@options[:file]).then do |c|
+      @env ||= Dotcrypt::Jsonnet.load_from(@options[:file]).then do |c|
         # TODO: validate variable names
         Dotcrypt::Flattener.call(c, separator: @options[:separator])
       end

data/lib/dotcrypt/CLI/commands/globals.rb

@@ -10,8 +10,8 @@ module Dotcrypt::Cli::Commands::Globals
 
       option :file, aliases: :f,
                     type: :string,
-                    default: ".env.dhall",
-                    desc: "Dhall file to read."
+                    default: ".env.jsonnet",
+                    desc: "Jsonnet file to read."
     end
   end
 end

data/lib/dotcrypt/CLI/commands/show.rb

@@ -5,7 +5,7 @@ module Dotcrypt::Cli::Commands::Show
     thor.class_eval do
       include Dotcrypt::Cli::Commands::Globals
 
-      desc "show", "converts a dhall file into various formats"
+      desc "show", "converts a jsonnet file into various formats"
 
       option :output, aliases: :o,
                       type: :string,
@@ -32,7 +32,7 @@ module Dotcrypt::Cli::Commands::Show
     private
 
     def config
-      @config ||= Dotcrypt::Dhall.load_from(@options[:file]).then do |c|
+      @config ||= Dotcrypt::Jsonnet.load_from(@options[:file]).then do |c|
         next Dotcrypt::Flattener.call(c, separator: @options[:separator]) if @options[:flatten]
 
         c

data/lib/dotcrypt/jsonnet.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Dotcrypt::Jsonnet
+  class << self
+    def load(code) = Jsonnet.evaluate(code)
+
+    def load_from(file) = load(File.read(file))
+  end
+end

data/lib/dotcrypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dotcrypt
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/dotcrypt.rb

@@ -4,7 +4,7 @@ require "json"
 require "yaml"
 
 require "zeitwerk"
-require "dhall"
+require "jsonnet"
 require "thor"
 
 loader = Zeitwerk::Loader.for_gem
@@ -18,8 +18,30 @@ loader.inflector.inflect(
 loader.setup
 
 module Dotcrypt
-end
+  DEFAULT_NAME = ".env.jsonnet"
+
+  class Error < StandardError
+  end
+
+  def self.setup(path: find_dotcrypt)
+    Dotcrypt::Jsonnet.load_from(path).then do |c|
+      Dotcrypt::Flattener.call(c).then do |f|
+        ENV.merge!(f)
+        return f
+      end
+    end
+  end
+
+  def self.find_dotcrypt
+    dir = Dir.getwd
+    loop do
+      raise ".env.jsonnet is noot found" if dir == "/"
+
+      path = File.join(dir, DEFAULT_NAME)
+
+      return path if File.exist?(path)
 
-class Dotcrypt::Error < StandardError
-  # Your code goes here...
+      dir = File.expand_path("..", dir)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotcrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.15.0
 - !ruby/object:Gem::Dependency
-  name: dhall
+  name: jsonnet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.dhall"
+- ".env.jsonnet"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
@@ -92,9 +92,8 @@ files:
 - lib/dotcrypt/CLI/commands/globals.rb
 - lib/dotcrypt/CLI/commands/show.rb
 - lib/dotcrypt/core_ext/hash.rb
-- lib/dotcrypt/dhall.rb
-- lib/dotcrypt/dhall/as_hash.rb
 - lib/dotcrypt/flattener.rb
+- lib/dotcrypt/jsonnet.rb
 - lib/dotcrypt/serializers.rb
 - lib/dotcrypt/serializers/env.rb
 - lib/dotcrypt/serializers/json.rb

data/.env.dhall

@@ -1,11 +0,0 @@
-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
-      }
-    }

data/lib/dotcrypt/dhall/as_hash.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Dotcrypt::Dhall::AsHash
-  refine ::Dhall::Record do
-    def as_hash(*)
-      to_h.transform_values(&:as_hash)
-    end
-  end
-
-  refine ::Dhall::List do
-    def as_hash(*)
-      to_a.map(&:as_hash)
-    end
-  end
-
-  refine ::Dhall::Text do
-    def as_hash(*)
-      to_s
-    end
-  end
-
-  refine ::Dhall::Natural do
-    def as_hash(*)
-      to_i
-    end
-  end
-
-  refine ::Dhall::Double do
-    def as_hash(*)
-      to_f
-    end
-  end
-
-  refine ::Dhall::Builtins::None do
-    def as_hash(*)
-      nil
-    end
-  end
-end

data/lib/dotcrypt/dhall.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Dotcrypt::Dhall
-  using Dotcrypt::Dhall::AsHash
-
-  class << self
-    def load(dhall)
-      Dhall.load(dhall).sync.as_hash
-    end
-
-    def load_from(file)
-      load(File.read(file))
-    end
-  end
-end