zendesk_apps_tools 1.25.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 660adbe6e80c6f85b08f45c7b1e3222522312d4b
-  data.tar.gz: e4dd809969cbf99f977be2fa6efb5e71fd2c4c51
+  metadata.gz: 81963f5b4dba2141332675dc2bd49307ad3acb74
+  data.tar.gz: 53575b66d7e2ee9380b640690f035705479f1190
 SHA512:
-  metadata.gz: 0c53c64a80f1d653abc32a79b2e2fd5716841b265f0be0c91b6da009bd3cca72d5d813b2e0bef2f0cdba086f5387a328f66bac756dc4c870d473ebdc20e6f351
-  data.tar.gz: c8ae751e2bb1f509ebcd8479428a2f67aa45a6f9d4cbe3dba7ef7af54f27b761f9bd57858b5c8a6886a34d7e3abac8afb9e4de14bc679283bb986f700c5a0a7e
+  metadata.gz: 6e2c2d8b8967ca884069bae84ca4bd6f5fa2f2d8ef8ec6cfa5739a9bc2f47a8f433b72f31e560af8bff2b1bd05159bad5ed9e1b6b73ba5630467d75dad850f01
+  data.tar.gz: 24f0e247f99d641c55ef15b041d06fa31f845559726989f408051c5e36a7a04079a04b506e1d4a1be9768a48d9ed12b8950e20de76e9e4ff3ca5121aa405a8fe

data/lib/zendesk_apps_tools/command.rb

@@ -44,7 +44,7 @@ module ZendeskAppsTools
     method_options SHARED_OPTIONS
     def validate
       setup_path(options[:path])
-      errors = app_package.validate
+      errors = app_package.validate(marketplace: false)
       valid = errors.none?
 
       if valid
@@ -103,10 +103,10 @@ module ZendeskAppsTools
 
       settings_helper = ZendeskAppsTools::Settings.new
 
-      settings = settings_helper.get_settings_from_file options[:config], manifest[:parameters]
+      settings = settings_helper.get_settings_from_file options[:config], manifest['parameters']
 
       unless settings
-        settings = settings_helper.get_settings_from_user_input self, manifest[:parameters]
+        settings = settings_helper.get_settings_from_user_input self, manifest['parameters']
       end
 
       require 'zendesk_apps_tools/server'
@@ -114,7 +114,7 @@ module ZendeskAppsTools
         server.set :port, options[:port]
         server.set :root, options[:path]
         server.set :parameters, settings
-        server.set :manifest, manifest[:parameters]
+        server.set :manifest, manifest['parameters']
         server.set :config, options[:config]
         server.set :app_id, options[:app_id]
         server.run!

data/lib/zendesk_apps_tools/server.rb

@@ -19,7 +19,27 @@ module ZendeskAppsTools
         end
       end
 
-      ZendeskAppsSupport::Package.new(settings.root).readified_js(nil, settings.app_id, "http://localhost:#{settings.port}/", settings.parameters, params['locale'])
+      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
+      )
+
+      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']
+      )
+
+      ZendeskAppsSupport::Installed.new([app_js], [installation]).compile_js
     end
   end
 end

data/lib/zendesk_apps_tools/settings.rb

@@ -7,20 +7,20 @@ module ZendeskAppsTools
       return {} if parameters.nil?
 
       parameters.inject({}) do |settings, param|
-        if param[:default]
-          input = user_input.get_value_from_stdin("Enter a value for parameter '#{param[:name]}' or press 'Return' to use the default value '#{param[:default]}':\n", allow_empty: true)
-          input = param[:default] if input.empty?
-        elsif param[:required]
-          input = user_input.get_value_from_stdin("Enter a value for required parameter '#{param[:name]}':\n")
+        if param['default']
+          input = user_input.get_value_from_stdin("Enter a value for parameter '#{param['name']}' or press 'Return' to use the default value '#{param['default']}':\n", allow_empty: true)
+          input = param['default'] if input.empty?
+        elsif param['required']
+          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 = user_input.get_value_from_stdin("Enter a value for optional parameter '#{param['name']}' or press 'Return' to skip:\n", allow_empty: true)
         end
 
-        if param[:type] == 'checkbox'
+        if param['type'] == 'checkbox'
           input = convert_to_boolean_for_checkbox(input)
         end
 
-        settings[param[:name]] = input if input != ''
+        settings[param['name']] = input if input != ''
         settings
       end
     end
@@ -50,22 +50,22 @@ module ZendeskAppsTools
       end
 
       parameters.inject({}) do |settings, param|
-        input = settings_data[param[:name]]
+        input = settings_data[param['name']]
 
-        if !input && param[:default]
-          input = param[:default]
+        if !input && param['default']
+          input = param['default']
         end
 
-        if !input && param[:required]
-          puts "'#{param[:name]}' is required but not specified in the config file.\n"
+        if !input && param['required']
+          puts "'#{param['name']}' is required but not specified in the config file.\n"
           return nil
         end
 
-        if param[:type] == 'checkbox'
+        if param['type'] == 'checkbox'
           input = convert_to_boolean_for_checkbox(input)
         end
 
-        settings[param[:name]] = input if input != ''
+        settings[param['name']] = input if input != ''
         settings
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.27.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Tools to help you develop Zendesk Apps.