zendesk_apps_tools 1.35.6 → 1.35.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16ff81f2c559975ffe14851772b7ad58d7f267d
-  data.tar.gz: 4fc8871cdf0c0f1b93c3758b528ee19bbb408adc
+  metadata.gz: 5ba8180c50299cbb9a0a0962b5daff06397e1af3
+  data.tar.gz: ae6b706f7df25ce52d1a8c0fedde3797d7aa6f58
 SHA512:
-  metadata.gz: b788e2e60e376a44be8f6381a128760d555af0b2be885f77877d4fe7a6b84ca38b72bad030ab10d611c7360df1b72fd8041f35124a20e5f8221d249db929e76a
-  data.tar.gz: 3703cf757451fff4a303841b70cbacde79cb1a49c120157562e0f1bb1a07f930daccc8bf80bdb76e3545fa69b2c4ec4f86cb34f13078ff4c01ada8b8fb290c6a
+  metadata.gz: 33c85b0dbddc5c5f9f6add771f0944b81b4200fa732b7c5d43fdd8befda4558f510fff0d4169f6ef1abd1d1c375e9fb57496d93912be54698bb2a8d84e172ff6
+  data.tar.gz: c9749875486bbf63c2182e4802720a72f840b914f4733531ace48c2a22ad1ecbe89b8ba376fe7e6f463d8c737994b3a4fb3f1e3b3accbe8a30c3e1c8b4d434a7

data/app_template_iframe/assets/iframe.html

@@ -5,7 +5,7 @@
   <script type="text/javascript" src="https://assets.zendesk.com/apps/sdk/2.0/zaf_sdk.js"></script>
   <script>
     // Initialise the Zendesk JavaScript API client
-    // https://developer.zendesk.com/apps/docs/agent/zaf_v2
+    // https://developer.zendesk.com/apps/docs/apps-v2
     var client = ZAFClient.init();
     client.invoke('resize', { width: '100%', height: '400px' });
   </script>

data/lib/zendesk_apps_tools/common.rb

@@ -63,6 +63,13 @@ module ZendeskAppsTools
       password
     end
 
+    def json_or_die(value)
+      require 'json'
+      JSON.parse(value)
+    rescue JSON::ParserError
+      say_error_and_exit value
+    end
+
     private
 
     def error_if_unattended(prompt)

data/lib/zendesk_apps_tools/deploy.rb

@@ -30,9 +30,9 @@ module ZendeskAppsTools
       payload = { uploaded_data: Faraday::UploadIO.new(package_path, 'application/zip') }
 
       response = connection.post('/api/v2/apps/uploads.json', payload)
-      JSON.parse(response.body)['id']
+      json_or_die(response.body)['id']
 
-    rescue Faraday::Error::ClientError, JSON::ParserError => e
+    rescue Faraday::Error::ClientError => e
       say_error_and_exit e.message
     end
 
@@ -44,7 +44,7 @@ module ZendeskAppsTools
 
       all_apps = connection.get('/api/v2/apps.json').body
 
-      app_json = JSON.parse(all_apps)['apps'].find { |app| app['name'] == name }
+      app_json = json_or_die(all_apps)['apps'].find { |app| app['name'] == name }
       say_error_and_exit('The app was not found. Please verify your credentials, subdomain, and app name are correct.') unless app_json
       app_id = app_json['id']
 
@@ -56,7 +56,7 @@ module ZendeskAppsTools
 
     def check_status(response)
       job = response.body
-      job_response = JSON.parse(job)
+      job_response = json_or_die(job)
       say_error_and_exit job_response['error'] if job_response['error']
 
       job_id = job_response['job_id']
@@ -68,7 +68,7 @@ module ZendeskAppsTools
 
       loop do
         response = connection.get("/api/v2/apps/job_statuses/#{job_id}")
-        info     = JSON.parse(response.body)
+        info     = json_or_die(response.body)
         status   = info['status']
         message  = info['message']
         app_id   = info['app_id']

data/lib/zendesk_apps_tools/translate.rb

@@ -84,7 +84,7 @@ module ZendeskAppsTools
         Thread.new do
           say("Fetching #{locale['locale']}")
           json = Faraday.get("#{locale['url']}?include=translations&packages=app_#{app_package}").body
-          JSON.parse(json)['locale']
+          json_or_die(json)['locale']
         end
       end
 
@@ -170,7 +170,7 @@ module ZendeskAppsTools
         require 'faraday'
         locale_response = Faraday.get(LOCALE_ENDPOINT)
 
-        return JSON.parse(locale_response.body)['locales'] if locale_response.status == 200
+        return json_or_die(locale_response.body)['locales'] if locale_response.status == 200
         if locale_response.status == 401
           say_error_and_exit 'Authentication failed'
         else

data/lib/zendesk_apps_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.35.6
+  version: 1.35.7
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor