zendesk_apps_tools 1.4.0 → 1.5.0

data/lib/zendesk_apps_tools/common.rb

@@ -2,14 +2,13 @@ require 'faraday'
 
 module ZendeskAppsTools
   module Common
-    def api_request(url, user, password, request = Faraday.new)
-      request.basic_auth(user, password)
+    def api_request(url, request = Faraday.new)
       request.get(url)
     end
 
     def get_value_from_stdin(prompt, opts = {})
       options = {
-        :valid_regex => opts[:allow_empty] ? /^\w*$/ : /\S+/,
+        :valid_regex => opts[:allow_empty] ? /^.*$/ : /\S+/,
         :error_msg => 'Invalid, try again:',
         :allow_empty => false
       }.merge(opts)

data/lib/zendesk_apps_tools/locale_identifier.rb

@@ -2,9 +2,9 @@ module ZendeskAppsTools
   class LocaleIdentifier
     attr_reader :language_id
 
-    # Convert :"en-US-x-12" to 'en'
+    # Convert :"en-US-x-12" to 'en-US'
     def initialize(code)
-      @language_id = code.sub(/-.*/, '')
+      @language_id = code.sub(/-x-.*/, '')
     end
   end
 end

data/lib/zendesk_apps_tools/translate.rb

@@ -10,7 +10,7 @@ module ZendeskAppsTools
     include ZendeskAppsTools::Common
 
     CHARACTERS_TO_ESCAPE = %w[ " ]
-    LOCALE_ENDPOINT = "https://support.zendesk.com/api/v2/locales.json"
+    LOCALE_ENDPOINT = "https://support.zendesk.com/api/v2/locales/agent.json"
 
     desc 'create', 'Create Zendesk translation file from en.json'
     def create
@@ -29,21 +29,19 @@ module ZendeskAppsTools
     desc 'update', 'Update translation files from Zendesk'
     def update(request_builder = Faraday.new)
       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:")
-      user = get_value_from_stdin("What is your support.zendesk.com username?", :valid_regex => /^.+@.+\..+$/, :error_msg => "Invalid email, try again:")
-      token = get_value_from_stdin("What is your support.zendesk.com API token?", :error_msg => "Invalid API token, try again:")
 
       user = "#{user}/token"
       key_prefix = "txt.apps.#{app_package}."
 
       say("Fetching translations...")
-      locale_response = api_request(LOCALE_ENDPOINT, user, token, request_builder)
+      locale_response = api_request(LOCALE_ENDPOINT, request_builder)
 
       if locale_response.status == 200
         locales = JSON.parse(locale_response.body)["locales"]
 
         locales.each do |locale|
           locale_url = "#{locale["url"]}?include=translations&packages=app_#{app_package}"
-          locale_response = api_request(locale_url, user, token, request_builder).body
+          locale_response = api_request(locale_url, request_builder).body
           translations = JSON.parse(locale_response)['locale']['translations']
 
           locale_name = ZendeskAppsTools::LocaleIdentifier.new(locale['locale']).language_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,7 +85,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement