ios_polyglot_cli 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d9c1b88f95d9b4f4c33dece658b01a6c7e2d2ffbc461869a3819839aac429b3
-  data.tar.gz: 61f1542565c028960d8019ab038fb4b5059990f4260830440a320f21c1e7d2cc
+  metadata.gz: 64f6cf0ba34d7cb3a80d4b025b20117ae9c84e8c8c4c24c0bc16fdc378330df4
+  data.tar.gz: 316eff6f025db95ff716800a305f624ce2e199b210dfe4275f87a46f3d2c9bec
 SHA512:
-  metadata.gz: c3d367f02210d83a4275830d7291648e355440d574f4aac6b0309a97ca944289d19d9e4a665f927489d5dd8738938cf92c5ff8133a43602be1dfab41add6ae07
-  data.tar.gz: e9a6f661ff7569af162bda8a6ee3289e1afa036ddc924ef74c844b7d2c6c389a80137ecb1c4e6e1eae2d08c8443a5dae81f91070bfc6680608ae30c6cc3a67bd
+  metadata.gz: cd2106d3dfacd97b4ac947376f96e91c4cdc64082cc8d3f17ae54fb0b2ae9e521189360dd0f0689976cdb76d8a2f9982fb9b90806624a5771a525e29679d5bd5
+  data.tar.gz: c6bfcd2189e1258e4821f73b35680b458658f2752563980ba27cb956de3991386671ca723f918d186ba1f052273dd66c4f51ae1508a145ee75f4de47372eb705

data/.gitignore

@@ -126,4 +126,4 @@ DerivedData/
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
 
-# End of https://www.gitignore.io/api/ruby,xcode,macos,visualstudiocode
+polyglot.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ios_polyglot_cli (2.5.0)
+    ios_polyglot_cli (2.6.0)
       activesupport
       commander
       json_api_client

data/README.md

@@ -24,17 +24,11 @@ You should see the output with all commands and their description.
 
 ## Usage
 
-### Login - soon to be deprecated!
+### Login
 
-> 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).
+> Login command is removed!
 
-You will have to log in with your Infinum ID if you want to use polyglot:
-
-    polyglot login
-
-If your login action is successful, polyglot will ask you to store your Polyglot token to local environment variables, so you don’t have to enter your credentials every time when you use `polyglot` command.
+To generate an Auth Token please visit https://infinum.polyglothq.com, generate a new token under Settings -> Security and store it in your environment variables under POLYGLOT_TOKEN environment variable (or whatever variable your project is using).
 
 ### Setup
 

data/exe/polyglot

@@ -10,9 +10,8 @@ program :version, PolyglotIos::VERSION
 program :description, 'An iOS client for managing polyglot\'s translations.'
 
 command :login do |c|
-  c.syntax = 'polyglot login [options]'
-  c.description = 'Login to Polyglot and fetches the token using the email and password you provide.'
-  c.option '--url STRING', String, "URL of the Polyglot API. If not provided, #{PolyglotIos::DEFAULT_API_URL} will be used."
+  c.syntax = 'polyglot login'
+  c.description = 'Removed!!! Please generate an Auth Token from the Polyglot web and store it to env variable'
   c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
       PolyglotIos::Command::Login.init(options)
@@ -22,7 +21,7 @@ end
 
 command :init do |c|
   c.syntax = 'polyglot init [options]'
-  c.description = 'Sets up a polyglot.yml config for selected project.'
+  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."
@@ -35,7 +34,7 @@ end
 
 command :projects do |c|
   c.syntax = 'polyglot projects [options]'
-  c.description = 'Lists all available polyglot projects with their IDs.'
+  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."

data/lib/ios_polyglot_cli/api/base.rb

@@ -3,7 +3,7 @@ module PolyglotIos
     class Base < JsonApiClient::Resource
       extend PolyglotIos::Helper::Depaginate
 
-      def self.site(url)
+      def self.api_url(url)
         self.site = url
         self
       end
@@ -19,4 +19,3 @@ module PolyglotIos
     end
   end
 end
-  

data/lib/ios_polyglot_cli/api/translation_key.rb

@@ -4,7 +4,7 @@ module PolyglotIos
 
       def clean_translation(language)
         translation_value = name
-        translation = translations.find { |key| key.language.id == language.id }
+        translation = (translations || []).find { |key| key.language.id == language.id }
         if translation && translation.value
           translation_value = translation.value
         end
