zendesk_apps_tools 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ee652e6e086cb84215c7031d59b74720297106
-  data.tar.gz: 276c247e757b2515224c95c8e70feda75d75d625
+  metadata.gz: 6071142dc8a358f7fd8f51064eb763ce6aaef8c2
+  data.tar.gz: c22c2dd78ab4515e61b23ebeca4c318fdab33aa2
 SHA512:
-  metadata.gz: 5674be616d6d6ae41363e1cd9ceba758ab128f526d6cdf25ba954831c48131370d3ccae91b3ba9e1f3eb4b9ddbd5ed5b7460713d7df143dfa26990dea1aed1b4
-  data.tar.gz: b3d2e7cae634d1259360574b76d5f215780b972329ec9d578fd9e1baf0f6859699ec680ad0d3f1e852c12927c6bf109b81ea87e32e62c26a34421957ad9df5a9
+  metadata.gz: 120cfaf7867651a8c813bb4dd40645e4f5ca536cfaa6afba57c8db0c64384a45c221d84eaf1a38b5f85e7ebf62ce3755ad8346eb9cec168200bff951a3fe9ff7
+  data.tar.gz: d294f305422e01b12c1c92f07d9155e1777697b8df337413a0119efee4d8eb3b552cdb3a58e4be2b60e8f049eef3ff47c44b23f10896ed16a7de4a1a92b88c24

data/lib/zendesk_apps_tools/deploy.rb

@@ -8,19 +8,18 @@ module ZendeskAppsTools
       response = connection.send(connection_method) do |req|
         req.url url
         req.headers[:content_type] = 'application/json'
-
         req.body = JSON.generate body
       end
 
       check_status response
 
-    rescue Faraday::Error::ClientError => e
+    rescue Faraday::Error::ClientError, JSON::ParserError => e
       say_error_and_exit e.message
     end
 
     def upload(path)
       connection = get_connection :multipart
-      zipfile_path  = options[:zipfile]
+      zipfile_path = options[:zipfile]
 
       if zipfile_path
         package_path = zipfile_path
@@ -34,9 +33,7 @@ module ZendeskAppsTools
       response = connection.post('/api/v2/apps/uploads.json', payload)
       JSON.parse(response.body)['id']
 
-    rescue Faraday::Error::ClientError => e
-      say_error_and_exit e.message
-    rescue JSON::ParserError => e
+    rescue Faraday::Error::ClientError, JSON::ParserError => e
       say_error_and_exit e.message
     end
 

data/lib/zendesk_apps_tools/package_helper.rb

@@ -11,14 +11,18 @@ module ZendeskAppsTools
     def zip(archive_path)
       Zip::ZipFile.open(archive_path, 'w') do |zipfile|
         app_package.files.each do |file|
-          path = file.relative_path
+          relative_path = file.relative_path
+          path = relative_path
           say_status 'package', "adding #{path}"
 
           # resolve symlink to source path
           if File.symlink? file.absolute_path
             path = File.expand_path(File.readlink(file.absolute_path), File.dirname(file.absolute_path))
           end
-          zipfile.add(file.relative_path, app_dir.join(path).to_s)
+          if file.to_s == 'app.scss'
+            relative_path = relative_path.sub 'app.scss', 'app.css'
+          end
+          zipfile.add(relative_path, app_dir.join(path).to_s)
         end
       end
     end

data/lib/zendesk_apps_tools/translate.rb

@@ -49,22 +49,22 @@ module ZendeskAppsTools
 
     desc 'update', 'Update translation files from Zendesk'
     method_option :path, default: './', required: false
-    def update(request_builder = Faraday.new)
+    def update()
       setup_path(options[:path]) if options[:path]
       app_package = get_value_from_stdin('What is the package name for this app? (without app_)', valid_regex: /^[a-z_]+$/, error_msg: 'Invalid package name, try again:')
 
       key_prefix = "txt.apps.#{app_package}."
 
       say('Fetching translations...')
-      locale_response = api_request(LOCALE_ENDPOINT, request_builder)
+      locale_response = Faraday.get(LOCALE_ENDPOINT)
 
       if locale_response.status == 200
         locales = JSON.parse(locale_response.body)['locales']
 
+        locales = locales.map { |locale| fetch_locale_async locale, app_package}.map(&:value)
+
         locales.each do |locale|
-          locale_url      = "#{locale['url']}?include=translations&packages=app_#{app_package}"
-          locale_response = api_request(locale_url, request_builder).body
-          translations    = JSON.parse(locale_response)['locale']['translations']
+          translations    = locale['translations']
 
           locale_name = ZendeskAppsTools::LocaleIdentifier.new(locale['locale']).locale_id
           write_json("#{destination_root}/translations/#{locale_name}.json", nest_translations_hash(translations, key_prefix))
@@ -95,6 +95,14 @@ module ZendeskAppsTools
     end
 
     no_commands do
+      def fetch_locale_async(locale, app_package)
+        Thread.new do
+          say("Fetching #{locale['locale']}")
+          json = Faraday.get("#{locale['url']}?include=translations&packages=app_#{app_package}").body
+          JSON.parse(json)['locale']
+        end
+      end
+
       def setup_path(path)
         @destination_stack << relative_to_original_destination_root(path) unless @destination_stack.last == path
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Tools to help you develop Zendesk Apps.
@@ -238,4 +238,3 @@ test_files:
 - features/step_definitions/app_steps.rb
 - features/support/env.rb
 - features/validate.feature
-has_rdoc: