arkana 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191140e1234c08e36b1d1bb3591bac7b77041edd8b7e00565f15480fd47bfe81
-  data.tar.gz: 8dd30c6bd576db0cd779b3f645cb9ec15541f5189dd71bd461c2f8895334a6e3
+  metadata.gz: 0eebedf149a0b63a1a27a4e7c788918a8c213f65af6ea50a33caae5c01361fa7
+  data.tar.gz: 255c72585235c23af030656e44ef212dd6efccf7873fe69aa6af078369529a64
 SHA512:
-  metadata.gz: a79924122cac3f3a32e471f49218ff85227fab2898821e56436a32d6c8e7e6d8cea1af20538e71eb010383ac47cef7266964ccc1a9251ee058538227ae5a9a2d
-  data.tar.gz: dc8a20dfe2d1650cc14e1d3e8d24733229a795f8b6471272ff8d67cdaf72fd453925ea50d35d86386dfb1419c05fbf8910b8a7dbacbce4d80febed50883465cc
+  metadata.gz: df602733de90c8035aa1709b5271f7f6b12cbca6c1fd67a53f6dc1ddc17cdcc6d73f63ee5ed5d6a3040d8cc06c0c3842e724e40a8c50a4799c4d211a1af162ac
+  data.tar.gz: f088cc8cacfed6c9561c3db34fd3a9161624ca29f5c89db1dc50db125e38e22216f06581ad9034824f8611121d03051607ea02b0b99c7ec34645f81bf2820a25

data/lib/arkana/config_parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "yaml"
+require "yaml" unless defined?(YAML)
 require_relative "models/config"
 require_relative "helpers/ui"
 

data/lib/arkana/encoder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "arkana/helpers/string"
+require_relative "helpers/string"
 
 # The encoder is responsible for finding the env vars for given keys, encoding them, and creating Secrets based on the generated data.
 module Encoder

data/lib/arkana/kotlin_code_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require_relative "helpers/string"
 
 # Responsible for generating Kotlin source and test files.
@@ -9,22 +9,27 @@ module KotlinCodeGenerator
   # Generates Kotlin code and test files for the given template arguments.
   def self.generate(template_arguments:, config:)
     kotlin_module_dir = config.result_path
-    kotlin_sources_dir = File.join(kotlin_module_dir, "src", "main", config.kotlin_sources_path, config.kotlin_package_name.split("."))
-    kotlin_tests_dir = File.join(kotlin_module_dir, "src", "test", config.kotlin_sources_path, config.kotlin_package_name.split("."))
+
+    source_set = config.is_kotlin_multiplatform_module ? "commonMain" : "main"
+    test_set = config.is_kotlin_multiplatform_module ? "commonTest" : "test"
+
+    kotlin_sources_dir = File.join(kotlin_module_dir, "src", source_set, config.kotlin_sources_path, config.kotlin_package_name.split("."))
+    kotlin_tests_dir = File.join(kotlin_module_dir, "src", test_set, config.kotlin_sources_path, config.kotlin_package_name.split("."))
 
     if config.should_generate_gradle_build_file
-      set_up_kotlin_module(kotlin_module_dir, template_arguments)
+      set_up_kotlin_module(kotlin_module_dir, template_arguments, config)
     end
 
     set_up_kotlin_interfaces(kotlin_sources_dir, template_arguments, config)
     set_up_kotlin_classes(kotlin_sources_dir, kotlin_tests_dir, template_arguments, config)
   end
 
-  def self.set_up_kotlin_module(path, template_arguments)
+  def self.set_up_kotlin_module(path, template_arguments, config)
     dirname = File.dirname(__FILE__)
     sources_dir = path
     readme_template = File.read("#{dirname}/templates/readme.erb")
-    source_template = File.read("#{dirname}/templates/kotlin/build.gradle.kts.erb")
+    gradle_template_file = config.is_kotlin_multiplatform_module ? "build_kmp.gradle.kts.erb" : "build.gradle.kts.erb"
+    source_template = File.read("#{dirname}/templates/kotlin/#{gradle_template_file}")
     FileUtils.mkdir_p(path)
     render(readme_template, template_arguments, File.join(path, "README.md"))
     render(source_template, template_arguments, File.join(sources_dir, "build.gradle.kts"))

data/lib/arkana/models/config.rb

@@ -34,6 +34,8 @@ class Config
   attr_reader :should_generate_gradle_build_file
   # @returns [int]
   attr_reader :kotlin_jvm_toolchain_version
+  # @returns [boolean]
+  attr_reader :is_kotlin_multiplatform_module
 
   # @returns [string]
   attr_accessor :current_flavor
@@ -64,6 +66,8 @@ class Config
     @should_generate_gradle_build_file = yaml["should_generate_gradle_build_file"]
     @should_generate_gradle_build_file = true if @should_generate_gradle_build_file.nil?
     @kotlin_jvm_toolchain_version = yaml["kotlin_jvm_toolchain_version"] || 11
+    @is_kotlin_multiplatform_module = yaml["is_kotlin_multiplatform_module"]
+    @is_kotlin_multiplatform_module = false if @should_generate_gradle_build_file.nil?
   end
   # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 

data/lib/arkana/models/template_arguments.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "arkana/models/secret"
+require_relative "secret"
 
 # A class that defines template arguments in a language-agnostic form.
 class TemplateArguments

data/lib/arkana/salt_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 require_relative "models/salt"
 
 # Responsible for generating the salt.

data/lib/arkana/swift_code_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require_relative "helpers/string"
 
 # Responsible for generating Swift source and test files.

data/lib/arkana/templates/kotlin/arkana.kt.erb

@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 <% # TODO: Sort these import statements alphabetically %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
@@ -13,7 +13,7 @@ object <%= @namespace %> {
         val decoded = encoded.mapIndexed { index, item ->
             (item xor cipher[(index % cipher.size)]).toByte()
         }.toByteArray()
-        return decoded.toString(Charsets.UTF_8)
+        return decoded.decodeToString()
     }
 
     internal fun decodeInt(encoded: List<Int>, cipher: List<Int>): Int {

data/lib/arkana/templates/kotlin/arkana_protocol.kt.erb

@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 package <%= @kotlin_package_name %>

data/lib/arkana/templates/kotlin/arkana_tests.kt.erb

@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 package <%= @kotlin_package_name %>

data/lib/arkana/templates/kotlin/build_kmp.gradle.kts.erb

@@ -0,0 +1,28 @@
+// DO NOT MODIFY
+// Automatically generated by Arkana (https://github.com/rogerluan/arkana)
+
+plugins {
+    id("org.jetbrains.kotlin.multiplatform")
+}
+
+kotlin {
+    jvm()
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    linuxX64()
+    js {
+        browser()
+        nodejs()
+    }
+
+    sourceSets {
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+    }
+
+    jvmToolchain(<%= @kotlin_jvm_toolchain_version %>)
+}

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

@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/swift_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/swift_template_helper" %>
 <% # TODO: Sort these import statements alphabetically %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)

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

@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/swift_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/swift_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 

data/lib/arkana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arkana
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Roger Oba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -84,6 +84,7 @@ files:
 - lib/arkana/templates/kotlin/arkana_protocol.kt.erb
 - lib/arkana/templates/kotlin/arkana_tests.kt.erb
 - lib/arkana/templates/kotlin/build.gradle.kts.erb
+- lib/arkana/templates/kotlin/build_kmp.gradle.kts.erb
 - lib/arkana/templates/readme.erb
 - lib/arkana/templates/swift/arkana.podspec.erb
 - lib/arkana/templates/swift/arkana.swift.erb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Store your keys and secrets away from your source code. Designed for Android