ann-flavor-cocoapods 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5bec8aebb837dabd4533a71a696ae1fe9113ddd1d95b3b49eee22ff194405e7
-  data.tar.gz: 954bab0265c7d86d040fd8966c2da8151b31c3ce3bbafb53b2202bc437e9d07e
+  metadata.gz: 65ffc39f0153491522ad751cd067acb59e600473c1aa7ac049b23656f9faafb9
+  data.tar.gz: 18ff13f0444baec5a01211ef9f8fb30beae617d55d8d274b74ca297b0966cd89
 SHA512:
-  metadata.gz: 495a5336025cad8291ea230a84d4162a5035e0213637bb4de858adea816f08100df2fa586f3200abc29a591e9e8286777931066b5c1c1dc2d7cb94a1811a0012
-  data.tar.gz: 2bdf9dc302e811bfab9eb0ad502e6d757f1c2fb24e4029c2680f28c66985f0063802d602a82d0d7519f753c2cf2081e091c5a24198c5f4c01c353987a3a77495
+  metadata.gz: 9d9db39720735e4d45b88369421bb0f18739dd857d18528370a408e706d71b1765790aff0190c9525b1979202a2b1bed1491df16522c135b482e9810a537485f
+  data.tar.gz: d57728fec0711d043df83d72a9ea0766e297568baff91f59ffdc464076d6dedb7e18f4523d39d3836b7e920dbde7d430f0e246ce103b8492011d05d394447df4

data/CHANGELOG.md

@@ -0,0 +1,63 @@
+# Changelog
+
+## 0.1.8
+
+### Added
+- **DEF-017**: `ann-ios-flavorize setup` CLI command for iOS-only (non-Flutter)
+  projects. Checks `annspec.yaml` exists, patches `ios/Podfile` with
+  `plugin 'ann-ios-flavorize'`, and prints next-step guidance. Idempotent —
+  safe to run multiple times. Install via `gem 'ann-flavor-cocoapods'` in your
+  Gemfile, then run `bundle exec ann-ios-flavorize setup`.
+
+### Fixed
+- **DEF-014**: `configure_firebase` now injects build phases in `project_id` mode
+  (no `config_file` set). The plist source is derived from
+  `lib/generated/firebase/GoogleService-Info-{flavor}-{buildType}.plist`.
+  Previously no build phases were injected, causing the Crashlytics dSYM upload
+  run script to fail with a missing plist error.
+
+---
+
+## 0.1.7
+
+**Backwards-compatibility shims removed** — the deprecated `firebase.file` fallback
+and `firebase_token_file` are no longer accepted. Specs must use `config_file` and
+`service_account` directly.
+
+**`service_account` support** — the `service_account` field is read from the spec
+and exported as `GOOGLE_APPLICATION_CREDENTIALS` when invoking Firebase CLI commands.
+
+## 0.1.6
+
+**`enabled: false` support** — when `annspec.yaml` sets `enabled: false`, the
+CocoaPods plugin skips all configuration silently.
+
+**Improved error messages** — field validation errors now include the exact YAML path
+and a fix hint.
+
+## 0.1.5
+
+**Breaking: `annai_app:` root key renamed to `app:`** — `annspec.yaml` files using
+the old `annai_app:` root key must be updated.
+
+## 0.1.4
+
+**Firebase `config_file` support** — the podfile helper now reads the `config_file`
+field. The old `file` field is accepted with a deprecation warning; support will be
+removed in a future version.
+
+**Firebase `path` / `firebase_app_id` / `build_target` removed** — replaced by
+`config_file` and `project_id`.
+
+## 0.1.3
+
+**Schema restructure** — credentials and sdk fields reorganised to match the updated
+`annspec.yaml` structure.
+
+## 0.1.2
+
+Documentation and sync-workflow updates. No user-facing behaviour changes.
+
+## 0.1.1
+
+Initial release.

data/ann-flavor-cocoapods.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = ["ann-ios-flavorize"]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "cocoapods", ">= 1.12"

