arkana 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce80a9e65c8e5657c8b6a911369535704cd614be0933aba04972b0ff593adedf
-  data.tar.gz: 00b7213a6d42eb9ccd3acd3970a8cd520a3452306f60898d02fa3fba22adcb13
+  metadata.gz: eb1bab49c8625e2a2bd1cb8bd378789df20767222714a950028af877a4cfeb81
+  data.tar.gz: 9978033d03df9ea1c29528d8a506e6f82e43040c5675e81e5a84c2dc692a8b59
 SHA512:
-  metadata.gz: bbfcc870b444b746a44c0ae611d92ea7fd62a72c45bc563a9217c1d4a84bfd4eb249ff8a612cb76d1911200f664195a35efb2bb6bf90f75998ddbd4fde039cfa
-  data.tar.gz: e8e57f955a70b2d03b58cc0566cfef9633ce9a78e765d135786c49892880c44ca171a3e2991b5399348c3bd5650b69c52fb2728c80e79eaf06da7ed8c1f93168
+  metadata.gz: 06d2d9248ba8d07e6faa667861a163599e246d61544168d7eebac39e974adf2af0ab4fdf28af7f3582727c4f304dd7d18f3692f7a5b521305865af4df7439e84
+  data.tar.gz: 242062bff10a161e4a5734a828bcebed1694d3de700f2160720e17d87f3566c3ea68406e80f5e1c4c18a74294423df415881e0804ff75853f7ecf78eb410485a

data/lib/arkana/models/config.rb

@@ -24,6 +24,8 @@ class Config
   attr_reader :should_generate_unit_tests
   # @returns [string]
   attr_reader :package_manager
+  # @returns [boolean]
+  attr_reader :should_cocoapods_cross_import_modules
 
   # @returns [string]
   attr_accessor :current_flavor
@@ -45,6 +47,8 @@ class Config
     @should_generate_unit_tests = yaml["should_generate_unit_tests"]
     @should_generate_unit_tests = true if @should_generate_unit_tests.nil?
     @package_manager = yaml["package_manager"] || "spm"
+    @should_cocoapods_cross_import_modules = yaml["should_cocoapods_cross_import_modules"]
+    @should_cocoapods_cross_import_modules = true if @should_cocoapods_cross_import_modules.nil?
   end
   # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 

data/lib/arkana/models/template_arguments.rb

@@ -24,6 +24,8 @@ class TemplateArguments
     @swift_declaration_strategy = config.swift_declaration_strategy
     # Whether unit tests should be generated.
     @should_generate_unit_tests = config.should_generate_unit_tests
+    # Whether cocoapods modules should cross import.
+    @should_cocoapods_cross_import_modules = config.should_cocoapods_cross_import_modules
   end
 
   def environment_protocol_secrets(environment)

data/lib/arkana/templates/arkana.podspec.erb

@@ -12,6 +12,9 @@ Pod::Spec.new do |spec|
   spec.source                = { path: "./" }
   spec.source_files          = 'Sources/**/*.swift'
   spec.ios.deployment_target = '11.0'
+  spec.osx.deployment_target = '11.0'
+  spec.tvos.deployment_target = '11.0'
+  spec.watchos.deployment_target = '4.0'
   spec.swift_version         = '5.0'
 
   spec.dependency '<%= @pod_name %>Interfaces', '~> 1.0.0'

data/lib/arkana/templates/arkana.swift.erb

@@ -5,7 +5,14 @@
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 
 import Foundation
+<% if !@should_cocoapods_cross_import_modules %>
+#if COCOAPODS
+#else
+<% end %>
 import <%= @import_name %>Interfaces
