trixie 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe98b3f0bf37304b30f8128a4d9de6c42db4bbdae41054f1fd4f135003337a64
-  data.tar.gz: 4970d509ce2c73acaf0be36d7401179bc5a56461507306bd4789317ada2841e7
+  metadata.gz: 70a581f5fc7842f4f0243591c249ebc5a056adffad2727747a4b1f7f9ec5532a
+  data.tar.gz: c8e3d3fcc49cde0b394405eeed1d903d95265681c7029c364f5fc98f19ebbfbe
 SHA512:
-  metadata.gz: 0a1cdb36ed57e082a2bec90c58e0f85d49a84a8ea0a926c0ca90b80e4a71c5b5a4e08431aa2b2c1ed98579b606960543a5d94ee3a2f2255404e7b6436bf68ab6
-  data.tar.gz: f65d4e4c2cd6aff21bb9fb4f0a049825ddc5dd148666769c3b4b0107513c08da4817ec232b6074e25cc7315bc36defc30646c14ec85f49b60a95a25366c77294
+  metadata.gz: bbaaef298ba2a3c79b98e842076e37f3521aa5324e41eb47e3900bea4a22ffc5b17c62786c6fe7928fc424bf7c8830e2109807bcc0c6bec15346c789d4535d3a
+  data.tar.gz: 6bea0a778d18c87cbe3c4e77a0414daa9f602c64251ef0874910f8abdb4265581ad80619a68d5ea70e200bbf2768bde455e9ef1bccfcbe86df330f5024f29525

data/.github/dependabot.yml

@@ -0,0 +1,44 @@
+version: 2
+registries:
+  toptal-github:
+    type: "git"
+    url: "https://github.com"
+    username: "x-access-token"
+    password: "${{secrets.DEPENDABOT_GITHUB_TOKEN}}"
+
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+      time: "07:00"
+    pull-request-branch-name:
+      separator: "-"
+    labels:
+      - "no-jira"
+      - "ruby"
+      - "dependencies"
+      - "DevX"
+    reviewers:
+      - "toptal/devx"
+    registries:
+      - toptal-github
+    insecure-external-code-execution: allow
+    open-pull-requests-limit: 2
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+      time: "07:00"
+    pull-request-branch-name:
+      separator: "-"
+    labels:
+      - "no-jira"
+      - "dependencies"
+      - "gha"
+      - "DevX"
+    reviewers:
+      - "toptal/devx"
+    open-pull-requests-limit: 2

data/.github/workflows/main.yml

@@ -8,18 +8,25 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['3.3', '3.4', '4.0']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-    - name: Run the default task
+        bundler-cache: true
+
+    - name: Run tests
+      run: |
+        bundle exec rake spec
+
+    - name: Run rubocop
       run: |
-        gem install bundler -v 2.2.7
-        bundle install
-        bundle exec rake
+        bundle exec rake rubocop

data/.rubocop.yml

@@ -1,5 +1,10 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.3
+  NewCops: disable
+  SuggestExtensions: false
+  Exclude:
+    - bin/**
+    - vendor/**/*
 
 Style/StringLiterals:
   Enabled: true

data/.ruby-version

@@ -1 +1 @@
-3.0.4
+3.3

data/Gemfile

@@ -4,11 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in trixie.gemspec
 gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.7"
-
-gem "pry-byebug"

data/Gemfile.lock

@@ -1,107 +1,133 @@
 PATH
   remote: .
   specs:
-    trixie (0.1.3)
-      dry-cli (~> 0.7.0)
-      dry-schema (~> 1.10.0)
-      dry-validation (~> 1.8.0)
+    trixie (0.1.5)
+      dry-cli (~> 1.0)
+      dry-schema (~> 1.10)
+      dry-validation (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
+    ast (2.4.3)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
+    date (3.5.1)
+    debug (1.11.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.6.2)
+    dry-cli (1.4.1)
+    dry-configurable (1.3.0)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+    dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (0.3.0)
-    dry-initializer (3.1.1)
-    dry-logic (1.3.0)
+    dry-inflector (1.3.1)
+    dry-initializer (3.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-schema (1.10.6)
+    dry-schema (1.15.0)
       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)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.1)
+      dry-initializer (~> 3.2)
+      dry-logic (~> 1.6)
+      dry-types (~> 1.8)
+      zeitwerk (~> 2.6)
+    dry-types (1.9.0)
+      bigdecimal (>= 3.0)
       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)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    dry-validation (1.8.1)
+    dry-validation (1.11.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)
-    parser (3.1.2.1)
+      dry-core (~> 1.1)
+      dry-initializer (~> 3.2)
+      dry-schema (~> 1.14)
+      zeitwerk (~> 2.6)
+    erb (6.0.1)
+    io-console (0.8.2)
+    irb (1.16.0)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.18.1)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    parallel (1.27.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
+      racc
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.3.1)
+      date
+      stringio
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.2.1)
+    rdoc (7.0.3)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.84.1)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.2.0)
-    zeitwerk (2.6.6)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    stringio (3.2.0)
+    tsort (0.2.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    zeitwerk (2.7.4)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  pry-byebug
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  debug
+  rake (~> 13.2)
+  rspec (~> 3.13)
   rubocop (~> 1.7)
   trixie!
 
 BUNDLED WITH
-   2.2.33
+  4.0.5

data/README.md

@@ -18,7 +18,20 @@ secrets:
      value: "{{ op://Developers/NPM_TOKEN/SETUP_SECRET/value }}"
 ```
 
-Then you can run `trixie load > .env.secrets` to update your env file with the `NPM_TOKEN`
+Then you can run `trixie load > .env.secrets` to update your env file with the `NPM_TOKEN`.
+
+Alternatively, you can also leverage the following environment variables:
+- TRIXIE_OP_ADDRESS - sets the authentication address for 1Password
+- TRIXIE_OP_EMAIL - sets the user email address for 1Password
+
+Example:
+```ssh
+  TRIXIE_OP_ADDRESS=https://{account}.1password.com \
+  TRIXIE_OP_EMAIL=john.doe@email.com \
+  trixie load > .env.secrets
+```
+this will populate your env file with:
+`export NPM_TOKEN={toptals-read-only-npm-token}`
 
 ### Groups
 
@@ -70,8 +83,7 @@ Or install it yourself as:
 ## TODO IDEAS
 
 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. Add a load --cache option, so fetched secrets could be retained for a while without using the Password Manager Backend
+2. Add a load --cache option, so fetched secrets could be retained for a while without using the Password Manager Backend
 
 ## Development
 

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/lib/trixie/contracts/types.rb

@@ -2,6 +2,7 @@
 
 module Trixie
   module Contracts
+    # Our own module to use Dry.Types
     module Types
       include Dry.Types
     end

data/lib/trixie/formatter.rb

@@ -6,7 +6,7 @@ module Trixie
     FORMATTERS = {
       "env" => ->(secrets) { secrets.map { |secret| "#{secret["env"]}=#{secret["value"]}" }.join("\n") },
       "sh" => ->(secrets) { secrets.map { |secret| "export #{secret["env"]}=#{secret["value"]}" }.join("\n") },
-      "json" => ->(secrets) { secrets.to_json },
+      "json" => lambda(&:to_json),
       "pretty_json" => ->(secrets) { JSON.pretty_generate(secrets) }
     }.freeze
 

data/lib/trixie/load.rb

@@ -4,6 +4,8 @@ module Trixie
   # Fetches the specified secrets with op cli and returns them formatted
   class Load
     OP_NOT_INSTALLED = "op cli is not installed please download and install at https://developer.1password.com/docs/cli/get-started#install"
+    OP_ADDRESS_ENV = "TRIXIE_OP_ADDRESS"
+    OP_EMAIL_ENV = "TRIXIE_OP_EMAIL"
 
     def initialize(file:, groups: [], format: "env")
       @file = file
@@ -38,7 +40,7 @@ module Trixie
       warn "* Configuring 1password Account"
       warn "To get the Secret Key take a look at https://support.1password.com/secret-key/"
 
-      `op account add`
+      add_op_account
     end
 
     def fetch_secrets
@@ -58,5 +60,14 @@ module Trixie
     def formatted_secrets
       @formatter.call(filtered_secrets)
     end
+
+    def add_op_account
+      cmd = "op account add"
+
+      cmd += " --address #{ENV[OP_ADDRESS_ENV]}" if ENV[OP_ADDRESS_ENV]
+      cmd += " --email #{ENV[OP_EMAIL_ENV]}" if ENV[OP_EMAIL_ENV]
+
+      `#{cmd}`
+    end
   end
 end

data/lib/trixie/version.rb

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

data/trixie.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "CLI tool to fetch secrets in development"
   spec.homepage      = "https://github.com/toptal/trixie"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/toptal/trixie"
@@ -31,7 +31,12 @@ 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"
+  spec.add_dependency "dry-cli", "~> 1.0"
+  spec.add_dependency "dry-schema", "~> 1.10"
+  spec.add_dependency "dry-validation", "~> 1.8"
+
+  spec.add_development_dependency "debug"
+  spec.add_development_dependency "rake", "~> 13.2"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "rubocop", "~> 1.7"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trixie
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Toptal, LLC
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -16,43 +15,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-description: 
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 email:
 - open-source@toptal.com
 - carlos.atkinson@toptal.com
@@ -63,7 +117,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -75,6 +129,8 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - exe/trixie
 - lib/trixie.rb
@@ -93,7 +149,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/toptal/trixie
   source_code_uri: https://github.com/toptal/trixie
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 4.0.5
 specification_version: 4
 summary: CLI tool to fetch secrets in development
 test_files: []

data/.github/CODEOWNERS

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