opdotenv 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab16f9144c5c1ce14ba72552fb42fabdfa649be3fd30888cf9778cb85a107dca
-  data.tar.gz: 93da9bbea0c621726e3d9df051efeeb1dc3e9647653d11cb28501aa1bda3f901
+  metadata.gz: 681b84ce04a08dea4ef5bb4645ecf47071922f63288f5d6b26fcc558d2b181fd
+  data.tar.gz: d6706fb654448e9d4efa404d373d54d5f9ef5b5f5553a73c5335c28b6a7f9508
 SHA512:
-  metadata.gz: 82046c290a5d56508f7c51b49481d8c0442d41093da3a8fac56edc65361a58070ec629d8c3d52c866bab1fff93f7f04c953b54ef5cf999222f94f1b050aeca36
-  data.tar.gz: d8f041eaf6f2f309b9c2a5f7fda1dc50b5295c7d54f51c7897d1f96410a5667cc9b6a3a1ff700e06b8b05944cc8797ce88b9b0dc43d684ff927a042629161120
+  metadata.gz: 43741125e5322870b2f11d57d6b7c2a1d6ea695d69209b93938a546b5ac44f785064b21cdaf2ca6ead5a232b5e36d6d0035f90a4fa9e2f668af0b53aa1c34f8d
+  data.tar.gz: 0b1855b8e5804b98dd8bf4936a218a69bfb415073e38b78f25102744b979674f9afda9baec9570c4dbf67deeee46e226be78073ab9a51105f9e989e9a2f8a522

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 1.0.5 (2026-07-06)
+
+- Improve `OPDOTENV_DEBUG` field summary logging in Anyway Config integration to build messages only when Rails debug logging is active
+- Skip field summary debug output when a 1Password item has no fields
+
+## 1.0.4 (2026-07-05)
+
+- Move `railties` from runtime to development dependency in gemspec
+- Non-Rails installs no longer pull in the Rails gem tree; Rails apps already provide `railties`
+
+## 1.0.3 (2025-11-07)
+
+- Fix exit code handling in OpClient by using Open3.capture2e instead of IO.popen for reliable process status
+- Improve load_all_fields to filter out empty keys and only include fields from 1Password items
+- Strip whitespace from field labels and treat empty labels (after stripping) as nil
+- Filter out fields with empty or whitespace-only values
+
 ## 1.0.2 (2025-11-05)
 
 - Enhance error handling and security measures across the codebase

data/README.md

@@ -1,6 +1,6 @@
 # opdotenv
 
