ios_polyglot_cli 2.0.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70a269cb650575390a356bd3e4868c03cedf3a0f9bb4f6a3742f9d205c25d9a
-  data.tar.gz: 9da347e54fbe271f21821718ad21e8a7f7e7dfdefb6aacc9bf74d1b60213c1e8
+  metadata.gz: 4d8abb15627edff0438ba802429131b45309681a9e6081cb0a35359feff688e3
+  data.tar.gz: '090c37e7b8caa611d646766cd277bd3bdd0210626efaf73dd675656f240dffe0'
 SHA512:
-  metadata.gz: 657216588118ea21a532ddddcfb1b7e1f39499c5e58e1e94bfb02c49d127ee950533f94011f587b9dfec9d68bd1636e28848ea39b513313727e216e0a556ac97
-  data.tar.gz: 0410ba10fab8373e94b3328fdbc4a0125f4e536c2563bdb11455669cd1ba8add6a2b384f2c7cac99faf47907c9cab58a7f5d9d68fcaacc6ea894a1ade83b9be0
+  metadata.gz: 904d6aec162fc7ab30fe22e80d48be84aad5abc04e0fd3ff1b261a403b7313b815db23fe01863aa019f5af4df0996a4d63c4ff96a7ff842b2ae65488a51d7190
+  data.tar.gz: a88ea229f41afc5411efef664defb7dd1bc9f8ca83e97993739a5cfafed97f61c80502035ced68d0d86412b9bb879a0b7549e5772a07e2d01eeddc64261b9e44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ios_polyglot_cli (2.0.1)
+    ios_polyglot_cli (2.2.1)
       activesupport
       commander
       json_api_client
@@ -11,72 +11,73 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RubyInline (3.12.4)
+    RubyInline (3.12.5)
       ZenTest (~> 4.3)
-    ZenTest (4.11.2)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    ZenTest (4.12.0)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      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)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.5)
-    equatable (0.5.0)
-    faraday (0.15.4)
+    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)
-    highline (2.0.2)
-    i18n (1.6.0)
+    highline (2.0.3)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    json_api_client (1.9.0)
+    json_api_client (1.16.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       addressable (~> 2.2)
       faraday (~> 0.15, >= 0.15.2)
       faraday_middleware (~> 0.9)
+      rack (>= 0.2)
     method_source (0.9.2)
-    minitest (5.11.3)
-    multipart-post (2.0.0)
-    necromancer (0.4.0)
+    minitest (5.14.1)
+    multipart-post (2.1.1)
+    necromancer (0.5.0)
     osx_keychain (1.0.2)
       RubyInline (~> 3)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
+    rack (2.0.7)
     rake (10.5.0)
     thread_safe (0.3.6)
-    timers (4.3.0)
-    tty-color (0.4.3)
-    tty-cursor (0.6.1)
-    tty-prompt (0.18.1)
-      necromancer (~> 0.4.0)
+    tty-color (0.5.0)
+    tty-cursor (0.7.0)
+    tty-prompt (0.19.0)
+      necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.6.0)
-      tty-reader (~> 0.5.0)
-    tty-reader (0.5.0)
-      tty-cursor (~> 0.6.0)
-      tty-screen (~> 0.6.4)
+      tty-reader (~> 0.6.0)
+    tty-reader (0.6.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.6.5)
-    tzinfo (1.2.5)
+    tty-screen (0.7.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    wisper (2.0.0)
+    wisper (2.0.1)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -7,12 +7,20 @@ Polyglot client for iOS development
 
 If you use old polyglot-cli or native polyglot please uninstall them first:
 
-    $ sudo gem uninstall polyglot-cli
-    $ brew uninstall --force infinum/formulae/polyglot
+    sudo gem uninstall polyglot-cli
+    brew uninstall --force infinum/formulae/polyglot
 
 Then to install polyglot simply run:
 
-    $ gem install ios_polyglot_cli
+    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).
+
+You can check if everything is OK running:
+
+    polyglot --help
+
+You should see output with all commands and their description.
 
 ## Usage
 
@@ -20,7 +28,7 @@ Then to install polyglot simply run:
 
 You will have to login with your Infinum ID if you want to use polyglot:
 
-    $ polyglot login
+    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.
 
@@ -28,12 +36,20 @@ If your login action is successful, polyglot will ask you to access Keychain. Th
 
 To setup polyglot in your Xcode project use:
 
-    $ polyglot init
+    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.
 
 Also, you can pass optional parameter `--query` or `-q`. It will prompt you with a list of all projects that match specified query.
 
+### Projects
+
+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.
+
 ### Legacy projects
 
 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:
@@ -56,7 +72,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ios_polyglot_cli.
+Bug reports and pull requests are welcome on GitHub at https://github.com/infinum/ios_polyglot_cli.
 
 ## License
 

data/exe/polyglot

@@ -22,7 +22,7 @@ end
 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 shows projects that matches string'
+  c.option '--query STRING', String, 'Only show projects which name matches query string.'
   c.action do |_args, options|
     PolyglotIos::ErrorHandler.rescuable do
       PolyglotIos::Command::Setup.init(options)
@@ -30,6 +30,17 @@ command :init do |c|
   end
 end
 
+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.action do |_args, options|
+    PolyglotIos::ErrorHandler.rescuable do
+      PolyglotIos::Command::Projects.init(options)
+    end
+  end
+end
+
 command :pull do |c|
   c.syntax = 'polyglot pull'
   c.description = 'Pulls all translations from Polyglot and generates necessary files'

data/lib/ios_polyglot_cli.rb

@@ -30,6 +30,7 @@ require 'ios_polyglot_cli/serializers/sources/sources_serializer_swift'
 
 # Commands
 require 'ios_polyglot_cli/commands/login'
+require 'ios_polyglot_cli/commands/projects'
 require 'ios_polyglot_cli/commands/setup'
 require 'ios_polyglot_cli/commands/pull'
 

data/lib/ios_polyglot_cli/api/base.rb

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

data/lib/ios_polyglot_cli/commands/projects.rb

@@ -0,0 +1,60 @@
+require 'commander/blank'
+require 'commander/command'
+
+module PolyglotIos
+  module Command
+    class Projects
+      include Helper::Terminal
+      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
+
+      def call
+        list_projects
+      end
+
+      def filtered_projects
+        projects
+          .select { |key, _id| key[/^(.*?(#{option_query})[^$]*)$/i] }
+          .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|
+          hash[r.name] = r.id
+        end
+      end
+    
+      def option_query
+        @option_query ||= @options.__hash__.fetch(:query, '')
+      end
+
+      private
+
+      def list_projects
+        projects = filtered_projects
+        selection = projects
+          .each_with_object({}) do |project, hash|
+            project_name = project[0]
+            project_id = project[1]
+            display_name = "#{project_name} => #{project_id}"
+            hash[display_name] = project_id
+          end
+        prompt.say("  Name - ID: \n  ----------")
+        selected_id = prompt
+          .select("", selection)
+      end
+
+    end
+  end
+end

data/lib/ios_polyglot_cli/commands/pull.rb

@@ -22,7 +22,7 @@ module PolyglotIos
           languages = pull_languages(project_id)
           translation_keys = pull_translation_keys(project_id)
           
-          write_translations(translation_keys, languages, project[:path], use_old_naming)
+          write_translations(translation_keys, languages, project[:path], project[:useOldNaming])
           write_languages(languages, project[:sourceFilesPath], programming_language)
           write_translation_sources(translation_keys, project[:sourceFilesPath], programming_language)
         end

data/lib/ios_polyglot_cli/commands/setup.rb

@@ -3,7 +3,7 @@ require 'commander/command'
 
 module PolyglotIos
   module Command
-    class Setup
+    class Setup < Projects
       include Helper::Terminal
       include Helper::General
 
@@ -40,22 +40,7 @@ module PolyglotIos
       def project_id_prompt
         prompt.select('Choose a project: ', filtered_projects)
       end
-
-      def projects
-        prompt.say('Getting projects...')
-        PolyglotIos::Resource::Project.token(token).depaginate.each_with_object({}) do |r, hash|
-          hash[r.name] = r.id
-        end
-      end
-    
-      def filtered_projects
-        projects.select { |key, _id| key[/^(.*?(#{option_query})[^$]*)$/i] }.sort_by { |p| p[0].downcase }.to_h
-      end
-    
-      def option_query
-        @option_query ||= @options.__hash__.fetch(:query, '')
-      end
-
+      
       # Language
 
       def language_prompt

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

@@ -20,6 +20,7 @@ module PolyglotIos
 <<-TEMPLATE
 import Foundation
 
+// swiftlint:disable file_length type_body_length line_length superfluous_disable_command
 <%= @root_enum.serialized() %>
 public protocol StringsProtocol: RawRepresentable {
     var localized: String { get }

data/lib/ios_polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotIos
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Filip Gulan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - filip.gulan@infinum.hr
 executables:
@@ -149,6 +149,7 @@ files:
 - lib/ios_polyglot_cli/api/translation.rb
 - lib/ios_polyglot_cli/api/translation_key.rb
 - lib/ios_polyglot_cli/commands/login.rb
+- 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/error_handler.rb
@@ -170,7 +171,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A CLI for pulling polyglot translations and generating iOS Source Files
 test_files: []