data/exe/ann-ios-flavorize

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'ann_flavor_cocoapods'
+
+HELP = <<~HELP
+  ann-ios-flavorize — iOS-only setup for ann-flavor-cocoapods
+
+  Usage:
+    bundle exec ann-ios-flavorize setup [--project DIR]
+
+  Commands:
+    setup   Patch ios/Podfile to add the ann-ios-flavorize plugin line.
+            Run once per project; idempotent on subsequent runs.
+
+  Options:
+    --project DIR   Project root directory (default: current directory)
+    --help          Show this help
+HELP
+
+def run(argv)
+  command   = nil
+  root      = Dir.pwd
+
+  i = 0
+  while i < argv.length
+    case argv[i]
+    when 'setup'
+      command = :setup
+    when '--project'
+      i += 1
+      root = argv[i] || Dir.pwd
+    when '--help', '-h'
+      puts HELP
+      exit 0
+    end
+    i += 1
+  end
+
+  if command.nil?
+    puts HELP
+    exit 1
+  end
+
+  case command
+  when :setup
+    run_setup(root)
+  end
+end
+
+def run_setup(root)
+  annspec = File.join(root, 'annspec.yaml')
+  unless File.exist?(annspec)
+    warn "✗  annspec.yaml not found in #{root}"
+    warn "   Run ann-ios-flavorize from your Flutter project root, or use --project <dir>."
+    exit 1
+  end
+
+  podfile_path = File.join(root, 'ios', 'Podfile')
+  unless File.exist?(podfile_path)
+    warn "✗  ios/Podfile not found in #{root}"
+    warn "   Create an iOS Flutter project first, then re-run this command."
+    exit 1
+  end
+
+  plugin_line = "plugin 'ann-ios-flavorize'"
+  content     = File.read(podfile_path)
+
+  if content.include?(plugin_line)
+    puts "✓  ios/Podfile already has #{plugin_line} — nothing to do."
+    puts "Next: run `bundle exec pod install`"
+    return
+  end
+
+  patched = "# Added by ann-flavor-cocoapods — multi-flavor iOS build configuration\n" \
+            "#{plugin_line}\n" + content
+  File.write(podfile_path, patched)
+
+  puts "✓  Podfile patched — #{plugin_line} added"
+  puts "Next: run `bundle exec pod install`"
+end
+
+run(ARGV)

data/lib/ann_flavor_cocoapods/podfile_helper.rb

@@ -2,29 +2,67 @@ require_relative 'spec_loader'
 
 module AnnFlavorCocoapods
   module PodfileHelper
-    # Call inside your Podfile to wire per-flavor Firebase GoogleService-Info.plist.
+    # Call inside your Podfile's post_install hook to wire per-flavor Firebase
+    # GoogleService-Info.plist into the Xcode build.
     #
     # Example Podfile usage:
     #   require 'ann_flavor_cocoapods'
-    #   AnnFlavorCocoapods::PodfileHelper.configure_firebase(self)
+    #   post_install do |installer|
+    #     AnnFlavorCocoapods::PodfileHelper.configure_firebase(installer)
+    #   end
     #
-    def self.configure_firebase(installer_context, project_root: Dir.pwd)
-      spec    = SpecLoader.load(project_root)
+    # For each iOS flavor that has config_file set, this injects two build phases
+    # into the Runner target (or the matching umbrella target):
+    #   - A pre-build shell script that copies the correct plist to
+    #     ${SRCROOT}/Runner/GoogleService-Info.plist at build time.
+    #   - A post-build shell script that removes the copied file so the workspace
+    #     stays clean and a mis-matched plist cannot accidentally survive.
+    #
+    # Gate: only runs when integrations.firebase is true in annspec.yaml.
+    #
+    def self.configure_firebase(installer, project_root: Dir.pwd)
+      spec = SpecLoader.load(project_root)
+
+      # integrations.firebase must be explicitly enabled (REQ-FIRE-00010).
+      return unless spec.dig('app', 'integrations', 'firebase') == true
+
       flavors = SpecLoader.ios_flavors(spec)
       default = SpecLoader.ios_default(spec)
 
+      # Build a map: configuration_name → config_file path.
+      # Xcode configuration names are capitalized: Release-<flavor>, Debug-<flavor>.
+      config_map = {}
       flavors.each do |flavor_key, flavor_cfg|
         merged = default.merge(flavor_cfg || {})
 
-        release_fb   = merged.dig('build_types', 'release', 'firebase') || {}
-        debug_fb     = merged.dig('build_types', 'debug',   'firebase') || {}
-        release_file = release_fb['config_file']
-        debug_file   = debug_fb['config_file'] || release_file
+        default_build_types = default.dig('build_types') || {}
+        flavor_build_types  = (flavor_cfg || {}).dig('build_types') || {}
+        build_types         = default_build_types.merge(flavor_build_types)
+
+        %w[release debug].each do |bt|
+          bt_fb      = build_types.dig(bt, 'firebase') || {}
+          fb_file    = bt_fb['config_file']
+          project_id = bt_fb['project_id']
 
-        next unless release_file
+          if fb_file.nil? && project_id
+            # project_id mode — derive plist from stable generated path.
+            fb_file = "lib/generated/firebase/GoogleService-Info-#{flavor_key}-#{bt}.plist"
+          end
 