-[![Gem Version](https://badge.fury.io/rb/opdotenv.svg?v=1.0.2)](https://badge.fury.io/rb/opdotenv) [![Test Status](https://github.com/amkisko/opdotenv.rb/actions/workflows/ci.yml/badge.svg)](https://github.com/amkisko/opdotenv.rb/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/amkisko/opdotenv.rb/graph/badge.svg?token=U4FMVZGO8R)](https://codecov.io/gh/amkisko/opdotenv.rb)
+[![Gem Version](https://badge.fury.io/rb/opdotenv.svg?v=1.0.3)](https://badge.fury.io/rb/opdotenv) [![Test Status](https://github.com/amkisko/opdotenv.rb/actions/workflows/test.yml/badge.svg)](https://github.com/amkisko/opdotenv.rb/actions/workflows/test.yml) [![codecov](https://codecov.io/gh/amkisko/opdotenv.rb/graph/badge.svg?token=U4FMVZGO8R)](https://codecov.io/gh/amkisko/opdotenv.rb) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=amkisko_opdotenv.rb&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=amkisko_opdotenv.rb)
 
 Load environment variables from 1Password using the `op` CLI or 1Password Connect Server API. Supports dotenv, JSON, and YAML formats.
 
@@ -350,6 +350,24 @@ bundle exec rbs validate
 bundle exec standardrb --fix
 ```
 
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/amkisko/opdotenv.rb.
+
+Contribution policy:
+- New features are not necessarily added to the gem
+- Pull request should have test coverage for affected parts
+- Pull request should have changelog entry
+
+Review policy:
+- It might take up to 2 calendar weeks to review and merge critical fixes
+- It might take up to 6 calendar months to review and merge pull request
+- It might take up to 1 calendar year to review an issue
+
+## Security
+
+If you discover a security vulnerability, please report it responsibly. See [SECURITY.md](SECURITY.md) for details.
+
 ## License
 
-MIT
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/bin/opdotenv

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 require "opdotenv"

data/lib/opdotenv/anyway_loader.rb

@@ -79,26 +79,38 @@ module Opdotenv
       def log_available_fields(original_data, env_prefix, matched_data)
         return unless ENV["OPDOTENV_DEBUG"] == "true"
         return unless defined?(Rails) && Rails.logger
+        return if original_data.keys.empty?
 
         prefix_upper = env_prefix.upcase
         prefix_with_underscore = "#{prefix_upper}_"
-
         available_fields = original_data.keys.map(&:to_s)
         matched_fields = matched_data.keys.map(&:to_s)
+        unmatched = unmatched_fields(available_fields, prefix_upper, prefix_with_underscore)
+
+        log_field_summary(available_fields, matched_fields, env_prefix, prefix_with_underscore)
+        log_unmatched_fields(unmatched, prefix_with_underscore) if unmatched.any?
+      end
 
-        # Find fields that were available but didn't match the prefix (case-insensitive)
-        unmatched = available_fields.reject do |field|
+      def unmatched_fields(available_fields, prefix_upper, prefix_with_underscore)
+        available_fields.reject do |field|
           field_upper = field.to_s.upcase
           field_upper.start_with?(prefix_with_underscore) || field_upper == prefix_upper
         end
+      end
 
-        if available_fields.any?
-          Rails.logger.debug("[opdotenv] Available fields from 1Password: #{available_fields.join(", ")}")
-          Rails.logger.debug("[opdotenv] Matched fields for #{env_prefix} (prefixed with #{prefix_with_underscore}, case-insensitive): #{matched_fields.join(", ")}")
-          if unmatched.any?
-            Rails.logger.debug("[opdotenv] Unmatched fields (must be prefixed with #{prefix_with_underscore}, case-insensitive): #{unmatched.join(", ")}")
-            Rails.logger.debug("[opdotenv] To use these fields, rename them in 1Password to include the #{prefix_with_underscore} prefix")
-          end
+      def log_field_summary(available_fields, matched_fields, env_prefix, prefix_with_underscore)
+        Rails.logger.debug { "[opdotenv] Available fields from 1Password: #{available_fields.join(", ")}" }
+        Rails.logger.debug do
+          "[opdotenv] Matched fields for #{env_prefix} (prefixed with #{prefix_with_underscore}, case-insensitive): #{matched_fields.join(", ")}"
+        end
+      end
+
+      def log_unmatched_fields(unmatched, prefix_with_underscore)
+        Rails.logger.debug do
+          "[opdotenv] Unmatched fields (must be prefixed with #{prefix_with_underscore}, case-insensitive): #{unmatched.join(", ")}"
+        end
+        Rails.logger.debug do
+          "[opdotenv] To use these fields, rename them in 1Password to include the #{prefix_with_underscore} prefix"
         end
       end
     end

data/lib/opdotenv/connect_api_client.rb

@@ -86,28 +86,7 @@ module Opdotenv
       existing = item_by_title_in_vault(vault_id, item)
 
       if existing
-        # Update using PATCH
-        fields_array = fields.map do |k, v|
-          existing_field = existing["fields"]&.find { |f| f["label"] == k.to_s }
-          if existing_field
-            {
-              "op" => "replace",
-              "path" => "/fields/#{existing_field["id"]}/value",
-              "value" => v.to_s
-            }
-          else
-            {
-              "op" => "add",
-              "path" => "/fields",
-              "value" => {
-                "type" => "CONCEALED",
-                "label" => k.to_s,
-                "value" => v.to_s
-              }
-            }
-          end
-        end
-
+        fields_array = build_patch_fields(existing, fields)
         api_request(:patch, "/v1/vaults/#{vault_id}/items/#{existing["id"]}", fields_array)
       else
         # Create new item
@@ -132,6 +111,29 @@ module Opdotenv
 
     private
 
+    def build_patch_fields(existing, fields)
+      fields.map do |key, value|
+        existing_field = existing["fields"]&.find { |field| field["label"] == key.to_s }
+        if existing_field
+          {
+            "op" => "replace",
+            "path" => "/fields/#{existing_field["id"]}/value",
+            "value" => value.to_s
+          }
+        else
+          {
+            "op" => "add",
+            "path" => "/fields",
+            "value" => {
+              "type" => "CONCEALED",
+              "label" => key.to_s,
+              "value" => value.to_s
+            }
+          }
+        end
+      end
+    end
+
     def parse_path(path)
       # op://Vault/Item or connect://Vault/Item
       match = path.match(/\A(?:op|connect):\/\/([^\/]+)\/([^\/]+)(?:\/(.+))?\z/)

data/lib/opdotenv/loader.rb

@@ -26,13 +26,26 @@ module Opdotenv
       item_hash = parse_json_safe(raw_json)
 
       item_hash["fields"]&.each_with_object({}) do |field, env_data|
-        label = field["label"] || field["id"]
-        next unless label
-        next if field["purpose"] == NOTES_PURPOSE # skip notesPlain when fetching all
-        env_data[label.to_s] = (field["value"] || "").to_s
+        entry = field_env_entry(field)
+        next unless entry
+
+        env_data[entry[:key]] = entry[:value]
       end || {}
     end
 
+    def self.field_env_entry(field)
+      return nil unless field.is_a?(Hash)
+
+      label = (field["label"] || field["id"])&.strip
+      return nil if label.nil? || label.empty?
+      return nil if field["purpose"] == NOTES_PURPOSE
+
+      value = field["value"]
+      return nil if value.nil? || (value.is_a?(String) && value.strip.empty?)
+
+      {key: label.to_s, value: value.to_s}
+    end
+
     def self.build_field_path(path, field_name)
       # op CLI requires vault/item/field format
       # Avoid duplication if field name already in path

data/lib/opdotenv/op_client.rb

@@ -1,4 +1,5 @@
 require "json"
+require "open3"
 
 module Opdotenv
   class OpClient
@@ -71,11 +72,8 @@ module Opdotenv
 
     def capture(args)
       # Use exec-style array to prevent shell injection
-      # IO.popen with array arguments avoids shell interpretation
-      out = IO.popen(args, err: [:child, :out]) do |io|
-        io.read
-      end
-      status = $CHILD_STATUS
+      # Open3.capture2e captures both stdout and stderr, and properly returns exit status
+      out, status = Open3.capture2e(*args)
 
       # For JSON output, try to parse even if exit code is non-zero
       # Some op commands may return non-zero but still output valid JSON
@@ -88,10 +86,10 @@ module Opdotenv
         end
       end
 
-      if status.nil? || !status.success?
+      unless status.success?
         # Never leak command output in error messages for security
         # Extract safe error information without exposing secrets
-        exit_code = status&.exitstatus || "unknown"
+        exit_code = status.exitstatus
         command_name = args.first || "op"
         raise OpError, "Command failed: #{command_name} (exit code: #{exit_code})"
       end

data/lib/opdotenv/parsers/dotenv_parser.rb

@@ -2,26 +2,33 @@ module Opdotenv
   module Parsers
     class DotenvParser
       def self.parse(text)
-        env = {}
-        text.to_s.each_line do |line|
-          line = line.strip
-          next if line.empty? || line.start_with?("#")
-          # Support KEY=VALUE and KEY="VALUE"; ignore export prefix
-          line = line.sub(/^export\s+/, "")
-          if (m = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\z/))
-            key = m[1]
-            raw = m[2]
-            value = if raw.start_with?("\"") && raw.end_with?("\"")
-              raw[1..-2].gsub('\\"', '"')
-            elsif raw.start_with?("'") && raw.end_with?("'")
-              raw[1..-2]
-            else
-              raw
-            end
-            env[key] = value
-          end
+        text.to_s.each_line.with_object({}) do |line, env|
+          entry = parse_line(line)
+          next unless entry
+
+          env[entry[:key]] = entry[:value]
+        end
+      end
+
+      def self.parse_line(line)
+        line = line.strip
+        return nil if line.empty? || line.start_with?("#")
+
+        line = line.sub(/^export\s+/, "")
+        match = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\z/)
+        return nil unless match
+
+        {key: match[1], value: unquote_value(match[2])}
+      end
+
+      def self.unquote_value(raw)
+        if raw.start_with?("\"") && raw.end_with?("\"")
+          raw[1..-2].gsub('\\"', '"')
+        elsif raw.start_with?("'") && raw.end_with?("'")
+          raw[1..-2]
+        else
+          raw
         end
-        env
       end
     end
   end

data/lib/opdotenv/source_parser.rb

@@ -19,18 +19,17 @@ module Opdotenv
 
       path = source.to_s
       _, item = parse_op_path(path)
-
-      # Extract item name and potential field name
-      # Handle paths like "op://Vault/Item" or "op://Vault/Item Name/field"
       item_parts = item.split("/")
       item_name = item_parts.first
       field_name = (item_parts.length > 1) ? item_parts[1] : nil
 
-      # First check if field name is provided with extension in the path
+      build_parsed_source(path, item_name, field_name)
+    end
+
+    def build_parsed_source(path, item_name, field_name)
       if field_name
         field_type = FormatInferrer.infer_from_name(field_name)
         {path: path, field_name: field_name, field_type: field_type}
-      # If no field name in path, infer from item name patterns
       elsif (field_type = FormatInferrer.infer_from_name(item_name))
         {path: path, field_name: NOTES_PLAIN_FIELD, field_type: field_type}
       else
@@ -66,6 +65,6 @@ module Opdotenv
       }
     end
 
-    module_function :normalize_hash
+    module_function :normalize_hash, :build_parsed_source
   end
 end

data/lib/opdotenv/version.rb

@@ -1,3 +1,3 @@
 module Opdotenv
-  VERSION = "1.0.2"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: opdotenv
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
-- amkisko
+- Andrei Makarov
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -19,7 +19,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -35,42 +35,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: polyrun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +115,20 @@ dependencies:
         version: '3'
 - !ruby/object:Gem::Dependency
   name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.52'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.52'
+- !ruby/object:Gem::Dependency
+  name: standard-custom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -113,20 +141,104 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: standard-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: standard-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: standard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.33'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.33'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-thread_safety
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -147,28 +259,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
@@ -211,13 +323,13 @@ files:
 - lib/opdotenv/railtie.rb
 - lib/opdotenv/source_parser.rb
 - lib/opdotenv/version.rb
-homepage: https://github.com/amkisko/opdotenv
+homepage: https://github.com/amkisko/opdotenv.rb
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/amkisko/opdotenv
-  changelog_uri: https://github.com/amkisko/opdotenv/blob/main/CHANGELOG.md
-  bug_tracker_uri: https://github.com/amkisko/opdotenv/issues
+  source_code_uri: https://github.com/amkisko/opdotenv.rb
+  changelog_uri: https://github.com/amkisko/opdotenv.rb/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/amkisko/opdotenv.rb/issues
 rdoc_options: []
 require_paths:
 - lib