polyglot_cli 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 986b39f475cd63d9f801d4973287cf232ede2e29
-  data.tar.gz: 22fbff7667ff6d7d8f2ccbf3fb5793c10f926528
+SHA256:
+  metadata.gz: ff5f065d97ab493e63b3bf053b1cd00ef76c7ce61b18d89b7635e86e219f08b2
+  data.tar.gz: 9d7e56011431cef1308a4a280fb1f100690a0b972e3b78c4c27def0332e38d25
 SHA512:
-  metadata.gz: b264d809b955779fbf69c3fc0a5b9e326749c6b8e545699b2d2b6359ec998809cec568481a5485d6fde6b526bee67d25986bd8c618420f38e637bc3e070274a9
-  data.tar.gz: ab938488a64bdd00cd43ff5e3b66d691a43c4cb8eb23998b62031e3d3a282116a0263e844cb0b2021c0c2efd7260204aedc3907570dc6cab332665b3c5f7a5f7
+  metadata.gz: d950cd0f92427923d409d71feecb1698cb79c46e7b7db56dffc6fc0a84a64d31a49f9e97a0b39e836cdecb4b97ffc40a8e85af2ccecc53ec90292fbe47a42b4c
+  data.tar.gz: 3e396a1f14590dd52aaa61736201bf3e69470a17d2844d2847cb55bdeff74a93a53484433eb2ea043becac2fd2696ffa1d57bcef597d347603848d5b1117588d

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.7.1

data/lib/polyglot_cli/commands/push.rb

@@ -53,12 +53,12 @@ module PolyglotCli
       end
 
       def create_translation_key(name)
-        PolyglotCli::Resource::TranslationKey.token(token).create(name: name, project_id: project_id).id
+        PolyglotCli::Resource::TranslationKey.with_subdomain(subdomain).token(token).create(name: name, project_id: project_id).id
       end
 
       def create_translation(value, key_name, key_id, language_id)
         prompt.ok("Creating translation for key: #{key_name}...")
-        PolyglotCli::Resource::Translation.token(token).create(
+        PolyglotCli::Resource::Translation.with_subdomain(subdomain).token(token).create(
           value: value,
           translation_key_id: key_id,
           language_id: language_id
@@ -78,6 +78,7 @@ module PolyglotCli
         prompt.say('Getting translation keys...')
         @translation_keys =
           PolyglotCli::Resource::TranslationKey
+          .with_subdomain(subdomain)
           .token(token)
           .depaginate(project_id: project_id)
           .each_with_object({}) do |translation_key, hash|

data/lib/polyglot_cli/commands/setup.rb

@@ -17,6 +17,7 @@ module PolyglotCli
 
       def call
         @config = {
+          subdomain: subdomain_prompt,
           project_id: project_id_prompt,
           locale_path: locale_path_prompt
         }
@@ -26,6 +27,12 @@ module PolyglotCli
         prompt.error('Could not find any projects. Please try a new search.')
       end
 
+      # override subdomain for the setup,
+      # use the cached value (from prompt)
+      # instead of reading it from the config file
+      # (which does not exist yet during the setup)
+      attr_reader :subdomain
+
       private
 
       def locale_mapping
@@ -55,8 +62,16 @@ module PolyglotCli
         prompt.select("Choose a locale for #{language}: ", locales)
       end
 
+      def subdomain_prompt
+        @subdomain = prompt.ask('Enter your subdomain: ', default: 'infinum')
+      end
+
       def project_id_prompt
-        prompt.select('Choose a project: ', filtered_projects)
+        if filtered_projects.any?
+          prompt.select('Choose a project: ', filtered_projects)
+        else
+          raise StandardError, "No projects for the subdomain #{subdomain}!"
+        end
       end
 
       def locale_path_prompt
@@ -65,13 +80,13 @@ module PolyglotCli
 
       def projects
         prompt.say('Getting projects...')
-        PolyglotCli::Resource::Project.token(token).depaginate.each_with_object({}) do |r, hash|
+        PolyglotCli::Resource::Project.with_subdomain(subdomain).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
+        @filtered_projects ||= projects.select { |key, _id| key[/^(.*?(#{option_query})[^$]*)$/i] }.sort_by { |p| p[0].downcase }.to_h
       end
 
       def option_query

data/lib/polyglot_cli/helpers/general.rb

@@ -5,6 +5,10 @@ module PolyglotCli
         @token ||= PolyglotCli::IO::Token.read
       end
 
+      def subdomain
+        config[:subdomain]
+      end
+
       def config
         @config ||= PolyglotCli::IO::Config.read
       end
@@ -15,7 +19,7 @@ module PolyglotCli
 
       def project
         prompt.say('Getting project...')
-        PolyglotCli::Resource::Project.token(token).find(project_id).first
+        PolyglotCli::Resource::Project.with_subdomain(subdomain).token(token).find(project_id).first
       end
 
       def server_changed?
@@ -27,7 +31,7 @@ module PolyglotCli
         prompt.say('Getting languages...')
         select_languages(
           locale,
-          PolyglotCli::Resource::Language.token(token).depaginate(project_id: project_id)
+          PolyglotCli::Resource::Language.with_subdomain(subdomain).token(token).depaginate(project_id: project_id)
         )
       end
 
@@ -51,7 +55,7 @@ module PolyglotCli
 
       def remote_translations(language)
         prompt.say("Getting #{language.name} translations...")
-        PolyglotCli::Resource::Translation.token(token).depaginate(project_id: project_id, language_id: language.id)
+        PolyglotCli::Resource::Translation.with_subdomain(subdomain).token(token).depaginate(project_id: project_id, language_id: language.id)
       end
     end
   end

data/lib/polyglot_cli/resources/base.rb

@@ -3,12 +3,20 @@ module PolyglotCli
     class Base < JsonApiClient::Resource
       extend PolyglotCli::Helper::Depaginate
 
-      self.site = if ['development', 'test'].include? ENV['POLYGLOT_CLI_ENV']
-                    'http://polyglot.infinum.co.dev/api/v2/'
+      self.site = case ENV['POLYGLOT_CLI_ENV']
+                  when 'development', 'test'
+                    'http://polyglothq.test/api/v2/'
+                  when 'staging'
+                    'https://staging-polyglothq.com/api/v2/'
                   else
-                    'https://polyglot.infinum.co/api/v2/'
+                    'https://polyglothq.com/api/v2/'
                   end
 
+      def self.with_subdomain(subdomain)
+        self.site = site.sub(/http(s)?\:\/\//, "http\\1://#{subdomain}.")
+        self
+      end
+
       def self.token(token)
         self.connection_options = { headers: { 'X-Auth-Token' => token } }
         self

data/lib/polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotCli
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/polyglot_cli.gemspec

@@ -23,15 +23,15 @@ 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.12.5'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
   spec.add_development_dependency 'webmock', '~> 2.3.2'
-  spec.add_dependency 'json_api_client'
+  spec.add_dependency 'json_api_client', '~> 1.4.0' # newer versions have some breaking changes with the pagination; issue: https://github.com/JsonApiClient/json_api_client/issues/365
   spec.add_dependency 'commander'
   spec.add_dependency 'tty-prompt'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Grgurevic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: json_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -228,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ruby cli for pulling and pushing polyglot translations