ios_polyglot_cli 2.2.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f732e12b6a0d53d57530b7b1449daa454a14509968009eb96c7ce4e94e8eba74
-  data.tar.gz: ed86e8a6336bfd8d5dc32e50bd9ee49182f82dbe43b8a989d5a5bb6738c154b1
+  metadata.gz: 8a4772a7586a26e165ab7b05bb5adc917e597f80d0aadd1681c447eb18294e80
+  data.tar.gz: 8a441b6e7f109e310aa33caf67ec22751a39da6eb46766f83a002e9f801d9802
 SHA512:
-  metadata.gz: 0d2eef0ab5b63fb5c077f3a67d01f6594b97305f7ed35917ab8ef73ddd9f0f7522f8fcb0ff3404059a862b976132137aba091c2e9e5e6ed9d6fc39e566c9d2db
-  data.tar.gz: 65afae6af5f0b4c486d884f4bed31f8c0f635fff1a4ee60ce0c43dc4bbb4717379ed41bf930540563a188a8207c1b517a79150a0947c9f59029942869ddfb4b2
+  metadata.gz: 9b776a929067b05d066076163a060bab2ff210db020d9a75c3d2357e217b817247a4b5fc1a44ae9abd78fbb746879659b7d47f3126c557d9b86f1e77821a5c5a
+  data.tar.gz: 0173e073f01dbfcf7a9318ecf9a9cbebabcfea04be5433c19a2c398d0d092f0fdbfc268d6efa5e910d5f5b4f680059bd8505e077558a6f9fab6c2e1d4002e3a3

data/.ruby-version

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

data/Gemfile.lock

@@ -1,92 +1,101 @@
 PATH
   remote: .
   specs:
-    ios_polyglot_cli (2.2.2)
+    ios_polyglot_cli (2.4.0)
       activesupport
       commander
       json_api_client
-      osx_keychain
       tty-prompt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RubyInline (3.12.5)
-      ZenTest (~> 4.3)
-    ZenTest (4.12.0)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    commander (4.4.7)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.6)
-    equatable (0.6.1)
-    faraday (0.17.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+    concurrent-ruby (1.2.2)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
     highline (2.0.3)
-    i18n (1.7.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json_api_client (1.16.1)
+    json_api_client (1.21.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       addressable (~> 2.2)
-      faraday (~> 0.15, >= 0.15.2)
-      faraday_middleware (~> 0.9)
+      faraday (>= 0.15.2, < 2.0)
+      faraday_middleware (>= 0.9.0, < 2.0)
       rack (>= 0.2)
-    method_source (0.9.2)
-    minitest (5.14.1)
-    multipart-post (2.1.1)
-    necromancer (0.5.0)
-    osx_keychain (1.0.2)
-      RubyInline (~> 3)
-    pastel (0.7.3)
-      equatable (~> 0.6)
+    method_source (1.0.0)
+    minitest (5.16.3)
+    multipart-post (2.2.3)
+    pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+      pry (>= 0.13, < 0.15)
+    public_suffix (5.0.0)
+    rack (3.0.1)
     rake (10.5.0)
-    thread_safe (0.3.6)
-    tty-color (0.5.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.19.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.6.0)
-    tty-reader (0.6.0)
+    ruby2_keywords (0.0.5)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     wisper (2.0.1)
-    zeitwerk (2.3.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.3)
   ios_polyglot_cli!
   pry-byebug
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.3
+   2.3.26

data/README.md

@@ -30,7 +30,7 @@ You will have to login with your Infinum ID if you want to use polyglot:
 
     polyglot login
 
-If your login action is successful, polyglot will ask you to access Keychain. There it will save your access token, so you don’t have to enter your credentials every time when you use `polyglot` command.
+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.
 
 ### Setup
 
@@ -70,6 +70,8 @@ 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)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/infinum/ios_polyglot_cli.

data/exe/polyglot

@@ -11,7 +11,7 @@ program :description, 'An iOS client for managing polyglot\'s translations.'
 
 command :login do |c|
   c.syntax = 'polyglot login'
-  c.description = 'Fetches and writes your token to the keychain using the email and password you provide.'
+  c.description = 'Login to Polyglot and fetches the token using the email and password you provide.'
   c.action do
     PolyglotIos::ErrorHandler.rescuable do
       PolyglotIos::Command::Login.init

data/ios-polyglot-cli.gemspec

@@ -23,13 +23,12 @@ 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', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry-byebug'
   
   spec.add_dependency 'json_api_client'
   spec.add_dependency 'tty-prompt'
   spec.add_dependency 'commander'
-  spec.add_dependency 'osx_keychain'
   spec.add_dependency 'activesupport'
 end

data/lib/ios_polyglot_cli/commands/pull.rb

@@ -10,20 +10,22 @@ module PolyglotIos
 
       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

data/lib/ios_polyglot_cli/helpers/general.rb

@@ -28,6 +28,10 @@ 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

data/lib/ios_polyglot_cli/io/token.rb

@@ -2,22 +2,38 @@ module PolyglotIos
   module IO
     class Token
 
-      KEYCHAIN_SERVICE = 'polyglot'.freeze
-      KEYCHAIN_TOKEN_KEY = 'polyglot_token'.freeze
+      @@in_memory_token = nil
+    
+      POLYGLOT_TOKEN_KEY = "POLYGLOT_TOKEN".freeze
       
       class << self
+  
         def write(token)
-          keychain[KEYCHAIN_SERVICE, KEYCHAIN_TOKEN_KEY] = token
+          if @@in_memory_token.nil?
+            out = <<-HELLO
+
+#{POLYGLOT_TOKEN_KEY}=#{token}
+
+To stay logged in, add the Polyglot token to your local environment (.zshrc, .bashrc...).
+    zsh:
+        echo '\\nexport #{POLYGLOT_TOKEN_KEY}=#{token}' >> ~/.zshrc
+        source ~/.zshrc
+    bash:
+        echo '\\nexport #{POLYGLOT_TOKEN_KEY}=#{token}' >> ~/.bashrc
+        source ~/.bashrc
+HELLO
+            puts out
+          end
+          @@in_memory_token = token
         end
     
         def read
-          keychain[KEYCHAIN_SERVICE, KEYCHAIN_TOKEN_KEY]
+          if !@@in_memory_token.nil?
+            return @@in_memory_token
+          else
+            return ENV[POLYGLOT_TOKEN_KEY]
+          end
         end
-
-        def keychain
-          @keychain ||= OSXKeychain.new
-        end
-
       end
     end
   end

data/lib/ios_polyglot_cli/serializers/languages/languages_serializer.rb

@@ -10,7 +10,7 @@ module PolyglotIos
         end
         
         def render()
-          ERB.new(template, nil, '-').result(binding)
+          ERB.new(template, trim_mode: '-').result(binding)
         end
 
         def template()

data/lib/ios_polyglot_cli/serializers/languages/languages_serializer_objc.rb

@@ -6,8 +6,8 @@ module PolyglotIos
       class ObjC < Base
         
         def render()
-          h_file = ERB.new(h_template, nil, '-').result(binding)
-          m_file = ERB.new(m_template, nil, '-').result(binding)
+          h_file = ERB.new(h_template, trim_mode: '-').result(binding)
+          m_file = ERB.new(m_template, trim_mode: '-').result(binding)
           return h_file, m_file
         end
         

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

@@ -13,7 +13,7 @@ module PolyglotIos
         
         def render()
           @root_enum = build_translations()
-          ERB.new(template, nil, '-').result(binding)
+          ERB.new(template, trim_mode: '-').result(binding)
         end
 
         def template()

data/lib/ios_polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotIos
-  VERSION = '2.2.2'
+  VERSION = '2.4.0'
 end

data/lib/ios_polyglot_cli.rb

@@ -1,6 +1,5 @@
 # Parsing
 require 'yaml'
-require 'osx_keychain'
 require 'erb'
 require 'active_support/core_ext/hash/indifferent_access'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Filip Gulan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: osx_keychain
-  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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -186,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A CLI for pulling polyglot translations and generating iOS Source Files