+<% if !@should_cocoapods_cross_import_modules %>
+#endif
+<% end %>
 
 public enum <%= @namespace %> {
     @inline(__always)

data/lib/arkana/templates/arkana_tests.swift.erb

@@ -2,15 +2,29 @@
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 
 import Foundation
+import <%= @import_name %>Interfaces
 import XCTest
 @testable import <%= @import_name %>
 
 
 final class <%= @namespace %>Tests: XCTestCase {
-    private var salt: [UInt8] = [
-        <%= @salt.formatted %>
+    private var salt: [UInt8]!
+    private var globalSecrets: <%= @namespace %>GlobalProtocol!
 
-    ]
+    override func setUp() {
+        super.setUp()
+        salt = [
+            <%= @salt.formatted %>
+
+        ]
+        globalSecrets = <%= @namespace %>.Global()
+    }
+
+    override func tearDown() {
+        globalSecrets = nil
+        salt = nil
+        super.tearDown()
+    }
 
     func test_decodeRandomHexKey_shouldDecode() {
 <% hex_key = SecureRandom.hex(64) %>
@@ -71,4 +85,40 @@ final class <%= @namespace %>Tests: XCTestCase {
         ]
         XCTAssertEqual(<%= @namespace %>.decode(encoded: encoded, cipher: salt), 42)
     }
+
+    func test_encodeAndDecodeValueWithDollarSign_shouldDecode() {
+<% dollar_sign_key = "real_$lim_shady" %>
+<% secret = generate_test_secret(key: dollar_sign_key) %>
+        let encoded: [UInt8] = [
+            <%= secret.encoded_value %>
+
+        ]
+        XCTAssertEqual(<%= @namespace %>.decode(encoded: encoded, cipher: salt), "real_$lim_shady")
+    }
+<% if ENV["ARKANA_RUNNING_CI_INTEGRATION_TESTS"] %>
+
+    func test_decodeEnvVarFromDotfile_withDollarSign__andEscaped_andNoQuotes_shouldDecode() {
+        XCTAssertEqual(globalSecrets.secretWithDollarSignEscapedAndAndNoQuotesKey, "real_$lim_shady")
+    }
+
+    func test_decodeEnvVarFromDotfile_withDollarSign__andEscaped_andDoubleQuotes_shouldDecode() {
+        XCTAssertEqual(globalSecrets.secretWithDollarSignEscapedAndDoubleQuoteKey, "real_$lim_shady")
+    }
+
+    func test_decodeEnvVarFromDotfile_withDollarSign__andNotEscaped_andSingleQuotes_shouldDecode() {
+        XCTAssertEqual(globalSecrets.secretWithDollarSignNotEscapedAndSingleQuoteKey, "real_$lim_shady")
+    }
+
+    func test_decodeEnvVarFromDotfile_withDollarSign__andNotEscaped_andDoubleQuotes_shouldDecodeWithUnexpectedValue() {
+        XCTAssertNotEqual(globalSecrets.secretWithDollarSignNotEscapedAndDoubleQuotesKey, "real_$lim_shady")
+    }
+
+    func test_decodeEnvVarFromDotfile_withDollarSign__andNotEscaped_andNoQuotes_shouldDecodeWithUnexpectedValue() {
+        XCTAssertNotEqual(globalSecrets.secretWithDollarSignNotEscapedAndNoQuotesKey, "real_$lim_shady")
+    }
+
+    func test_decodeEnvVarFromDotfile_withWeirdCharacters_shouldDecode() {
+        XCTAssertEqual(globalSecrets.secretWithWeirdCharactersKey, "` ~ ! @ # % ^ & * ( ) _ - + = { [ } } | : ; ' < , > . ? /")
+    }
+<% end %>
 }

data/lib/arkana/templates/interfaces.podspec.erb

@@ -12,5 +12,8 @@ Pod::Spec.new do |spec|
   spec.source                = { path: "./" }
   spec.source_files          = 'Sources/**/*.swift'
   spec.ios.deployment_target = '11.0'
+  spec.osx.deployment_target = '11.0'
+  spec.tvos.deployment_target = '11.0'
+  spec.watchos.deployment_target = '4.0'
   spec.swift_version         = '5.0'
 end

data/lib/arkana/templates/interfaces_package.swift.erb

@@ -10,6 +10,8 @@ let package = Package(
     platforms: [
         .macOS(.v11),
         .iOS(.v11),
+        .tvOS(.v11),
+        .watchOS(.v4),
     ],
     products: [
         .library(

data/lib/arkana/templates/package.swift.erb

@@ -10,6 +10,8 @@ let package = Package(
     platforms: [
         .macOS(.v11),
         .iOS(.v11),
+        .tvOS(.v11),
+        .watchOS(.v4),
     ],
     products: [
         .library(

data/lib/arkana/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arkana
-  VERSION = "1.3.1"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arkana
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Roger Oba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.9
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="