-        puts "ann-flavor-cocoapods: #{flavor_key} firebase release=#{release_file} debug=#{debug_file}"
+          next unless fb_file
+
+          # Map Xcode config name (e.g. "Release-ledger_in") → plist path
+          xcode_config = "#{bt.capitalize}-#{flavor_key}"
+          config_map[xcode_config] = fb_file
+
+          warn_if_static_plist(project_root, xcode_config, fb_file)
+        end
       end
+
+      return if config_map.empty?
+      return if installer.nil?
+
+      inject_build_phases(installer, project_root, config_map)
     end
 
     # Returns the bundle ID for a given flavor key, merging defaults.
@@ -61,5 +99,76 @@ module AnnFlavorCocoapods
       bt_suffix   = build_types.dig(build_type.to_s, 'id_suffix') || ''
       "#{base}#{id_suffix}#{bt_suffix}"
     end
+
+    private
+
+    # Warn if a static GoogleService-Info.plist already exists in the project; a
+    # higher-priority static file would shadow the one we copy at build time.
+    def self.warn_if_static_plist(project_root, xcode_config, config_file)
+      static_path = File.join(project_root, 'ios', 'Runner', 'GoogleService-Info.plist')
+      if File.exist?(static_path)
+        puts "ann-flavor-cocoapods WARNING: A static GoogleService-Info.plist exists at " \
+             "ios/Runner/GoogleService-Info.plist. It will be overwritten at build time " \
+             "for configuration '#{xcode_config}' (source: #{config_file}). " \
+             "Remove the static file to silence this warning."
+      end
+    end
+
+    # Injects pre-build and post-build shell script phases into the Runner (or
+    # umbrella) target for every native target that matches the project.
+    def self.inject_build_phases(installer, project_root, config_map)
+      # Build the per-config shell that selects the right source file.
+      # Uses a case statement keyed on $CONFIGURATION (Xcode build setting).
+      case_body = config_map.map do |xcode_config, plist_path|
+        "  #{xcode_config}) SRC_PLIST=\"${SRCROOT}/../#{plist_path}\" ;;"
+      end.join("\n")
+
+      pre_build_script = <<~SHELL
+        # Injected by ann-flavor-cocoapods: copy per-flavor GoogleService-Info.plist
+        case "$CONFIGURATION" in
+        #{case_body}
+          *) echo "ann-flavor-cocoapods: no Firebase plist for $CONFIGURATION"; exit 0 ;;
+        esac
+        DEST="${SRCROOT}/Runner/GoogleService-Info.plist"
+        if [ ! -f "$SRC_PLIST" ]; then
+          echo "ann-flavor-cocoapods ERROR: Firebase plist not found: $SRC_PLIST"
+          exit 1
+        fi
+        cp "$SRC_PLIST" "$DEST"
+        echo "ann-flavor-cocoapods: copied $SRC_PLIST -> $DEST"
+      SHELL
+
+      post_build_script = <<~SHELL
+        # Injected by ann-flavor-cocoapods: remove copied GoogleService-Info.plist after build
+        DEST="${SRCROOT}/Runner/GoogleService-Info.plist"
+        rm -f "$DEST"
+        echo "ann-flavor-cocoapods: removed $DEST"
+      SHELL
+
+      installer.pods_project.targets.each do |target|
+        next unless target.name == 'Pods-Runner'
+
+        # Avoid duplicate injection on repeated pod install runs.
+        next if target.build_phases.any? { |p| p.respond_to?(:shell_script) &&
+                  p.shell_script.include?('ann-flavor-cocoapods: copy per-flavor') }
+
+        pre  = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+        pre.name             = '[ann-flavor] Copy Firebase plist'
+        pre.shell_path       = '/bin/sh'
+        pre.shell_script     = pre_build_script
+        pre.show_env_vars_in_log = '0'
+        target.build_phases.unshift(pre)
+
+        post = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+        post.name            = '[ann-flavor] Remove Firebase plist'
+        post.shell_path      = '/bin/sh'
+        post.shell_script    = post_build_script
+        post.show_env_vars_in_log = '0'
+        target.build_phases << post
+
+        puts "ann-flavor-cocoapods: injected Firebase build phases into #{target.name} " \
+             "(#{config_map.size} configuration(s))"
+      end
+    end
   end
 end

data/lib/ann_flavor_cocoapods/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorCocoapods
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ANN Solutions
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -55,14 +55,17 @@ dependencies:
 description:
 email:
 - support@annaibrands.com
-executables: []
+executables:
+- ann-ios-flavorize
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Rakefile
 - ann-flavor-cocoapods.gemspec
+- exe/ann-ios-flavorize
 - lib/ann_flavor_cocoapods.rb
 - lib/ann_flavor_cocoapods/podfile_helper.rb
 - lib/ann_flavor_cocoapods/spec_loader.rb