ios_polyglot_cli 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b23642507cc002c374b2257e6f1a1c95f0ab86d2eec433e7fc9a62b3cd8f20d
-  data.tar.gz: 7f7e81a449094b690accb5b651f44ba3a7e7f3ab776011907c9a771f868fa44d
+  metadata.gz: 2d9c1b88f95d9b4f4c33dece658b01a6c7e2d2ffbc461869a3819839aac429b3
+  data.tar.gz: 61f1542565c028960d8019ab038fb4b5059990f4260830440a320f21c1e7d2cc
 SHA512:
-  metadata.gz: 6adf6c7c087428cb866b2c7c008566a1fa828172608076bb3184eed11f03ecbdefbcbb52bd97986fca690bf1b523513eaebc7f1b8c7c42ee3db5390089ae53f7
-  data.tar.gz: f94d009ee87fa0849584dc3c200488c5006760ad8846bf8114c303071f77ec2299ed8d7edb4fff1ba546f096a7d65bfc96d3d4ba24e3c04dc3548a64f4c33307
+  metadata.gz: c3d367f02210d83a4275830d7291648e355440d574f4aac6b0309a97ca944289d19d9e4a665f927489d5dd8738938cf92c5ff8133a43602be1dfab41add6ae07
+  data.tar.gz: e9a6f661ff7569af162bda8a6ee3289e1afa036ddc924ef74c844b7d2c6c389a80137ecb1c4e6e1eae2d08c8443a5dae81f91070bfc6680608ae30c6cc3a67bd

data/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.1.0

data/Gemfile.lock

@@ -1,30 +1,40 @@
 PATH
   remote: .
   specs:
-    ios_polyglot_cli (2.3.0)
+    ios_polyglot_cli (2.5.0)
       activesupport
       commander
       json_api_client
+      parallel
       tty-prompt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     byebug (11.1.3)
     coderay (1.1.3)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    concurrent-ruby (1.1.10)
