xat 1.32.0 → 1.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899c2fa1a60bb8969f568f82bb1b9826ce0c979d
-  data.tar.gz: 0a0b600ae881e98a8f6f9d89931e38edfd10e3ba
+  metadata.gz: dd865fadb1fb87c9ca9ebf22de22b0a33e28b90b
+  data.tar.gz: e97539670628a197039b0ddcf23e57f988790cb8
 SHA512:
-  metadata.gz: 4982753829a0b0189d1329fbcd348eddb27b39ae80b81bafc2bb59ed052da6863ab56dbc7c962602e9ff2e34cb8a9e6348001428e631247109a74faf0245730d
-  data.tar.gz: 6343f1fb11c0ba1510f2ac59cb4b8296ecdac2d466b8de2fb418c0fc5d3e377fca62c282cb590b30c935f5d24424a9d2d865ba58480462f528a873f9ea9a69a8
+  metadata.gz: 4565eedc34863bea5fb17feea20096c87cf9c71dfb020a1d5e33587fce32ca5ec7f3c1074172df7f1d5966e7f45631c71f7c740b80d3043a385b250bb267de61
+  data.tar.gz: 610a048e8e3ac6c3f9ef72a578b460c5195122f0ee14cc30ed5e8181c92b37c73a2055df00d4bee48fb0021538343e6de825aa9a8ed198df126a0a0977bb157e

data/README.md

