portage-cli 0.12.0 → 0.13.0

data/lib/portage/cli/payment_methods.rb

@@ -2,19 +2,13 @@ require "json"
 require "fileutils"
 require "securerandom"
 require "uri"
-require "net/http"
 require "portage/ucp"
 require "portage/ucp/client"
-require "portage/ucp/support/connection"
 
-# Buy::PermissiveAuthenticator (adapter-loopback auth) is used by
-# #adapter_session below — not require_relative'd here to avoid a load
-# cycle (buy.rb will require this file too, for PaymentMethods.default);
-# cli.rb requires "cli/buy" before "cli/payment_methods", so it's already
-# loaded by the time #enroll actually runs.
 require_relative "payment_methods/keychain_backend"
 require_relative "payment_methods/secret_service_backend"
 require_relative "payment_methods/env_backend"
+require_relative "adapter_session"
 require_relative "user_agent"
 require_relative "handoff_only"
 
@@ -220,7 +214,8 @@ module Portage
       # Same native-manifest-first, own-store-adapter-fallback discovery as
       # Buy#call — duplicated rather than extracted since Buy's version is
       # entangled with cart/checkout-specific branching this only needs the
-      # session object from.
+      # session object from. The adapter fallback itself is AdapterSession,
+      # shared with HandoffReconciler.
       def discover_session(url)
         native = Portage::Ucp::Client.discover(url, headers: UserAgent.headers)
         native if native
@@ -228,29 +223,11 @@ module Portage
         adapter_session(url)
       end
 
+      # The homepage fetch stays on the :payment route (forced direct unless
+      # a proxy is named for it), redirects included.
       def adapter_session(url)
-        uri = URI.parse(url.to_s =~ %r{\Ahttps?://}i ? url.to_s : "https://#{url}")
-        body, headers = fetch_homepage(uri)
-        platform = body && Portage::Ucp::Resolver.detect_platform(body, headers)
-        return nil unless platform
-
-        env = Portage::Ucp::Resolver.env_for(platform)
-        return nil if Portage::Ucp::Resolver.missing_env(platform, env).any?
-
-        adapter = Portage::Ucp::Resolver.build_adapter(platform, env)
-        Portage::Ucp::Client.for_adapter(adapter, authenticator: Buy::PermissiveAuthenticator.new)
-      rescue StandardError
-        nil
-      end
-
-      def fetch_homepage(uri)
-        response = Portage::Ucp::Support::Connection.start(uri, route: :payment, open_timeout: 5,
-                                                                read_timeout: 5) do |http|
-          http.get(uri.request_uri, UserAgent.headers)
-        end
-        response.is_a?(Net::HTTPSuccess) ? [response.body, response.to_hash] : [nil, {}]
-      rescue StandardError
-        [nil, {}]
+        uri = normalized_uri(url)
+        uri && AdapterSession.call(uri, route: :payment)
       end
 
       def payment_enrollment_advertised?(session)

data/lib/portage/cli/reconcile_notifier.rb

@@ -1,6 +1,7 @@
 require_relative "notifier"
 require_relative "macos_notifier"
 require_relative "reconcile_notify"
+require_relative "money"
 
 module Portage
   module Cli
@@ -55,11 +56,7 @@ module Portage
         parts.join(" — ")
       end
 
-      def format_amount(amount, currency)
-        return nil unless amount
-
-        "#{format('%.2f', amount / 100.0)}#{" #{currency}" if currency}"
-      end
+      def format_amount(amount, currency) = amount && Money.format_amount(amount, currency)
     end
   end
 end

data/lib/portage/cli/setup_wizard/steps/env_keys_step.rb

@@ -0,0 +1,40 @@
+require_relative "../../dot_env"
+
+module Portage
+  module Cli
+    class SetupWizard
+      module Steps
+        # Shared body of the wizard steps that only prompt for a few env vars
+        # and write the answers to ~/.portage/.env (Shipping, SearchKeys,
+        # RetailerKeys). A subclass defines #title, #default_yes?, FIELDS
+        # ({ "ENV_VAR" => "label" }), #intro and #unchanged_message, and
+        # overrides #secret? for fields that must never echo back.
+        class EnvKeysStep
+          def initialize(prompt:) = @prompt = prompt
+
+          def call
+            @prompt.say(intro)
+            assignments = collect
+            return @prompt.say(unchanged_message) if assignments.empty?
+
+            path = DotEnv.update!(assignments)
+            @prompt.say("Saved #{assignments.keys.join(', ')} to #{path} (chmod 600).")
+          end
+
+          private
+
+          def fields = self.class::FIELDS
+          def secret?(_var) = false
+
+          def collect
+            fields.each_with_object({}) do |(var, label), assignments|
+              hint = ENV.fetch(var, nil).to_s.empty? ? "not set" : "already set"
+              answer = secret?(var) ? @prompt.ask_secret(label, hint: hint) : @prompt.ask(label, hint: hint)
+              assignments[var] = answer if answer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/portage/cli/setup_wizard/steps/retailer_keys.rb

@@ -1,4 +1,4 @@
-require_relative "../../dot_env"
+require_relative "env_keys_step"
 
 module Portage
   module Cli
@@ -12,7 +12,7 @@ module Portage
         # setting a key here only makes `find` show more real offers, it
         # never lets `portage buy` complete a purchase at any of these
         # retailers.
-        class RetailerKeys
+        class RetailerKeys < EnvKeysStep
           FIELDS = {
             "WALMART_AFFILIATE_API_KEY" => "Walmart Affiliate API key",
             "EBAY_BROWSE_ACCESS_TOKEN" => "eBay Browse API access token (Buy It Now search only)",
@@ -21,33 +21,21 @@ module Portage
             "AMAZON_CREATORS_ACCESS_TOKEN" => "Amazon Creators API access token"
           }.freeze
 
-          def initialize(prompt:) = @prompt = prompt
-
           def title = "Retailer offer sources"
           def default_yes? = false
 
-          def call
-            @prompt.say("Optional: official buyer-side APIs for Walmart, eBay (Buy It Now only), Best " \
-                        "Buy, Etsy and Amazon. Each needs its own key from that retailer's developer " \
-                        "program — skip any you don't have. None of these ever completes a purchase: " \
-                        "every offer they return still ends in hand-off, same as Amazon today. Neither " \
-                        "key is echoed back; Enter keeps whatever's already set.")
-            assignments = collect
-            return @prompt.say("Left retailer offer source keys unchanged.") if assignments.empty?
-
-            path = DotEnv.update!(assignments)
-            @prompt.say("Saved #{assignments.keys.join(', ')} to #{path} (chmod 600).")
-          end
-
           private
 
-          def collect
-            FIELDS.each_with_object({}) do |(var, label), assignments|
-              hint = ENV.fetch(var, nil).to_s.empty? ? "not set" : "already set"
-              answer = @prompt.ask_secret(label, hint: hint)
-              assignments[var] = answer if answer
-            end
+          def intro
+            "Optional: official buyer-side APIs for Walmart, eBay (Buy It Now only), Best " \
+              "Buy, Etsy and Amazon. Each needs its own key from that retailer's developer " \
+              "program — skip any you don't have. None of these ever completes a purchase: " \
+              "every offer they return still ends in hand-off, same as Amazon today. Neither " \
+              "key is echoed back; Enter keeps whatever's already set."
           end
+
+          def unchanged_message = "Left retailer offer source keys unchanged."
+          def secret?(_var) = true
         end
       end
     end

data/lib/portage/cli/setup_wizard/steps/search_keys.rb

@@ -1,4 +1,4 @@
-require_relative "../../dot_env"
+require_relative "env_keys_step"
 
 module Portage
   module Cli
@@ -10,7 +10,7 @@ module Portage
         # with no URL only ever resolves DuckDuckGo's Instant Answer API,
         # which is keyless but only ever matches a specific brand/product
         # name, not an open-ended query ("coffee", "hiking boots").
-        class SearchKeys
+        class SearchKeys < EnvKeysStep
           FIELDS = {
             "BRAVE_SEARCH_API_KEY" => "Brave Search API key",
             "GOOGLE_CSE_KEY" => "Google Programmable Search API key",
@@ -21,32 +21,20 @@ module Portage
           # only the two API keys are secrets that never echo back.
           SECRET = %w[BRAVE_SEARCH_API_KEY GOOGLE_CSE_KEY].freeze
 
-          def initialize(prompt:) = @prompt = prompt
-
           def title = "Search API keys"
           def default_yes? = true
 
-          def call
-            @prompt.say("DuckDuckGo's free API is already active and needs no key, but only resolves a " \
-                        "specific brand/product name — set either Brave's key, or both Google fields, for " \
-                        "real open-ended search. Neither key is echoed back; Enter keeps whatever's " \
-                        "already set.")
-            assignments = collect
-            return @prompt.say("Left search API keys unchanged.") if assignments.empty?
-
-            path = DotEnv.update!(assignments)
-            @prompt.say("Saved #{assignments.keys.join(', ')} to #{path} (chmod 600).")
-          end
-
           private
 
-          def collect
-            FIELDS.each_with_object({}) do |(var, label), assignments|
-              hint = ENV.fetch(var, nil).to_s.empty? ? "not set" : "already set"
-              answer = SECRET.include?(var) ? @prompt.ask_secret(label, hint: hint) : @prompt.ask(label, hint: hint)
-              assignments[var] = answer if answer
-            end
+          def intro
+            "DuckDuckGo's free API is already active and needs no key, but only resolves a " \
+              "specific brand/product name — set either Brave's key, or both Google fields, for " \
+              "real open-ended search. Neither key is echoed back; Enter keeps whatever's " \
+              "already set."
           end
+
+          def unchanged_message = "Left search API keys unchanged."
+          def secret?(var) = SECRET.include?(var)
         end
       end
     end

data/lib/portage/cli/setup_wizard/steps/shipping.rb

@@ -1,5 +1,5 @@
 require_relative "../../shipping_profile"
-require_relative "../../dot_env"
+require_relative "env_keys_step"
 
 module Portage
   module Cli
@@ -12,7 +12,7 @@ module Portage
         # store prices in no market and can report in-stock items as out of
         # stock (see Doctor#shipping_finding, which this step exists to
         # resolve).
-        class Shipping
+        class Shipping < EnvKeysStep
           LABELS = {
             street_address: "Street address", extended_address: "Apt/suite (optional)",
             address_locality: "City", address_region: "State/region (optional)",
@@ -21,29 +21,15 @@ module Portage
             phone_number: "Phone (optional)"
           }.freeze
 
-          def initialize(prompt:) = @prompt = prompt
+          FIELDS = ShippingProfile::ENV_VARS.to_h { |key, var| [var, LABELS.fetch(key)] }.freeze
 
           def title = "Shipping address"
           def default_yes? = true
 
-          def call
-            @prompt.say("Enter keeps whatever's already set for a field.")
-            assignments = collect
-            return @prompt.say("Left shipping address unchanged.") if assignments.empty?
-
-            path = DotEnv.update!(assignments)
-            @prompt.say("Saved #{assignments.keys.join(', ')} to #{path} (chmod 600).")
-          end
-
           private
 
-          def collect
-            ShippingProfile::ENV_VARS.each_with_object({}) do |(key, var), assignments|
-              hint = ENV.fetch(var, nil).to_s.empty? ? "not set" : "already set"
-              answer = @prompt.ask(LABELS.fetch(key), hint: hint)
-              assignments[var] = answer if answer
-            end
-          end
+          def intro = "Enter keeps whatever's already set for a field."
+          def unchanged_message = "Left shipping address unchanged."
         end
       end
     end

data/lib/portage/cli/version.rb

@@ -1,5 +1,5 @@
 module Portage
   module Cli
-    VERSION = "0.12.0".freeze
+    VERSION = "0.13.0".freeze
   end
 end