-    faraday (1.10.2)
+    commander (5.0.0)
+      highline (~> 3.0.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.1)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -49,10 +59,10 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    highline (2.0.3)
-    i18n (1.12.0)
+    highline (3.0.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json_api_client (1.21.0)
+    json_api_client (1.22.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       addressable (~> 2.2)
@@ -60,19 +70,21 @@ GEM
       faraday_middleware (>= 0.9.0, < 2.0)
       rack (>= 0.2)
     method_source (1.0.0)
-    minitest (5.16.3)
-    multipart-post (2.2.3)
+    minitest (5.22.3)
+    multipart-post (2.4.0)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.0)
-    rack (3.0.1)
-    rake (10.5.0)
+    public_suffix (5.0.4)
+    rack (3.0.9.1)
+    rake (13.1.0)
     ruby2_keywords (0.0.5)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
@@ -83,8 +95,8 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
-    tzinfo (2.0.5)
+    tty-screen (0.8.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     wisper (2.0.1)
 
@@ -92,10 +104,10 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  bundler (~> 2.3)
+  bundler
   ios_polyglot_cli!
   pry-byebug
-  rake (~> 10.0)
+  rake
 
 BUNDLED WITH
    2.3.26

data/README.md

@@ -14,19 +14,23 @@ Then to install polyglot simply run:
 
     gem install ios_polyglot_cli
 
-If you have any issues with above command, please consult this [thread](https://stackoverflow.com/questions/2119064/sudo-gem-install-or-gem-install-and-gem-locations).
+If you have any issues with the above command, please consult this [thread](https://stackoverflow.com/questions/2119064/sudo-gem-install-or-gem-install-and-gem-locations).
 
 You can check if everything is OK running:
 
     polyglot --help
 
-You should see output with all commands and their description.
+You should see the output with all commands and their description.
 
 ## Usage
 
-### Login
+### Login - soon to be deprecated!
 
-You will have to login with your Infinum ID if you want to use polyglot:
+> Login command will be deprecated in the near future!
+> To obtain a new token then, please visit https://infinum.polyglothq.com, generate a new token under Settings and store
+> it in your environment variables under POLYGLOT_TOKEN environment variable (or whatever variable your project is using).
+
+You will have to log in with your Infinum ID if you want to use polyglot:
 
     polyglot login
 
@@ -38,9 +42,12 @@ To setup polyglot in your Xcode project use:
 
     polyglot init
 
-It will prompt you with project list to select one you are setting up. You can provide source language (Swift/ObjC), translations path and resources path. It will create `polyglot.yml` file which you can edit later and add additional Polyglot projects.
+It will prompt you with a project list to select the one you are setting up. You can provide source language (Swift/ObjC), translations path and resources path. It will create `polyglot.yml` file which you can edit later and add additional Polyglot projects.
 
-Also, you can pass optional parameter `--query` or `-q`. It will prompt you with a list of all projects that match specified query.
+Optional parameters:
+* `--query` will prompt you with a list of all projects that match the specified query.
+* `--url` URL of the Polyglot API, if not provided, either https://infinum.polyglothq.com/api/v2/ or one from `polyglot.yml` file will be used.
+* `--token` Auth token. If not provided, an environment variable value will be used (either `POLYGLOT_TOKEN` or one from `polyglot.yml`).
 
 ### Projects
 
@@ -48,21 +55,48 @@ If you want to see all polyglot projects and their `IDs` enter:
 
     polyglot projects
 
-Also, you can pass optional parameter `--query` or `-q`. It will prompt you with a list of all projects that match specified query.
+Optional parameters:
+* `--query` will prompt you with a list of all projects that match the specified query.
+* `--url` URL of the Polyglot API, if not provided, either https://infinum.polyglothq.com/api/v2/ or one from `polyglot.yml` file will be used.
+* `--token` Auth token. If not provided, an environment variable value will be used (either `POLYGLOT_TOKEN` or one from `polyglot.yml`).
 
-### Legacy projects
+### Pull
+
+Finally, to fetch translations use:
+
+    $ polyglot pull
+
+Optional parameters:
+* `--url` URL of the Polyglot API, if not provided, either https://infinum.polyglothq.com/api/v2/ or one from `polyglot.yml` file will be used.
+* `--token` Auth token. If not provided, an environment variable value will be used (either `POLYGLOT_TOKEN` or one from `polyglot.yml`).
 
-New style translations will create files names `en_US.strings` for example, and some old projects still use old naming in the style of `en.strings`. To get around this issue, you either need to migrate your project to use the new naming (be mindful of existing app's settings), or add this line under your path value:
+### Config syntax
 
 ```yaml
-useOldNaming: true
+# polyglot.yml file
+language: swift
+url: https://myproject.polyglothq.com/api/v2/ # Optional, https://infinum.polyglothq.com/api/v2/ by default
+token_env_variable: CUSTOM_POLYGLOT_TOKEN_VARIABLE # Optional, POLYGLOT_TOKEN by default
+skip_writing_language_struct: false # Optional, false by default
+useOldNaming: false # Optional, false by default
+projects:
+  -
+    id: 1234
+    path: ./ProjectOne/Resources/Translations/
+    sourceFilesPath: ./ProjectOne/Sources/Translations/
+  -
+    id: 6789
+    path: ./ProjectTwo/Resources/Translations/
+    sourceFilesPath: ./ProjectTwo/Sources/Translations/
 ```
 
-### Pull
+### Legacy projects
 
-Finally, to fetch translations use:
+New style translations will create file names `en_US.strings` for example, and some old projects still use old naming in the style of `en.strings`. To get around this issue, you either need to migrate your project to use the new naming (be mindful of the existing app's settings), or add this line under your path value:
 
-    $ polyglot pull
+```yaml
+useOldNaming: true
+```
 
 ## Development
 
@@ -70,7 +104,7 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-In order to release a new version to rubygems, you will need to be added as an owner of polyglot project on rubygems. Owners that can add other users are listed on [project's rubygems page.](https://rubygems.org/gems/ios_polyglot_cli)
+To release a new version to rubygems, you will need to be added as an owner of polyglot project on rubygems. Owners that can add other users are listed on [project's rubygems page.](https://rubygems.org/gems/ios_polyglot_cli)
 
 ## Contributing
 

data/exe/polyglot

@@ -10,11 +10,12 @@ program :version, PolyglotIos::VERSION
 program :description, 'An iOS client for managing polyglot\'s translations.'
 
 command :login do |c|
-  c.syntax = 'polyglot login'
+  c.syntax = 'polyglot login [options]'
   c.description = 'Login to Polyglot and fetches the token using the email and password you provide.'
-  c.action do
+  c.option '--url STRING', String, "URL of the Polyglot API. If not provided, #{PolyglotIos::DEFAULT_API_URL} will be used."
+  c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
-      PolyglotIos::Command::Login.init
+      PolyglotIos::Command::Login.init(options)
     end
   end
 end
@@ -23,6 +24,8 @@ command :init do |c|
   c.syntax = 'polyglot init [options]'
   c.description = 'Sets up a polyglot.yml config for selected project.'
   c.option '--query STRING', String, 'Only show projects which name matches query string.'
+  c.option '--url STRING', String, "URL of the Polyglot API. If not provided, #{PolyglotIos::DEFAULT_API_URL} will be used."
+  c.option '--token STRING', String, "Auth token. If not provided, #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE} environment variable value will be used."
   c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
       PolyglotIos::Command::Setup.init(options)
@@ -34,6 +37,8 @@ command :projects do |c|
   c.syntax = 'polyglot projects [options]'
   c.description = 'Lists all available polyglot projects with their IDs.'
   c.option '--query STRING', String, 'Only show projects which name matches query string.'
+  c.option '--url STRING', String, "URL of the Polyglot API. If not provided, #{PolyglotIos::DEFAULT_API_URL} will be used."
+  c.option '--token STRING', String, "Auth token. If not provided, #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE} environment variable value will be used."
   c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
       PolyglotIos::Command::Projects.init(options)
@@ -42,11 +47,13 @@ command :projects do |c|
 end
 
 command :pull do |c|
-  c.syntax = 'polyglot pull'
+  c.syntax = 'polyglot pull [options]'
   c.description = 'Pulls all translations from Polyglot and generates necessary files'
+  c.option '--url STRING', String, "URL of the Polyglot API. If not provided, #{PolyglotIos::DEFAULT_API_URL} will be used."
+  c.option '--token STRING', String, "Auth token. If not provided, #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE} environment variable value will be used."
   c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
-      PolyglotIos::Command::Pull.init
+      PolyglotIos::Command::Pull.init(options)
     end
   end
 end

data/ios-polyglot-cli.gemspec

@@ -23,12 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry-byebug'
   
   spec.add_dependency 'json_api_client'
   spec.add_dependency 'tty-prompt'
   spec.add_dependency 'commander'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'parallel'
 end

data/lib/ios_polyglot_cli/api/base.rb

@@ -3,7 +3,10 @@ module PolyglotIos
     class Base < JsonApiClient::Resource
       extend PolyglotIos::Helper::Depaginate
 
-      self.site = 'https://infinum.polyglothq.com/api/v2/'
+      def self.site(url)
+        self.site = url
+        self
+      end
 
       def self.token(token)
         self.connection_options = { headers: { 'X-Auth-Token' => token } }

data/lib/ios_polyglot_cli/api/translation_key.rb

@@ -17,6 +17,7 @@ module PolyglotIos
         translation
           .gsub("\"", "\\\"")
           .gsub("%s", "%@")
+          .gsub(/(%\d+)(\$)(s)/, '\1\2@') # Positional parameter support, converts %1$s to %1$@ for example
       end
 
     end

data/lib/ios_polyglot_cli/commands/login.rb

@@ -3,8 +3,12 @@ module PolyglotIos
     class Login
       include Helper::Terminal
 
-      def self.init
-        new.call
+      def self.init(options = Commander::Command::Options.new)
+        new(options).call
+      end
+    
+      def initialize(options = Commander::Command::Options.new)
+        @options = options
       end
 
       def call
@@ -14,8 +18,20 @@ module PolyglotIos
       private
 
       def token
+        prompt.warn(<<~WARN
+          Login command will be deprecated soon!
+          To obtain a token, please visit https://infinum.polyglothq.com, generate a new token under Settings and store
+          it in your environment variables under #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE} variable.
+          zsh:
+              echo '\\nexport #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE}=<YOUR_AUTH_TOKEN>' >> ~/.zshrc
+              source ~/.zshrc
+          bash:
+              echo '\\nexport #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE}=<YOUR_AUTH_TOKEN>' >> ~/.bashrc
+              source ~/.bashrc
+          WARN
+        )
         prompt.say('Logging into API...')
-        @data = PolyglotIos::Resource::Session.create(email: email, password: password)
+        @data = PolyglotIos::Resource::Session.site(option_site_url).create(email: email, password: password)
         @data.token
       end
 
@@ -27,6 +43,10 @@ module PolyglotIos
         prompt.mask('Password:')
       end
 
+      def option_site_url
+        @option_site_url = @options.__hash__.fetch(:url, PolyglotIos::DEFAULT_API_URL)
+      end
+
     end
   end
 end

data/lib/ios_polyglot_cli/commands/projects.rb

@@ -8,11 +8,11 @@ module PolyglotIos
       include Helper::General
 
       attr_accessor :options
-      
+
       def self.init(options = Commander::Command::Options.new)
         new(options).call
       end
-    
+
       def initialize(options = Commander::Command::Options.new)
         @options = options
       end
@@ -27,18 +27,26 @@ module PolyglotIos
           .sort_by { |p| p[0].downcase }
           .to_h
       end
-    
+
       def projects
         prompt.say('Getting projects...')
-        PolyglotIos::Resource::Project.token(token).depaginate.each_with_object({}) do |r, hash|
+        PolyglotIos::Resource::Project.site(option_site_url).token(option_token).depaginate.each_with_object({}) do |r, hash|
           hash[r.name] = r.id
         end
       end
-    
+
       def option_query
         @option_query ||= @options.__hash__.fetch(:query, '')
       end
 
+      def option_site_url
+        @option_site_url = @options.__hash__.fetch(:url, PolyglotIos::DEFAULT_API_URL)
+      end
+
+      def option_token
+        @option_token = @options.__hash__.fetch(:token, nil) || token
+      end
+
       private
 
       def list_projects

data/lib/ios_polyglot_cli/commands/pull.rb

@@ -1,29 +1,37 @@
+require 'parallel'
+
 module PolyglotIos
   module Command
     class Pull
       include Helper::Terminal
       include Helper::General
 
-      def self.init
-        new.call
+      def self.init(options = Commander::Command::Options.new)
+        new(options).call
+      end
+
+      def initialize(options = Commander::Command::Options.new)
+        @options = options
       end
 
       def call
         prompt.say("Fetching translations...")
-        generate_translations(project_configs, programming_language)
+        generate_translations(project_configs, programming_language, skip_writing_language_struct)
         success("Translations successfully generated!")
       end
 
       private
 
-      def generate_translations(projects, programming_language)
+      def generate_translations(projects, programming_language, skip_writing_language_struct)
         projects.each do |project|
           project_id = project[:id]
           languages = pull_languages(project_id)
           translation_keys = pull_translation_keys(project_id)
-          
+
           write_translations(translation_keys, languages, project[:path], project[:useOldNaming])
-          write_languages(languages, project[:sourceFilesPath], programming_language)
+          if !skip_writing_language_struct
+            write_languages(languages, project[:sourceFilesPath], programming_language)
+          end
           write_translation_sources(translation_keys, project[:sourceFilesPath], programming_language)
         end
       end
@@ -32,11 +40,10 @@ module PolyglotIos
 
       def write_translations(translation_keys, languages, translations_path, use_old_naming = false)
         return if translations_path.to_s.empty?
-        languages.each do |language|
+        Parallel.each(languages) do |language|
           PolyglotIos::Serializer::Translation
             .write(translation_keys, language, translations_path, use_old_naming)
         end
-
       end
 
       def write_languages(languages, sources_path, programming_language)
@@ -63,15 +70,25 @@ module PolyglotIos
 
       # Pulling data
 
+      def option_token
+        @option_token = @options.__hash__.fetch(:token, nil) || token
+      end
+
+      def option_site_url
+        @option_site_url = @options.__hash__.fetch(:url, nil) || url
+      end
+
       def pull_languages(project_id)
         PolyglotIos::Resource::Language
-          .token(token)
+          .site(option_site_url)
+          .token(option_token)
           .depaginate(project_id: project_id)
       end
 
       def pull_translation_keys(project_id)
         PolyglotIos::Resource::TranslationKey
-          .token(token)
+          .site(option_site_url)
+          .token(option_token)
           .depaginate(project_id: project_id)
           .sort_by { |key| key.name.downcase }
       end

data/lib/ios_polyglot_cli/commands/setup.rb

@@ -10,16 +10,18 @@ module PolyglotIos
       def self.init(options = Commander::Command::Options.new)
         new(options).call
       end
-    
+
       def initialize(options = Commander::Command::Options.new)
         @options = options
       end
 
       def call
+        customUrl = option_site_url || custom_url_prompt
         project_id = project_id_prompt
         language = language_prompt
         translations_path = translations_path_prompt
         sources_path = sources_path_prompt
+        token_env_variable = custom_token_env_var_prompt
         project = {
           id: project_id,
           path: translations_path,
@@ -27,7 +29,9 @@ module PolyglotIos
         }
         config = {
           language: language,
-          projects: [project]
+          projects: [project],
+          url: customUrl,
+          token_env_variable: token_env_variable
         }
         PolyglotIos::IO::Config.write(config)
         success
@@ -40,7 +44,7 @@ module PolyglotIos
       def project_id_prompt
         prompt.select('Choose a project: ', filtered_projects)
       end
-      
+
       # Language
 
       def language_prompt
@@ -60,6 +64,22 @@ module PolyglotIos
         prompt.ask('Where would you like to store source files?', default: './Common/Translations/')
       end
 
+      # Custom URL
+
+      def custom_url_prompt
+        prompt.ask('Please enter your custom url:', default: PolyglotIos::DEFAULT_API_URL)
+      end
+
+      def option_site_url
+        @option_site_url = @options.__hash__.fetch(:url, nil)
+      end
+
+      # Custom Token Environment Variable Name
+
+      def custom_token_env_var_prompt
+        prompt.ask('Please enter the name of a token environment variable:', default: PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE)
+      end
+
     end
   end
 end

data/lib/ios_polyglot_cli/constants.rb

@@ -0,0 +1,4 @@
+module PolyglotIos
+  DEFAULT_API_URL = 'https://infinum.polyglothq.com/api/v2/'
+  DEFAULT_TOKEN_ENVIRONMENT_VARIABLE = 'POLYGLOT_TOKEN'
+end

data/lib/ios_polyglot_cli/error_handler.rb

@@ -13,7 +13,7 @@ module PolyglotIos
         prompt.error(
           case e
           when JsonApiClient::Errors::NotAuthorized
-            "You are not authorized. Please call `polyglot login` and provide correct credentials."
+            "You are not authorized. Please check your token and provide correct credentials."
           when JsonApiClient::Errors::AccessDenied
             "You don't have the permission to access requested project."
           when Errno::ENOENT

data/lib/ios_polyglot_cli/helpers/depaginate.rb

@@ -1,18 +1,31 @@
+require 'parallel'
+
 module PolyglotIos
   module Helper
     module Depaginate
       PER_PAGE = 100
 
       def depaginate_query(query)
-        depaginated_array = []
-        page = query.page(1).per(PER_PAGE).all
-        until page.nil?
-          depaginated_array += page
-          page = page.pages.next
-        end
-        depaginated_array
+        # Polyglot has custom parameters for pagination
+        JsonApiClient::Paginating::Paginator.page_param = "number"
+        JsonApiClient::Paginating::Paginator.per_page_param = "size"
+
+        first_page = query.page(1).per(PER_PAGE).all
+
+        # Early return if there's only one page
+        return first_page if first_page.meta.total_pages <= 1
+
+        page_numbers_to_fetch = (2..first_page.meta.total_pages).to_a
+
+        items = Parallel
+          .map(page_numbers_to_fetch) { |page_number| query.page(page_number).per(PER_PAGE).all }
+          .append(first_page) # Fetched pages contain pages from 2 to n, so we need to add the first page
+          .sort_by { |page| page.meta.current_page }
+          .flat_map { |page| page.to_a }
+
+        items
       end
-      
+
     end
   end
 end

data/lib/ios_polyglot_cli/helpers/general.rb

@@ -1,6 +1,7 @@
 module PolyglotIos
   module Helper
     module General
+      include Terminal
       ESCAPE_KEYWORDS = ["associatedtype", "class", "deinit", "enum", "extension", "fileprivate", "func", 
                          "import", "init", "inout", "internal", "let", "operator", "private", "protocol", 
                          "public", "static", "struct", "subscript", "typealias", "var", "break", "case", 
@@ -8,10 +9,14 @@ module PolyglotIos
                          "in", "repeat", "return", "switch", "where", "while", "as", "Any", "catch", "false", 
                          "is", "nil", "rethrows", "super", "self", "Self", "throw", "throws", "true", "try", "_"]
       def token
-        @token ||= PolyglotIos::IO::Token.read
+        @token ||= PolyglotIos::IO::Token.read(token_env_variable)
         if @token.to_s.empty?
-          PolyglotIos::Command::Login.init
-          @token = PolyglotIos::IO::Token.read
+          prompt.error(<<~MESSAGE
+          No Auth Token found under #{token_env_variable} environment variable.
+          Please add your token to the environemnt variables under #{token_env_variable} or pass it as an argument --token <YOUR_AUTH_TOKENb>
+          MESSAGE
+          )
+          exit
         end
         @token
       end
@@ -28,10 +33,26 @@ module PolyglotIos
         @programming_language ||= config[:language]
       end
 
+      def skip_writing_language_struct
+        @skip_writing_language_struct ||= config[:skip_writing_language_struct]
+      end
+
       def use_old_naming
         @useOldNaming ||= config[:useOldNaming]
       end
 
+      def url
+        @url ||= config[:url] || PolyglotIos::DEFAULT_API_URL
+      end
+
+      def token_env_variable
+        begin
+          @token_env_variable ||= config[:token_env_variable] || PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE
+        rescue
+          @token_env_variable = PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE
+        end
+      end
+
       def indent(level = 0, initial = "")
         (1..level)
           .to_a.reduce("") { |result, value| result + "    " }

data/lib/ios_polyglot_cli/io/token.rb

@@ -3,23 +3,21 @@ module PolyglotIos
     class Token
 
       @@in_memory_token = nil
-    
-      POLYGLOT_TOKEN_KEY = "POLYGLOT_TOKEN".freeze
-      
+          
       class << self
   
         def write(token)
           if @@in_memory_token.nil?
-            out = <<-HELLO
+            out = <<~HELLO
 
-#{POLYGLOT_TOKEN_KEY}=#{token}
+#{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE}=#{token}
 
-To stay logged in, add the Polyglot token to your local environment (.zshrc, .bashrc...).
+To stay logged in, add the Polyglot auth token to your local environment (.zshrc, .bashrc...).
     zsh:
-        echo '\\nexport #{POLYGLOT_TOKEN_KEY}=#{token}' >> ~/.zshrc
+        echo '\\nexport #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE}=#{token}' >> ~/.zshrc
         source ~/.zshrc
     bash:
-        echo '\\nexport #{POLYGLOT_TOKEN_KEY}=#{token}' >> ~/.bashrc
+        echo '\\nexport #{PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE}=#{token}' >> ~/.bashrc
         source ~/.bashrc
 HELLO
             puts out
@@ -27,12 +25,8 @@ HELLO
           @@in_memory_token = token
         end
     
-        def read
-          if !@@in_memory_token.nil?
-            return @@in_memory_token
-          else
-            return ENV[POLYGLOT_TOKEN_KEY]
-          end
+        def read(token_env_variable)
+          @@in_memory_token ||= ENV[token_env_variable]
         end
       end
     end

data/lib/ios_polyglot_cli/serializers/sources/sources_serializer_swift.rb

@@ -20,8 +20,20 @@ module PolyglotIos
 <<-TEMPLATE
 import Foundation
 
-// swiftlint:disable file_length type_body_length line_length superfluous_disable_command redundant_string_enum_value
+// swiftlint:disable all
 <%= @root_enum.serialized() %>
+public struct Strings: Hashable, ExpressibleByStringLiteral, StringsProtocol {
+    public let rawValue: String
+
+    public init(rawValue: String) {
+        self.rawValue = rawValue
+    }
+
+    public init(stringLiteral rawValue: String) {
+        self.rawValue = rawValue
+    }
+}
+
 public protocol StringsProtocol: RawRepresentable {
     var localized: String { get }
     func localized(with args: CVarArg...) -> String
@@ -36,6 +48,7 @@ public extension StringsProtocol where RawValue == String {
         return String(format: self.rawValue.localized, arguments: args)
     }
 }
+// swiftlint:enable all
 TEMPLATE
         end
 

data/lib/ios_polyglot_cli/serializers/sources/swift_helpers/translation_case.rb

@@ -14,7 +14,7 @@ module PolyglotIos
 
         def serialized()
           clean_name = clean_case_name(name)
-          "case #{clean_name} = \"#{value}\""
+          "public static let #{clean_name}: Strings = \"#{value}\""
         end
         
       end

data/lib/ios_polyglot_cli/serializers/sources/swift_helpers/translation_enum.rb

@@ -28,11 +28,11 @@ module PolyglotIos
           output = indent(indent_level)
           clean_name = clean_enum_name(name)
 
-          if translations.count == 0
-            # enum without any case statement cannot be RawRepresentable
-            output.concat("public enum #{clean_name} {\n")
+          if indent_level == 0
+            # the root object should be an extension and not be public to avoid warnings
+            output.concat("extension #{clean_name} {\n")
           else
-            output.concat("public enum #{clean_name}: String, StringsProtocol {\n")
+            output.concat("public enum #{clean_name} {\n")
           end
 
           translations

data/lib/ios_polyglot_cli/serializers/translations/translations_serializer.rb

@@ -11,7 +11,7 @@ module PolyglotIos
             .map { |key, value| "\"#{key}\" = \"#{value}\";" }
             .join("\n")
             .concat("\n")
-            
+
           FileUtils.mkdir_p translations_path unless File.exist? translations_path
           locale_code = language.code(use_old_naming)
           output_path = File.join(translations_path, "#{locale_code}.strings")
@@ -30,4 +30,3 @@ module PolyglotIos
     end
   end
 end
-  

data/lib/ios_polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotIos
-  VERSION = '2.3.0'
+  VERSION = '2.5.0'
 end

data/lib/ios_polyglot_cli.rb

@@ -35,6 +35,9 @@ require 'ios_polyglot_cli/commands/pull'
 
 # Error Handler
 require 'ios_polyglot_cli/error_handler'
+
+# Constants
+require 'ios_polyglot_cli/constants'
 require 'ios_polyglot_cli/version'
 
 module PolyglotIos

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ios_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Filip Gulan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - filip.gulan@infinum.hr
@@ -138,6 +152,7 @@ files:
 - lib/ios_polyglot_cli/commands/projects.rb
 - lib/ios_polyglot_cli/commands/pull.rb
 - lib/ios_polyglot_cli/commands/setup.rb
+- lib/ios_polyglot_cli/constants.rb
 - lib/ios_polyglot_cli/error_handler.rb
 - lib/ios_polyglot_cli/helpers/depaginate.rb
 - lib/ios_polyglot_cli/helpers/general.rb