@@ -19,7 +19,6 @@ module PolyglotIos
           .gsub("%s", "%@")
           .gsub(/(%\d+)(\$)(s)/, '\1\2@') # Positional parameter support, converts %1$s to %1$@ for example
       end
-
     end
   end
 end

data/lib/ios_polyglot_cli/commands/login.rb

@@ -6,47 +6,15 @@ 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
-        PolyglotIos::IO::Token.write(token)
-      end
-
-      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.site(option_site_url).create(email: email, password: password)
-        @data.token
-      end
-
-      def email
-        prompt.ask('Email:') { |value| value.validate :email }
+        prompt.error("Login command removed!\n")
+        prompt.warn(generate_token_message())
       end
-
-      def password
-        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

@@ -30,7 +30,7 @@ module PolyglotIos
 
       def projects
         prompt.say('Getting projects...')
-        PolyglotIos::Resource::Project.site(option_site_url).token(option_token).depaginate.each_with_object({}) do |r, hash|
+        PolyglotIos::Resource::Project.api_url(option_site_url).token(option_token).depaginate.each_with_object({}) do |r, hash|
           hash[r.name] = r.id
         end
       end

data/lib/ios_polyglot_cli/commands/pull.rb

@@ -80,14 +80,14 @@ module PolyglotIos
 
       def pull_languages(project_id)
         PolyglotIos::Resource::Language
-          .site(option_site_url)
+          .api_url(option_site_url)
           .token(option_token)
           .depaginate(project_id: project_id)
       end
 
       def pull_translation_keys(project_id)
         PolyglotIos::Resource::TranslationKey
-          .site(option_site_url)
+          .api_url(option_site_url)
           .token(option_token)
           .depaginate(project_id: project_id)
           .sort_by { |key| key.name.downcase }

data/lib/ios_polyglot_cli/helpers/general.rb

@@ -2,29 +2,26 @@ 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", 
-                         "continue", "default", "defer", "do", "else", "fallthrough", "for", "guard", "if", 
-                         "in", "repeat", "return", "switch", "where", "while", "as", "Any", "catch", "false", 
+      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",
+                         "continue", "default", "defer", "do", "else", "fallthrough", "for", "guard", "if",
+                         "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_env_variable)
         if @token.to_s.empty?
-          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
-          )
+          prompt.error("No Auth Token provided!\n")
+          prompt.warn(generate_token_message(token_env_variable))
           exit
         end
         @token
       end
-  
+
       def config
         @config ||= PolyglotIos::IO::Config.read.with_indifferent_access
       end
-      
+
       def project_configs
         @project_configs ||= config[:projects]
       end
@@ -84,7 +81,7 @@ module PolyglotIos
         escaped_underscore = escape_with_underscore_if_needed(clean_name)
         escape_keyword_if_needed(escaped_underscore)
       end
-      
+
       def escape_with_underscore_if_needed(name)
         return name if name.match(/^[A-Za-z_]/)
         "_" + name
@@ -97,4 +94,4 @@ module PolyglotIos
 
     end
   end
-end
+end

data/lib/ios_polyglot_cli/helpers/terminal.rb

@@ -12,6 +12,20 @@ module PolyglotIos
         @prompt ||= TTY::Prompt.new(interrupt: :exit)
       end
 
+      def generate_token_message(token_env_variable = nil)
+        token_env_variable ||= PolyglotIos::DEFAULT_TOKEN_ENVIRONMENT_VARIABLE
+        return <<~MESSAGE
+          To generate an Auth Token, please visit Polyglot website ( for Infinum https://infinum.polyglothq.com ), generate a new token under Settings -> Security and store it in your environment variables under #{token_env_variable} variable.
+
+          zsh:
+              echo '\\nexport #{token_env_variable}=<YOUR_AUTH_TOKEN>' >> ~/.zshrc
+              source ~/.zshrc
+          bash:
+              echo '\\nexport #{token_env_variable}=<YOUR_AUTH_TOKEN>' >> ~/.bashrc
+              source ~/.bashrc
+        MESSAGE
+      end
+
     end
   end
 end

data/lib/ios_polyglot_cli/io/config.rb

@@ -13,8 +13,7 @@ module PolyglotIos
           YAML.load_file(CONFIG_FILE_PATH)
         end
       end
-      
+
     end
   end
 end
-  

data/lib/ios_polyglot_cli/io/token.rb

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

data/lib/ios_polyglot_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Filip Gulan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler