trixie 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9fb9e4a817416d5df9d692a6da48f03afc54c429b1956e6b74724739253776e
-  data.tar.gz: f0cbfc84bccc590573c633fe8a36ee00762fd4d6a94748c928ebb55668730d64
+  metadata.gz: fe98b3f0bf37304b30f8128a4d9de6c42db4bbdae41054f1fd4f135003337a64
+  data.tar.gz: 4970d509ce2c73acaf0be36d7401179bc5a56461507306bd4789317ada2841e7
 SHA512:
-  metadata.gz: d897d133563fc5ce764cb7dda155f58b9822191ae74d24113736626cab6a172acbc15cd316d18d9c43cc2b473a7d1dbf93c0b655acfb7373bf09ec6d67120eda
-  data.tar.gz: 41c803e3e23ba1a91d2c523b98e95e053ef8a5a00c72f4cbfee3427aa73f7e8a577c57ac5abc72fcc4ca3e9836069c8479a3da016305fe98276a6520f559dd9f
+  metadata.gz: 0a1cdb36ed57e082a2bec90c58e0f85d49a84a8ea0a926c0ca90b80e4a71c5b5a4e08431aa2b2c1ed98579b606960543a5d94ee3a2f2255404e7b6436bf68ab6
+  data.tar.gz: f65d4e4c2cd6aff21bb9fb4f0a049825ddc5dd148666769c3b4b0107513c08da4817ec232b6074e25cc7315bc36defc30646c14ec85f49b60a95a25366c77294

data/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# This owner will be the default owner of everything in the repo.
+* @toptal/devx

data/Gemfile.lock

@@ -1,8 +1,10 @@
 PATH
   remote: .
   specs:
-    trixie (0.1.1)
+    trixie (0.1.3)
       dry-cli (~> 0.7.0)
+      dry-schema (~> 1.10.0)
+      dry-validation (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,8 +12,43 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     dry-cli (0.7.0)
+    dry-configurable (0.16.1)
+      dry-core (~> 0.6)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
+      concurrent-ruby (~> 1.0)
+    dry-core (0.9.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (0.3.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-schema (1.10.6)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.2)
+      dry-types (~> 1.5)
+    dry-types (1.6.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.9, >= 0.9)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.3, >= 1.3)
+      zeitwerk (~> 2.6)
+    dry-validation (1.8.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.8, >= 1.8.0)
     json (2.6.2)
     method_source (1.0.0)
     parallel (1.22.1)
@@ -54,6 +91,7 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.2.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -71,8 +71,7 @@ Or install it yourself as:
 
 1. Support Multiple Backends/Password Managers, Trixie::Loader can be refactored to be an adapter for the op CLI
 2. Allow specific Backend options, eg: trixie load --backend op --backend-options '{ "email": "bar@foo.com",   "address": "foo.1password.com"}'
-3. Validate the `.trixie.yml`, check if we have the required values for trixie to run
-4. Add a load --cache option, so fetched secrets could be retained for a while without using the Password Manager Backend
+3. Add a load --cache option, so fetched secrets could be retained for a while without using the Password Manager Backend
 
 ## Development
 

data/lib/trixie/contracts/trixie_yml.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Trixie
+  module Contracts
+    # class to validate .trixie.yml files
+    # Usage:
+    #   config_contract = Trixie::Contracts::TrixieYml.new
+    #   result = config_contract.call(config_options)
+    #   result.sucess?
+    #   result.errors.to_h
+    class TrixieYml < Dry::Validation::Contract
+      params do
+        required(:secrets).array(:hash) do
+          required(:env).filled(:string)
+          required(:value).filled(Types::Strict::String | Types::Strict::Bool | Types::Strict::Integer)
+          required(:groups).array(:string)
+        end
+      end
+    end
+  end
+end

data/lib/trixie/contracts/types.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Trixie
+  module Contracts
+    module Types
+      include Dry.Types
+    end
+  end
+end

data/lib/trixie/load.rb

@@ -13,6 +13,7 @@ module Trixie
 
     def call
       verify_op_installed!
+      verify_secrets_config!
 
       create_account unless account_is_configured?
 
@@ -20,7 +21,13 @@ module Trixie
     end
 
     def verify_op_installed!
-      raise Trixie::OpCLINotInstalled, OP_NOT_INSTALLED unless system("which op > /dev/null")
+      raise Trixie::OpCLINotInstalledError, OP_NOT_INSTALLED unless system("which op > /dev/null")
+    end
+
+    def verify_secrets_config!
+      result = Trixie::Contracts::TrixieYml.new.call(secrets_config)
+
+      raise Trixie::InvalidConfigError, "Invalid .trixie.yml: #{result.errors.to_h}" if result.errors.any?
     end
 
     def account_is_configured?

data/lib/trixie/version.rb

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

data/lib/trixie.rb

@@ -5,16 +5,20 @@ require "yaml"
 require "json"
 require "pathname"
 require "dry/cli"
+require "dry/validation"
 
 require_relative "trixie/version"
 require_relative "trixie/template"
 require_relative "trixie/formatter"
+require_relative "trixie/contracts/types"
+require_relative "trixie/contracts/trixie_yml"
 require_relative "trixie/load"
 require_relative "trixie/cli"
 
 module Trixie # rubocop:disable Style/Documentation
   class Error < StandardError; end
-  class OpCLINotInstalled < Error; end
+  class OpCLINotInstalledError < Error; end
+  class InvalidConfigError < Error; end
 
   class << self
     def root_path

data/trixie.gemspec

@@ -32,4 +32,6 @@ Gem::Specification.new do |spec|
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
   spec.add_dependency "dry-cli", "~> 0.7.0"
+  spec.add_dependency "dry-schema", "~> 1.10.0"
+  spec.add_dependency "dry-validation", "~> 1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trixie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Toptal, LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: 
 email:
 - open-source@toptal.com
@@ -35,6 +63,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -50,6 +79,8 @@ files:
 - exe/trixie
 - lib/trixie.rb
 - lib/trixie/cli.rb
+- lib/trixie/contracts/trixie_yml.rb
+- lib/trixie/contracts/types.rb
 - lib/trixie/formatter.rb
 - lib/trixie/load.rb
 - lib/trixie/template.rb