polyglot_cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1471f76c19416f17a16dcd6a5d04fe2ce4c2047d
-  data.tar.gz: 5281b395f0dca136b8de0351448127c5fcb633ff
+  metadata.gz: 141a3da0e4867789a6aa6170057bfad33d7bad09
+  data.tar.gz: 270b6f237b47c64add31b924c0db5d0a73e363d8
 SHA512:
-  metadata.gz: f571558a0d97f003db71b9d08708fdcf73b48bf0911352b5e4bf86554a14cd5a9f99b5fefe6635fd1cfd73700b8cdc05ec6bb023ebd5dbd379636bf8686849cd
-  data.tar.gz: 6025b508ec34d427554505b43e39c74974ed5375da2ec4287744b04002f7909e73ee628d07be50ca9f9220f076345413995bd52c462e880ed80a8177727d80ea
+  metadata.gz: 3fa4d6f205c3ffd0531e6ab327a5fd05ea22da480ff91f3ee3e6e271d9ae6cc8100f0680a486de14e11ec220fb90d770bea3ff587e97e10c5a54879ba4ddc6a6
+  data.tar.gz: 51dfe3730446c59f57a2139f39f6bdb6db6242153d55e914d648fd83ff17ace64c17d168ddba1b49fd1babf74fbc7b566e8197e7c0795c19271c7312f9dd5245

data/exe/polyglot

@@ -19,11 +19,12 @@ command :login do |c|
 end
 
 command :init do |c|
-  c.syntax = 'polyglot init'
+  c.syntax = 'polyglot init [options]'
   c.description = 'Sets up a Polyglot project you need for your current project.'
-  c.action do
+  c.option '--query STRING', String, 'Only shows projects that matches string'
+  c.action do |_args, options|
     PolyglotCli::ErrorHandler.rescuable do
-      PolyglotCli::Command::Setup.init
+      PolyglotCli::Command::Setup.init(options)
     end
   end
 end

data/lib/polyglot_cli/commands/push.rb

@@ -69,7 +69,7 @@ module PolyglotCli
         new_value = local.delete(translation.translation_key.name)
         return if new_value == translation.value
 
-        prompt.ok("Updating translation #{translation.id}...")
+        prompt.ok("Updating translation for key: #{translation.translation_key.name}...")
         translation.update(value: new_value)
       end
 

data/lib/polyglot_cli/commands/setup.rb

@@ -1,25 +1,62 @@
+require 'commander/blank'
+require 'commander/command'
+
 module PolyglotCli
   module Command
     class Setup
       include Helper::Terminal
       include Helper::General
 
-      def self.init
-        new.call
+      def self.init(options)
+        new(options).call
+      end
+
+      def initialize(options = Commander::Command::Options.new)
+        @options = options
       end
 
       def call
-        PolyglotCli::IO::Config.write(
-          project_id: project_id_prompt,
+        @config = {
+          project_id: project_id_prompt(filtered_projects),
           locale_path: locale_path_prompt
-        )
+        }
+        PolyglotCli::IO::Config.write(@config.merge(locale_mapping: locale_mapping))
         success
+      rescue TTY::Prompt::ConfigurationError
+        prompt.error('Could not find any projects. Please try a new search.')
       end
 
       private
 
-      def project_id_prompt
-        prompt.enum_select('Choose a project: ', projects)
+      def locale_mapping
+        return if mapping_prompt
+
+        locale_map.each_with_object({}) do |map, hash|
+          key = if map[1].size > 1
+                  locale_prompt(map[0], map[1])
+                else
+                  map[1].first
+                end
+          hash[key] = map[0]
+        end
+      end
+
+      def locale_map
+        languages.each_with_object(Hash.new([])) do |l, hash|
+          hash[l.locale[0..1]] += [l.locale]
+        end
+      end
+
+      def mapping_prompt
+        prompt.yes?('Would you like to include locales?')
+      end
+
+      def locale_prompt(language, locales)
+        prompt.select("Choose a locale for #{language}: ", locales)
+      end
+
+      def project_id_prompt(projects)
+        prompt.select('Choose a project: ', projects)
       end
 
       def locale_path_prompt
@@ -32,6 +69,14 @@ module PolyglotCli
           hash[r.name] = r.id
         end
       end
+
+      def filtered_projects
+        projects.select { |key, _id| key[/^(.*?(#{option_query})[^$]*)$/i] }
+      end
+
+      def option_query
+        @option_query ||= @options.__hash__.fetch(:query, '')
+      end
     end
   end
 end

data/lib/polyglot_cli/helpers/general.rb

@@ -23,10 +23,24 @@ module PolyglotCli
         Time.parse(project.updated_at).utc > Time.parse(config[:project_updated_at]).utc
       end
 
-      def languages(locale)
+      def languages(locale = nil)
         prompt.say('Getting languages...')
-        results = PolyglotCli::Resource::Language.token(token).depaginate(project_id: project_id)
-        results.select! { |l| l.locale == locale } unless locale.nil?
+        select_languages(
+          locale,
+          PolyglotCli::Resource::Language.token(token).depaginate(project_id: project_id)
+        )
+      end
+
+      def select_languages(locale, results)
+        results.select! { |l| l.locale == locale } if locale.present?
+
+        if config[:locale_mapping].present?
+          results.select! do |l|
+            l.locale = config[:locale_mapping][l.locale]
+            l.locale.present?
+          end
+        end
+
         results
       end
 

data/lib/polyglot_cli/helpers/terminal.rb

@@ -8,7 +8,7 @@ module PolyglotCli
       end
 
       def prompt
-        @prompt ||= TTY::Prompt.new
+        @prompt ||= TTY::Prompt.new(interrupt: :exit)
       end
     end
   end

data/lib/polyglot_cli/io/locale.rb

@@ -6,7 +6,7 @@ module PolyglotCli
       class << self
         def write(locale_path, data)
           prompt.say("Writing translations to #{path(locale_path, data.keys[0])}")
-          File.open(path(locale_path, data.keys[0]), 'w') { |f| YAML.dump(data, f) }
+          File.open(path(locale_path, data.keys[0]), 'w') { |f| f.write(data.to_yaml(line_width: -1)) }
         end
 
         def read(locale_path, locale)

data/lib/polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotCli
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ivan Grgurevic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler