zendesk_apps_tools 2.8.4 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913c6906e00808e483ae9f6ab5b84a89fb4a3836
-  data.tar.gz: f558c253f873303089760cf7705b9d639f27e11c
+  metadata.gz: f7f07cc7695763e79c8c6ae5b9b61fcb3d5d5f30
+  data.tar.gz: 5d42c9fb5a891eeeb23869f8fff121561c76902c
 SHA512:
-  metadata.gz: bd77337c7bba91d1137fdc1664648601d0c4c524950e6849abc106e69427912f3102969ac9deae4399344a7b9c569ef2fe7005196489132d8426b05894e384f8
-  data.tar.gz: f59e7de38f81b7666131f95f22fb93c45c391d02c2b4211babcae872947d7393c125f6e98fc9e59e8f661532100347c2d968f50f697614fbad702ffdd486c4c0
+  metadata.gz: 7f48d8d0c53e507a3df7ab019d5da9a0e455e6778ee103d70fd012a633cfaa7bcfcbf87bb72a8e6ebce411e100f9e0200d26496a4556b6a8184a328524b6c779
+  data.tar.gz: b761831cb58b10c27daa177e39d8a912a2078472a6d4ac35c875aef4121907683d4b95949c1d53c35a02c98a1d1db6e0e8af3c593273b8016a966dacc1e2cd63

data/lib/zendesk_apps_tools/translate.rb

@@ -33,19 +33,7 @@ module ZendeskAppsTools
     desc 'to_json', 'Convert Zendesk translation yml to I18n formatted json'
     shared_options(except: [:clean])
     def to_json
-      require 'yaml'
       setup_path(options[:path]) if options[:path]
-      en_yml = YAML.load_file("#{destination_root}/translations/en.yml")
-      package = /^txt.apps.([^\.]+)/.match(en_yml['parts'][0]['translation']['key'])[1]
-      translations = en_yml['parts'].map { |part| part['translation'] }
-      translations.select! do |translation|
-        obsolete = translation['obsolete']
-        next true unless obsolete
-        Date.parse(obsolete.to_s) > Date.today
-      end
-      en_hash = array_to_nested_hash(translations)['txt']['apps'][package]
-      en_hash['app']['package'] = package
-
       write_json('translations/en.json', en_hash)
     end
 
@@ -76,9 +64,9 @@ module ZendeskAppsTools
     def pseudotranslate
       setup_path(options[:path]) if options[:path]
 
-      package = package_name_from_json(error_out: true)
+      package = package_name(error_out: true)
 
-      pseudo = build_pseudotranslation(en_json, package)
+      pseudo = build_pseudotranslation(en_hash, package)
       write_json('translations/fr.json', pseudo)
     end
 
@@ -177,7 +165,7 @@ module ZendeskAppsTools
         require 'faraday'
 
         if options[:locales]
-          content = File.read(File.expand_path(options[:locales]))
+          content = read_file(options[:locales])
           locales = JSON.parse(content)
           return locales.map do |locale|
             { 'locale' => locale, 'url' => "#{LOCALE_BASE_ENDPOINT}/#{locale}.json" }
@@ -194,9 +182,13 @@ module ZendeskAppsTools
         end
       end
 
+      def read_file(path)
+        File.read(File.expand_path(path))
+      end
+
       def package_name_for_update
         options[:package_name] ||
-          package_name_from_json(error_out: options[:unattended]) ||
+          package_name(error_out: options[:unattended]) ||
           get_value_from_stdin('What is the package name for this app? (without leading app_)',
                                valid_regex: /^[a-z_]+$/,
                                error_msg: 'Invalid package name, try again:')
@@ -209,11 +201,41 @@ module ZendeskAppsTools
         end
       end
 
+      def en_yaml
+        @en_yaml ||= begin
+          path = "#{destination_root}/translations/en.yml"
+          require 'yaml'
+          YAML.load_file(path) if File.exist? path
+        end
+      end
+
+      def en_hash
+        @en_hash ||= begin
+          return nil unless en_yaml
+          package = /^txt.apps.([^\.]+)/.match(en_yaml['parts'][0]['translation']['key'])[1]
+          translations = en_yaml['parts'].map { |part| part['translation'] }
+          translations.select! do |translation|
+            obsolete = translation['obsolete']
+            next true unless obsolete
+            Date.parse(obsolete.to_s) > Date.today
+          end
+          en_hash = array_to_nested_hash(translations)['txt']['apps'][package]
+          en_hash['app']['package'] = package
+          en_hash
+        end
+      end
+
       def package_name_from_json(error_out: false)
         package = en_json && en_json['app']['package']
         return package if package
         say_error_and_exit 'No package defined inside en.json!' if error_out
       end
+
+      def package_name(error_out: false)
+        package = en_hash && en_hash['app']['package']
+        return package if package
+        say_error_and_exit 'No package defined inside en.yml!' if error_out
+      end
     end
   end
 end

data/lib/zendesk_apps_tools/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ZendeskAppsTools
-  VERSION = '2.8.4'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.9.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.4
 signing_key: 
 specification_version: 4
 summary: Tools to help you develop Zendesk Apps.