cocoapods-bazel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85537880f86a7c5c9b15a1db278672ae4b1f27c3ead44e3498b653267e66db77
-  data.tar.gz: 07f5bc07ca05a3fd382588ca0be1d85218b3ff8232e60a1cb477953480c3403b
+  metadata.gz: 3286b561998f4b34e299da4b3d8214ff2fe4d81446c1fc7ec71752a2c992052d
+  data.tar.gz: 969cb842bba28405f2d0c9450eaccf6e7914925754ccb6e5b40e55ee890f28a8
 SHA512:
-  metadata.gz: 48e0089179b162707d5219cadde68f2e98b80c38acbc48a94be25605d3532e5174b6b2c4d8b05da03597c76df46b17ccc8a91e4fe682678257b7662892ba4c5b
-  data.tar.gz: 141015e3c549842a5a72ef8ed391351230fc163d99d26072df2e1748c97b0002857628e760bc646833fceb6a57cca1ddd736e85c85ec2125ff0b91552f104db0
+  metadata.gz: 4b004b7b58351034111a546e53f0884257511de7ba3506c7e711000ea860e0e16d95bfd85b5091fc369eed434c7d32e102e4216b65fdaca6c17bae54da226795
+  data.tar.gz: 90bc0315f257f0157c17c0f1da74edea822e8593a81f4ef786adef96c2059f78f5e2e91525a79a488029791d614838a83062f4eb083509e5e784108b44074eb0

data/.gitignore

@@ -13,3 +13,4 @@ Gemfile.lock
 .rspec_status
 
 .DS_Store
+.idea

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.1.4
+
+* Fix issues with glob evaluation (#64, #65)
+* Get specs running on M1 hardware (#73)
+* Expose CocoaPods environment variables PODS_ROOT and PODS_TARGET_SRCROOT (#67)
+* Mark app specs with public visibility for usage as test apps (#77)
+* README updates for buildifier option and link fixing (#69, #78)
+* Remove non-existent globs to support using --incompatible_disallow_empty_glob (#80, #79)
+
 0.1.3
 
 * Add ability to insert a docstring at top of generated build files (#58)
@@ -9,4 +18,4 @@
 
 0.1.1
 
-* Raise error and offer suggestion if pod path is outside of current workspace
+* Raise error and offer suggestion if pod path is outside of current workspace

data/README.md

@@ -2,7 +2,9 @@
 ![](https://github.com/ob/cocoapods-bazel/workflows/master/badge.svg)
 
 
-Cocoapods::Bazel is a Cocoapods plugin that makes it easy to use [Bazel](https://bazel.build) instead of Xcode to build your iOS project. It automatically generates Bazel's `BUILD.bazel` files. It uses [`rules_ios`](https://github.com/ob/rules_ios) so you need to set up the `WORKSPACE` file following the instructions in the [`README`](https://github.com/ob/rules_ios/blob/master/README.md).
+Cocoapods::Bazel is a Cocoapods plugin that makes it easy to use [Bazel](https://bazel.build) instead of Xcode to build your iOS project. It automatically generates Bazel's `BUILD` files.
+
+`cocoapods-bazel` can be setup to translate CocoaPod targets to provided Bazel rules. For example, you can use `cocaopods-bazel` to load framework targets using [rules_ios](https://github.com/bazel-ios/rules_ios). It's also flexible enough to allow users to use their own custom rules if needed.
 
 > :warning: **This is alpha software.** We are developing this plugin in the open so you should only use it if you know what you are doing and are willing to help develop it.
 
@@ -16,19 +18,23 @@ gem 'cocoapods-bazel'
 
 And then execute:
 
-    $ bundle
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install cocoapods-bazel
+```sh
+gem install cocoapods-bazel
+```
 
 ## Usage
 
-This plugin will run extra steps after post_install to generate BUILD.bazel files for Bazel.
+This plugin will run extra steps after post_install to generate `BUILD` files for Bazel.
 
-To enable the plugin, simply add the following section to your `Podfile`
+To enable the plugin, you can add something like the following section to your `Podfile`:
 
-```
+```ruby
 plugin 'cocoapods-bazel', {
   rules: {
     'apple_framework' => { load: '@build_bazel_rules_ios//rules:framework.bzl', rule: 'apple_framework' }.freeze,
@@ -50,9 +56,19 @@ There are some experimental features that are opt-in and can be enabled adding t
 
 Note that tests for the experimental features are located under `spec/integration/experimental_features` and these should mostly replicate the tests under `spec/integration/monorepo` but with the features on. Also it's a place to create tests specific to a experimental feature that not necessarily will affect the default usage of `cocoapods-bazel`.
 
+## BUILD file formatting
+
+When the `BUILD.bazel` files are generated you may choose to have `cocoapods-bazel` format the files using [buildifier](https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md). This formatting is enabled by default if a `buildifier` executable is found using `which buildifier`.
+
+You can disable buildifier formatting with `buildifier: false` in the options of the `cocoapods-bazel` plugin.
+
+Additionally, if you'd like to use a custom `buildifier` executable you can provide the `cocoapods-bazel` plugin options with an array of arguments to execute to format files.
+
+For example, if you have `buildifier` runnable target you've defined in Bazel with the name `buildifier` you can run this specific version with: `buildifier: ['bazel', 'run', 'buildifier', '--']`. (Note the `--` allows bazel to forward arguments to the buildifier target).
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ob/cocoapods-bazel.
+Bug reports and pull requests are welcome on GitHub [here](https://github.com/bazel-ios/cocoapods-bazel).
 
 ## License
 

data/bin/pod_install_bazel_build

@@ -23,4 +23,4 @@ ARGV.replace %w[install]
 
 load Gem.bin_path('cocoapods', 'pod')
 
-exec 'bazelisk', '--ignore_all_rc_files', 'build', '--verbose_failures', '...'
+exec 'bazelisk', '--ignore_all_rc_files', 'build', '--verbose_failures', '--cpu=ios_x86_64', '--experimental_worker_allow_json_protocol', '...'

data/lib/cocoapods/bazel/target.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require_relative 'xcconfig_resolver'
 
 module Pod
@@ -27,8 +29,8 @@ module Pod
 
       include XCConfigResolver
 
-      attr_reader :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config
-      private :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config
+      attr_reader :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
+      private :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
 
       def initialize(installer, pod_target, non_library_spec = nil, default_xcconfigs = {}, experimental_deps_debug_and_release = false)
         @installer = installer
@@ -41,6 +43,7 @@ module Pod
         @default_xcconfigs = default_xcconfigs
         @resolved_xconfig_by_config = {}
         @experimental_deps_debug_and_release = experimental_deps_debug_and_release
+        @relative_sandbox_root = installer.sandbox.root.relative_path_from(installer.config.installation_root).to_s
       end
 
       def bazel_label(relative_to: nil)
@@ -55,7 +58,6 @@ module Pod
       end
 
       def build_settings_label(config)
-        relative_sandbox_root = @installer.sandbox.root.relative_path_from(@installer.config.installation_root).to_s
         cocoapods_bazel_path = File.join(relative_sandbox_root, 'cocoapods-bazel')
 
         "//#{cocoapods_bazel_path}:#{config}"
@@ -342,7 +344,7 @@ module Pod
           fa.spec_consumer.resource_bundles.each do |name, file_patterns|
             bundle = bundles[name] ||= {}
             patterns_by_exclude = bundle[fa.spec_consumer.exclude_files] ||= []
-            patterns_by_exclude.concat(file_patterns.flat_map { |g| expand_glob(g, expand_directories: false) })
+            patterns_by_exclude.concat(file_patterns.flat_map { |g| expand_glob(g, expand_directories: true) })
           end
         end.tap do |bundles|
           kwargs[:resource_bundles] = bundles.map do |bundle_name, patterns_by_excludes|
@@ -521,34 +523,53 @@ module Pod
       def expand_glob(glob, extensions: nil, expand_directories: false)
         if (m = glob.match(/\{([^\{\}]+)\}/))
           m[1].split(',').flat_map do |alt|
-            expand_glob("#{m.pre_match}#{alt}#{m.post_match}")
+            expand_glob("#{m.pre_match}#{alt.strip}#{m.post_match}", extensions: extensions, expand_directories: expand_directories)
           end.uniq
         elsif (m = glob.match(/\[([^\[\]]+)\]/))
           m[1].each_char.flat_map do |alt|
-            expand_glob("#{m.pre_match}#{alt}#{m.post_match}")
+            expand_glob("#{m.pre_match}#{alt.strip}#{m.post_match}", extensions: extensions, expand_directories: expand_directories)
           end.uniq
         elsif extensions && File.extname(glob).empty?
           glob = glob.chomp('**/*') # If we reach here and the glob ends with **/*, we need to avoid duplicating it (we do not want to end up with **/*/**/*)
           if File.basename(glob) == '*'
-            extensions.map { |ext| "#{glob}.#{ext}" }
+            extensions.map do |ext|
+              combined = "#{glob}.#{ext}"
+              combined if Dir.glob(File.join(@package_dir, combined)).any?
+            end.compact
           else
             extensions.map do |ext|
-              File.join(glob, '**', "*.#{ext}")
-            end
+              combined = File.join(glob, '**', "*.#{ext}")
+              combined if Dir.glob(File.join(@package_dir, combined)).any?
+            end.compact
           end
         elsif expand_directories
           if glob.end_with?('/**/*')
-            [glob]
+            glob_with_valid_matches(glob)
           elsif glob.end_with?('/*')
             [glob.sub(%r{/\*$}, '/**/*')]
+          elsif should_skip_directory_expansion(glob)
+            glob_with_valid_matches(glob)
           else
-            [glob, glob.chomp('/') + '/**/*']
+            [glob.chomp('/') + '/**/*']
           end
         else
-          [glob]
+          glob_with_valid_matches(glob)
         end
       end
 
+      # Returns `[glob]` if the given pattern has at least 1 match on disk, otherwise returns an empty array
+      def glob_with_valid_matches(glob)
+        Dir.glob(File.join(@package_dir, glob)).any? ? [glob] : []
+      end
+
+      # We should expand only folder globs, not expand file globs.
+      # E.g., xib files glob "*.xib" should not be expanded to "*.xib/**/*", otherise nothing will be matched
+      def should_skip_directory_expansion(glob)
+        extension = File.extname(glob)
+        expansion_extentions = Set['.xcassets', '.xcdatamodeld', '.lproj']
+        !expansion_extentions.include?(extension)
+      end
+
       def rules_ios_platform_name(platform)
         name = platform.string_name.downcase
         return 'macos' if name == 'osx'
@@ -570,7 +591,7 @@ module Pod
       def test_kwargs
         {
           bundle_id: resolved_value_by_build_setting('PRODUCT_BUNDLE_IDENTIFIER'),
-          env: pod_target.scheme_for_spec(non_library_spec).fetch(:environment_variables, {}),
+          env: resolve_env(pod_target.scheme_for_spec(non_library_spec).fetch(:environment_variables, {})),
           infoplists_by_build_setting: pod_target_infoplists_by_build_setting,
           infoplists: common_pod_target_infoplists(additional_plist: nil_if_empty(non_library_spec.consumer(pod_target.platform).info_plist)),
           minimum_os_version: build_os_version || pod_target.deployment_target_for_non_library_spec(non_library_spec),
@@ -578,6 +599,25 @@ module Pod
         }
       end
 
+      # Resolves the given environment by resolving CocoaPod specific environment variables.
+      # Given an environment with unresolved env values, this function resolves them and returns the new env.
+      def resolve_env(env)
+        # These environment variables are resolved by CocoaPods, they tend to be used in tests and other
+        # scripts, as such we must resolve them before translating the targets environment.
+        resolved_cocoapods_env = {
+          'PODS_ROOT' => "//#{relative_sandbox_root}",
+          'PODS_TARGET_SRCROOT' => ':'
+        }.freeze
+
+        # Removes the : bazel prefix for current directory.
+        sub_prefix = ->(s) { s.sub(%r{\A:/}, '') }
+
+        env.each_with_object({}) do |(k, v), resolved_env|
+          resolved_val = Pod::Bazel::Util.resolve_value(v, resolved_values: resolved_cocoapods_env)
+          resolved_env[k] = sub_prefix[resolved_val]
+        end
+      end
+
       def build_os_version
         # If there's a SWIFT_DEPLOYMENT_TARGET version set, use that for the
         # minimum version. It's not currently supported or desirable in rules_ios to have
@@ -621,7 +661,8 @@ module Pod
           settings_bundle: [],
           strings: [],
           version: [],
-          watch_application: []
+          watch_application: [],
+          visibility: ['//visibility:public']
         }
 
         # If the user has set a different build os set that here

data/lib/cocoapods/bazel/util.rb

@@ -10,6 +10,18 @@ module Pod
         sort_keys.sort_by { |k| [k.phase, k.split, k.value, k.original_index] }.map(&:value)
       end
 
+      # Recursively resolves the variables in string with the given resolved values.
+      #
+      # Example: Given string = "${PODS_ROOT}/Foo", resolved_values = {"PODS_ROOT": "//Pods"}
+      # this function returns "//Pods/Foo".
+      def resolve_value(string, resolved_values:)
+        return string unless string =~ /\$(?:\{([_a-zA-Z0-0]+?)\}|\(([_a-zA-Z0-0]+?)\))/
+
+        match, key = Regexp.last_match.values_at(0, 1, 2).compact
+        sub = resolved_values.fetch(key, '')
+        resolve_value(string.gsub(match, sub), resolved_values: resolved_values)
+      end
+
       class SortKey
         attr_reader :phase, :split, :value, :original_index
 

data/lib/cocoapods/bazel/version.rb

@@ -2,6 +2,6 @@
 
 module Pod
   module Bazel
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/cocoapods/bazel/xcconfig_resolver.rb

@@ -8,8 +8,10 @@ module Pod
       def resolved_build_setting_value(setting, settings:)
         return unless (value = settings[setting])
 
+        # Removes the : bazel prefix for current directory.
         sub_prefix = ->(s) { s.sub(%r{\A:/}, '') }
-        resolved = resolve_string_with_build_settings(value, settings: settings)
+
+        resolved = Pod::Bazel::Util.resolve_value(value, resolved_values: settings)
         if Pod::Target::BuildSettings::PLURAL_SETTINGS.include?(setting)
           resolved.shellsplit.reject(&:empty?).map(&sub_prefix)
         else
@@ -17,20 +19,13 @@ module Pod
         end
       end
 
-      def resolve_string_with_build_settings(string, settings:)
-        return string unless string =~ /\$(?:\{([_a-zA-Z0-0]+?)\}|\(([_a-zA-Z0-0]+?)\))/
-
-        match, key = Regexp.last_match.values_at(0, 1, 2).compact
-        sub = settings.fetch(key, '')
-        resolve_string_with_build_settings(string.gsub(match, sub), settings: settings)
-      end
-
       UNRESOLVED_SETTINGS = [
         'CONFIGURATION', # not needed, only used to help resolve other settings that may use it in substitutions
         'HEADER_SEARCH_PATHS', # serialized into copts, handled natively by Xcode instead of via xcspecs
         'OTHER_CFLAGS', # serialized separately as objc_copts
         'OTHER_SWIFT_FLAGS', # serialized separately as swift_copts
         'OTHER_LDFLAGS', # serialized separately as linkopts
+        'PODS_ROOT', # not needed, used to help resolve the Pods root path relative to the current package
         'PODS_TARGET_SRCROOT', # not needed, used to help resolve file references relative to the current package
         'SDKROOT', # not needed since the SDKROOT gets propagated via the apple configuration transition
         'SRCROOT', # not needed, used to help resolve file references relative to the current workspace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bazel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shawn Chen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A plugin for CocoaPods that generates Bazel build files for pods