Test and app specs base support (sergiikhliustin#112)

* Test and app specs base support

* Update tests

* Fix integration tests

Author: sergiikhliustin

.swiftlint.yml

@@ -9,6 +9,7 @@ disabled_rules:
 - operator_whitespace
 - nesting
 - file_length
+- type_name
 
 line_length:
   ignores_comments: true
@@ -19,5 +20,5 @@ force_cast:
 force_try:
   severity: warning
 function_parameter_count:
-  warning: 8
-  error: 10
+  warning: 10
+  error: 12

Makefile

@@ -38,7 +38,7 @@ integration:
 
 prepare-tests:
 	swift TestTools/generate_podfile.swift TestTools/Pods.json TestTools/Podfile_template > Tests/Podfile
-	cd Tests && pod install || pod install --repo-update
+	cd Tests && bundle exec pod install || bundle exec pod install --repo-update
 	bazel run :bazelpods $(CONFIG) -- \
 	--src "$(shell pwd)/Tests" \
 	--deps-prefix "//Tests/Pods" \
@@ -93,7 +93,7 @@ record-tests:
 
 integration-setup:
 	swift TestTools/generate_podfile.swift TestTools/Pods_Integration.json TestTools/Podfile_template > IntegrationTests/Podfile
-	cd IntegrationTests && pod install
+	cd IntegrationTests && bundle exec pod install
 	swift TestTools/generate_buildfile.swift TestTools/Pods_Integration.json TestTools/BUILD_template //IntegrationTests > IntegrationTests/BUILD.bazel
 
 integration-generate-static:

README.md

@@ -16,13 +16,15 @@ Core idea, Podspec parser, Starlark compiler are forked from [PodToBUILD](https:
 | vendored frameworks                                                             | ✅   | ❓     | ❓      | ❓   |
 | vendored xcframeworks                                                           | ✅   | ❓     | ❓      | ❓   |
 | bundles and resources                                                           | ✅   | ❓     | ❓      | ❓   |
-| [rules_xcodeproj](https://github.com/buildbuddy-io/rules_xcodeproj)             | ✅   | ❓     | ❓      | ❓   |
+| [rules_xcodeproj](https://github.com/MobileNativeFoundation/rules_xcodeproj)    | ✅   | ❓     | ❓      | ❓   |
+| tests specs                                                                     | Beta   | ❓     | ❓      | ❓   |
+| app specs                                                                       | Beta   | ❓     | ❓      | ❓   |
 
-###### ✅ - full support (report issues if no), 🔜 - not yet supported, ❓ - unknown, ❌ - not supported
+###### ✅ - full support (report issues if no),  🔜 - not yet supported, ❓ - unknown, ❌ - not supported
 
   - [x] Autodetect vendored frameworks and libs architectures and ignore unsupported
   - [x] Local pods with custom paths, private pods (resolved by CocoaPods)
-  - [ ] Nested subspecs (possibly works, but not tested yet)
+  - [x] Test and app specs 🚀
 
  ### 🎸 Let's rock
 Don't forget to setup [`rules_ios`](https://github.com/bazel-ios/rules_ios) and [`rules_apple`](https://github.com/bazelbuild/rules_apple) first.
@@ -92,19 +94,24 @@ OPTIONS:
                           If 'user_options' not specified, but --user_options exist, user_options patch are applied automatically.
   --user-options <user-options>
                           User extra options.
-                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic'.
+                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'runner'.
                           Supported operators: '+=' (append), '-=' (delete), ':=' (replace).
                           Example:
                           'SomePod.sdk_dylibs += something,something'
                           'SomePod.testonly := true'
                           Platform specific:
                           'SomePod.platform_ios.sdk_dylibs += something,something'
+                          For test specs:
+                          'SomePod/UnitTests.runner := //:SomeTestsRunner'
   --deps-prefix <deps-prefix>
                           Dependencies prefix (default: //Pods)
   --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)
   -f, --frameworks        Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)
   --no-concurrency        Disable concurrency.
   --log-level <log-level> Log level (debug|info|warning|error|none) (default: info)
+  --use-bundler           Option to use `bundle exec` for `pod` calls
+  --tests-timeout <tests-timeout>
+                          (Optional) Default timeout for test targets (short|moderate|long|eternal)
   --pods-json <pods-json> Pods.json (default: Pods/Pods.json)
   --print-output          Print BUILD files contents to terminal output
   --dry-run               Dry run. Files will not be written
@@ -117,7 +124,7 @@ Compile
 ```
 OVERVIEW: Compiles podspec.json to BUILD file
 
-USAGE: bazelpods compile --src <src> [--platforms <platforms> ...] [--min-ios <min-ios>] [--patches <patches> ...] [--user-options <user-options> ...] [--deps-prefix <deps-prefix>] [--pods-root <pods-root>] [--frameworks] [--no-concurrency] [--log-level <log-level>] --podspec <podspec> [--subspecs <subspecs> ...]
+USAGE: bazelpods compile [<options>] --src <src> --podspec <podspec>
 
 OPTIONS:
   --src <src>             Sources root where Pods directory located (or renamed by podsRoot)
@@ -130,19 +137,24 @@ OPTIONS:
                           If 'user_options' not specified, but --user_options exist, user_options patch are applied automatically.
   --user-options <user-options>
                           User extra options.
-                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic'.
+                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'runner'.
                           Supported operators: '+=' (append), '-=' (delete), ':=' (replace).
                           Example:
                           'SomePod.sdk_dylibs += something,something'
                           'SomePod.testonly := true'
                           Platform specific:
                           'SomePod.platform_ios.sdk_dylibs += something,something'
+                          For test specs:
+                          'SomePod/UnitTests.runner := //:SomeTestsRunner'
   --deps-prefix <deps-prefix>
                           Dependencies prefix (default: //Pods)
   --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)
   -f, --frameworks        Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)
   --no-concurrency        Disable concurrency.
   --log-level <log-level> Log level (debug|info|warning|error|none) (default: info)
+  --use-bundler           Option to use `bundle exec` for `pod` calls
+  --tests-timeout <tests-timeout>
+                          (Optional) Default timeout for test targets (short|moderate|long|eternal)
   --podspec <podspec>     podspec.json
   --subspecs <subspecs>   Subspecs list
   -h, --help              Show help information.

Sources/BazelPods/Arm64sim.swift

@@ -13,6 +13,7 @@ import Logger
 extension Platform: ExpressibleByArgument {}
 extension LogLevel: ExpressibleByArgument {}
 extension PatchType: ExpressibleByArgument {}
+extension TestsTimeout: ExpressibleByArgument {}
 
 func absolutePath(_ path: String, base: String) -> String {
     guard !path.starts(with: "/") else { return path }
@@ -101,7 +102,7 @@ struct BazelPods: ParsableCommand {
     static var configuration = CommandConfiguration(
         commandName: "bazelpods",
         abstract: "One more way to convert CocoaPods into Bazel.",
-        subcommands: [Generate.self, Compile.self, Arm64sim.self],
+        subcommands: [Generate.self, Compile.self],
         defaultSubcommand: Generate.self)
 
     struct Options: ParsableArguments {
@@ -137,6 +138,8 @@ Example:
 'SomePod.testonly := true'
 Platform specific:
 'SomePod.platform_ios.sdk_dylibs += something,something'
+For test specs:
+'SomePod/UnitTests.runner := //:SomeTestsRunner'
 """
         )
         var userOptions: [String] = []
@@ -158,5 +161,8 @@ Platform specific:
 
         @Flag(help: "Option to use `bundle exec` for `pod` calls")
         var useBundler: Bool = false
+
+        @Option(help: "(Optional) Default timeout for test targets (\(TestsTimeout.allCases.map({ $0.rawValue }).joined(separator: "|")))")
+        var testsTimeout: TestsTimeout?
     }
 }

Sources/BazelPods/BazelPods.swift

@@ -53,7 +53,8 @@ extension BazelPods {
                                             podsRoot: options.podsRoot,
                                             useFrameworks: options.frameworks,
                                             noConcurrency: options.noConcurrency,
-                                            hostArm64: isHostArm64)
+                                            hostArm64: isHostArm64,
+                                            testsTimeout: options.testsTimeout)
 
             let result = PodBuildFile.with(podSpec: podSpec, buildOptions: options).compile()
             print(result)

Sources/BazelPods/Compile.swift

@@ -127,7 +127,8 @@ extension BazelPods {
                                                  podsRoot: options.podsRoot,
                                                  useFrameworks: options.frameworks,
                                                  noConcurrency: options.noConcurrency,
-                                                 hostArm64: isHostArm64)
+                                                 hostArm64: isHostArm64,
+                                                 testsTimeout: options.testsTimeout)
             let starlarkString = PodBuildFile
                 .with(podSpec: podSpec, buildOptions: buildOptions)
                 .compile()

Sources/BazelPods/Generate.swift

@@ -7,24 +7,25 @@
 
 import Foundation
 
-public struct BaseAnalyzer {
-    public struct Result {
+struct BaseAnalyzer<S: BaseInfoRepresentable> {
+    struct Result {
         let name: String
         let version: String
         let moduleName: String
         let platforms: [String: String]
+        let minimumOsVersion: String
         let swiftVersion: String?
     }
 
     private let platform: Platform
-    private let spec: PodSpec
-    private let subspecs: [PodSpec]
+    private let spec: S
+    private let subspecs: [S]
     private let options: BuildOptions
 
-    public init(platform: Platform,
-                spec: PodSpec,
-                subspecs: [PodSpec],
-                options: BuildOptions) {
+    init(platform: Platform,
+         spec: S,
+         subspecs: [S],
+         options: BuildOptions) {
         self.platform = platform
         self.spec = spec
         self.subspecs = subspecs
@@ -33,14 +34,9 @@ public struct BaseAnalyzer {
 
     public func run() throws -> Result {
         let name = spec.name
-        let version = spec.version ?? "1.0"
+        let version = spec.version
         let platformVersion = try resolvePlatformVersion(platform)
-        let moduleName: String
-        if let specModuleName = spec.moduleName ?? spec.platformRepresentable(platform)?.moduleName {
-            moduleName = specModuleName
-        } else {
-            moduleName = name.replacingOccurrences(of: "-", with: "_")
-        }
+        let moduleName: String = spec.resolveModuleName(platform)
         let platforms = [platform.bazelKey: platformVersion]
         let swiftVersion: String?
         if let versions = spec.attr(\.swiftVersions).platform(platform)??.compactMap({ Double($0) }) {
@@ -60,6 +56,7 @@ public struct BaseAnalyzer {
                       version: version,
                       moduleName: moduleName,
                       platforms: platforms,
+                      minimumOsVersion: platformVersion,
                       swiftVersion: swiftVersion)
     }