@@ -12,7 +12,7 @@ If you want to **use** this tool, all you need to do is `gem install zendesk_app
 ## Getting Started To **Develop** ZAT
 When you want to help **develop** this tool, you will need to clone this repo and run `bundle install` to get it going.
 
-ZAT uses a gem called [ZAS](https://github.com/zendesk/zendesk_apps_support/). In the case you are developing ZAT, it is likely you want to edit code in ZAS too, which means you will need to clone the ZAS repo and change the `Gemfile` (in the ZAT project) to say `gem 'zendesk_apps_support', path: '../zendesk_apps_support'`. The path should point to your local ZAS directory. This way your clone of ZAT will use a local version of ZAS which is very helpful for development. Run a `bundle install` after changing the Gemfile.
+XAT uses a gem called [XAS](https://github.com/ocke/xat_support/). In the case you are developing ZAT, it is likely you want to edit code in ZAS too, which means you will need to clone the ZAS repo and change the `Gemfile` (in the ZAT project) to say `gem 'zendesk_apps_support', path: '../zendesk_apps_support'`. The path should point to your local ZAS directory. This way your clone of ZAT will use a local version of ZAS which is very helpful for development. Run a `bundle install` after changing the Gemfile.
 
 ## Testing
 This project uses rspec, which can be run with `bundle exec rake`.

data/lib/zendesk_apps_tools/command.rb

@@ -5,7 +5,7 @@ require 'net/http'
 require 'json'
 require 'faraday'
 require 'io/console'
-require 'zendesk_apps_support'
+require 'xat_support'
 
 require 'zendesk_apps_tools/command_helpers'
 
@@ -115,33 +115,47 @@ module ZendeskAppsTools
     DEFAULT_SERVER_PATH = './'
     DEFAULT_CONFIG_PATH = './settings.yml'
     DEFAULT_SERVER_PORT = 4567
-    DEFAULT_APP_ID = 0
 
     desc 'server', 'Run a http server to serve the local app'
     method_option :path, default: DEFAULT_SERVER_PATH, required: false, aliases: '-p'
     method_option :config, default: DEFAULT_CONFIG_PATH, required: false, aliases: '-c'
     method_option :port, default: DEFAULT_SERVER_PORT, required: false
-    method_option :app_id, default: DEFAULT_APP_ID, required: false
-    def server
-      setup_path(options[:path])
-      manifest = app_package.manifest_json
+    method_option :app_id, required: false
+    def server(*app_paths)
+      if !app_paths.empty?
+        if options[:path] != DEFAULT_SERVER_PATH
+          say_error_and_exit "please either use -p or list the directory structure directly"
+        end
+
+        if options[:config] != DEFAULT_CONFIG_PATH
+          say_error_and_exit "cannot use -c in combination with multiple apps"
+        end
+
+        if !options[:app_id].nil?
+          say_error_and_exit "cannot set app_id in combination with multiple apps"
+        end
+      else
+        app_paths << options[:path]
+      end
 
-      settings_helper = ZendeskAppsTools::Settings.new
+      apps = app_paths.map do | path |
+        package = ZendeskAppsSupport::Package.new(path)
+        settings_helper = ZendeskAppsTools::Settings.new
 
-      settings = settings_helper.get_settings_from_file options[:config], manifest['parameters']
+        settings_file_path = settings_helper.find_settings_file(path)
+        settings = settings_file_path ? {} : settings_helper.get_settings_from_user_input(self, package.manifest_json['parameters'])
 
-      unless settings
-        settings = settings_helper.get_settings_from_user_input self, manifest['parameters']
+        {
+          package: package,
+          settings_file_path: settings_file_path,
+          settings: settings
+        }
       end
 
       require 'zendesk_apps_tools/server'
       ZendeskAppsTools::Server.tap do |server|
         server.set :port, options[:port]
-        server.set :root, options[:path]
-        server.set :parameters, settings
-        server.set :manifest, manifest['parameters']
-        server.set :config, options[:config]
-        server.set :app_id, options[:app_id]
+        server.set :apps, apps
         server.run!
       end
     end

data/lib/zendesk_apps_tools/common.rb

@@ -7,6 +7,7 @@ module ZendeskAppsTools
     end
 
     def say_error_and_exit(msg)
+      raise msg if ENV.key?('ZAT_DEV')
       say msg, :red
       exit 1
     end

data/lib/zendesk_apps_tools/manifest_handler.rb

@@ -28,7 +28,7 @@ module ZendeskAppsTools
       manifest_json = File.read(manifest_json_path)
       @manifest = JSON.load(manifest_json)
     rescue => e
-      say(e.message, :red) and exit 1
+      say_error_and_exit e.message
     end
 
     def read_version

data/lib/zendesk_apps_tools/package_helper.rb

@@ -1,5 +1,5 @@
 module ZendeskAppsTools
-  require 'zendesk_apps_support'
+  require 'xat_support'
 
   module PackageHelper
     include ZendeskAppsSupport

data/lib/zendesk_apps_tools/server.rb

@@ -6,41 +6,60 @@ module ZendeskAppsTools
     set :protection, :except => :frame_options
     last_mtime = Time.new(0)
     ZENDESK_DOMAINS_REGEX = /^http(?:s)?:\/\/[a-z0-9-]+\.(?:zendesk|zopim|zd-(?:dev|master|staging))\.com$/
+    last_domain = nil
 
     get '/app.js' do
       access_control_allow_origin
       content_type 'text/javascript'
 
-      if File.exists? settings.config
-        curr_mtime = File.stat(settings.config).mtime
-        if curr_mtime > last_mtime
-          settings_helper = ZendeskAppsTools::Settings.new
-          settings.parameters = settings_helper.get_settings_from_file(settings.config, settings.manifest)
-          last_mtime = curr_mtime
+      settings_helper = ZendeskAppsTools::Settings.new
+
+      appsjs = []
+      installations = []
+      order = {}
+
+      settings.apps.each_with_index do |app, index|
+        package = app[:package]
+        app_id = installation_id = -(index+1)
+        app_name = package.manifest_json['name'] || 'Local App'
+
+        appsjs << package.compile_js(
+          app_name: app_name,
+          app_id: app_id,
+          assets_dir: "http://localhost:#{settings.port}/#{app_id}/",
+          locale: params['locale']
+        )
+
+        if app[:settings_file_path]
+          curr_mtime = File.stat(app[:settings_file_path]).mtime
+          curr_domain = params['subdomain']
+          if (curr_mtime > last_mtime || curr_domain != last_domain)
+            app[:settings] = settings_helper.get_settings_from_file(app[:settings_file_path], app[:package].manifest_json['parameters'], params['subdomain'])
+            last_mtime = File.stat(app[:settings_file_path]).mtime
+            last_domain = curr_domain
+          end
         end
-      end
 
-      package = ZendeskAppsSupport::Package.new(settings.root, false)
-      app_name = package.manifest_json['name'] || 'Local App'
-      installation = ZendeskAppsSupport::Installation.new(
-        id: settings.app_id,
-        app_id: settings.app_id,
-        app_name: app_name,
-        enabled: true,
-        requirements: package.requirements_json,
-        settings: settings.parameters.merge({title: app_name}),
-        updated_at: Time.now.iso8601,
-        created_at: Time.now.iso8601
-      )
+        installations << ZendeskAppsSupport::Installation.new(
+          id: installation_id,
+          app_id: app_id,
+          app_name: app_name,
+          enabled: true,
+          requirements: package.requirements_json,
+          settings: app[:settings].merge({title: app_name}),
+          updated_at: Time.now.iso8601,
+          created_at: Time.now.iso8601
+        )
+      end
 
-      app_js = package.compile_js(
-        app_id: settings.app_id,
-        app_name: package.manifest_json['name'] || 'Local App',
-        assets_dir: "http://localhost:#{settings.port}/",
-        locale: params['locale']
-      )
+      installed = ZendeskAppsSupport::Installed.new(appsjs, installations)
+      installed.compile_js()
+    end
 
-      ZendeskAppsSupport::Installed.new([app_js], [installation]).compile_js
+    get "/:app_id/:file" do |app_id, file|
+      # convert to postive and substract 1. So -1 => 0, -3 => 2, etc
+      index = (-app_id.to_i)-1
+      send_file File.join(settings.apps[index][:package].root, 'assets', file)
     end
 
     get "/:file" do |file|

data/lib/zendesk_apps_tools/settings.rb

@@ -14,6 +14,7 @@ module ZendeskAppsTools
           input = user_input.get_value_from_stdin("Enter a value for required parameter '#{param['name']}':\n")
         else
           input = user_input.get_value_from_stdin("Enter a value for optional parameter '#{param['name']}' or press 'Return' to skip:\n", allow_empty: true)
+          input = nil if input.empty?
         end
 
         if param['type'] == 'checkbox'
@@ -25,7 +26,16 @@ module ZendeskAppsTools
       end
     end
 
-    def get_settings_from_file(filepath, parameters)
+    def find_settings_file(path)
+      ['./settings.yml', './settings.json'].reduce([]) do | memo, try_file |
+        memo << File.join(path, try_file)
+        memo << File.join(path, try_file)
+      end.find do |settings_file|
+        File.exist?(settings_file)
+      end
+    end
+
+    def get_settings_from_file(filepath, parameters, domain = nil)
       return {} if parameters.nil?
       return nil unless File.exist? filepath
 
@@ -38,14 +48,16 @@ module ZendeskAppsTools
           settings_data = YAML.load(settings_file)
         end
 
+        settings_data = settings_data[domain] if settings_data[domain]
+
         settings_data.each do |index, setting|
           if setting.is_a?(Hash) || setting.is_a?(Array)
             settings_data[index] = JSON.dump(setting)
           end
         end
       rescue => err
-        puts "Failed to load #{filepath}"
-        puts err.message
+        puts "\e[0;31mFailed to load #{filepath}\e[0m\n"
+        puts "\e[0;31m#{err.message}\e[0m\n"
         return nil
       end
 
@@ -57,8 +69,8 @@ module ZendeskAppsTools
         end
 
         if !input && param['required']
-          puts "'#{param['name']}' is required but not specified in the config file.\n"
-          return nil
+          puts "\e[0;31m'#{param['name']}' is required but not specified in the config file.\e[0m\n"
+          input = nil
         end
 
         if param['type'] == 'checkbox'

data/lib/zendesk_apps_tools/translate.rb

@@ -2,7 +2,7 @@ require 'thor'
 require 'json'
 require 'zendesk_apps_tools/common'
 require 'zendesk_apps_tools/locale_identifier'
-require 'zendesk_apps_support'
+require 'xat_support'
 require 'yaml'
 
 module ZendeskAppsTools
@@ -28,7 +28,7 @@ module ZendeskAppsTools
       en_json = JSON.parse(File.open("#{destination_root}/translations/en.json").read)
 
       package = en_json['app']['package']
-      say('No package defined inside en.json! Abort.', :red) and exit 1 unless package
+      say_error_and_exit('No package defined inside en.json! Abort.') unless package
       en_json['app'].delete('package')
 
       write_yml(en_json, app_name, package)
@@ -84,7 +84,7 @@ module ZendeskAppsTools
       en_json = JSON.parse(File.open("#{destination_root}/translations/en.json").read)
 
       package = en_json['app']['package']
-      say('No package defined inside en.json! Abort.', :red) and exit 1 unless package
+      say_error_and_exit('No package defined inside en.json! Abort.') unless package
 
       pseudo = build_pseudotranslation(en_json, package)
       write_json("translations/fr.json", pseudo)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xat
 version: !ruby/object:Gem::Version
-  version: 1.32.0
+  version: 1.32.2
 platform: ruby
 authors:
 - Olaf Kwant
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: zendesk_apps_support
+  name: xat_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: 1.29.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: 1.29.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement