zendesk_apps_tools 1.37.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9190f863d9094fea70c25cc333fa7702ebc9003e
-  data.tar.gz: 66a375f1c763afc68ad4ce3c6eb700b55e37f86c
+  metadata.gz: 2aa8d1a04c58a6751dd96d0687835f37544ad2ee
+  data.tar.gz: e794bc24aa0504a80a204d1343bef70709fcc6dc
 SHA512:
-  metadata.gz: 3ce71c34ab028eb09171fd4a0ca004bf0ce54499f411a577be7fc2bb0c357670aec76c1103d37e08e25b5c39e0414ea9dca924f1417880ebfa3b8616c5986984
-  data.tar.gz: 5fd7b2d5f0f743cfd2232f4f25142a794107305d21bb25e7a4df251a5a77e7f94a305edfd661c23de706a3ea73869c2db046afe39da4b57c8b7ecada7fef3b99
+  metadata.gz: 9349fb4006085842c5df59f3c773f3ac3a0f4bfdd112d07c1fb36f9351a772ca37ed48a2a52ddaf171f5ab1c9d9c540ca008c4d1acb87cd6627d2b1cd2b85b6a
+  data.tar.gz: 72cf6af1f015140e146d39823d04f85aa831cf9f6c43e072bb1d1f2fed3ecb2815652784983831d6e003a2b3e69fa12f4d6009c1c9de03206749d746f40d3c04

data/lib/zendesk_apps_tools/command.rb

@@ -131,16 +131,6 @@ module ZendeskAppsTools
     method_option :bind, required: false
     def server
       setup_path(options[:path])
-      manifest = app_package.manifest
-
-      require 'zendesk_apps_tools/settings'
-      settings_helper = ZendeskAppsTools::Settings.new(self)
-
-      settings = settings_helper.get_settings_from_file options[:config], manifest.original_parameters
-
-      unless settings
-        settings = settings_helper.get_settings_from_user_input manifest.original_parameters
-      end
 
       require 'zendesk_apps_tools/server'
       ZendeskAppsTools::Server.tap do |server|
@@ -155,18 +145,24 @@ module ZendeskAppsTools
       end
     end
 
-    desc 'create', 'Create app on your account'
+    desc 'create', 'Create and install app on your account'
     shared_options
     method_option :zipfile, default: nil, required: false, type: :string
+    method_option :config, default: DEFAULT_CONFIG_PATH, required: false, aliases: '-c'
+    method_option :install, default: true, type: :boolean, desc: 'Also create an installation with some settings immediately after uploading.'
     def create
       cache.clear
       @command = 'Create'
 
       unless options[:zipfile]
-        app_name = JSON.parse(File.read(File.join options[:path], 'manifest.json'))['name']
+        app_name = manifest.name
       end
       app_name ||= get_value_from_stdin('Enter app name:')
       deploy_app(:post, '/api/v2/apps.json', name: app_name)
+      has_requirements = File.exist?(File.join(options[:path], 'requirements.json'))
+      return unless options[:install]
+      say_status 'Install', 'installing'
+      install_app(has_requirements, app_id: cache.fetch('app_id'), settings: settings.merge(name: app_name))
     end
 
     desc 'update', 'Update app on the server'
@@ -204,5 +200,17 @@ module ZendeskAppsTools
     def setup_path(path)
       @destination_stack << relative_to_original_destination_root(path) unless @destination_stack.last == path
     end
+
+    def settings
+      settings_helper.get_settings_from_file(options[:config], manifest.original_parameters) ||
+        settings_helper.get_settings_from_user_input(manifest.original_parameters)
+    end
+
+    def settings_helper
+      @settings_helper ||= begin
+        require 'zendesk_apps_tools/settings'
+        ZendeskAppsTools::Settings.new(self)
+      end
+    end
   end
 end

data/lib/zendesk_apps_tools/deploy.rb

@@ -16,6 +16,16 @@ module ZendeskAppsTools
       say_error_and_exit e.message
     end
 
+    def install_app(poll_job, installation)
+      connection = get_connection
+      response = connection.post do |req|
+        req.url 'api/v2/apps/installations.json'
+        req.headers[:content_type] = 'application/json'
+        req.body = JSON.generate(installation)
+      end
+      check_status(response, poll_job)
+    end
+
     def upload(path)
       connection = get_connection :multipart
       zipfile_path = options[:zipfile]
@@ -54,13 +64,15 @@ module ZendeskAppsTools
       say_error_and_exit e.message
     end
 
-    def check_status(response)
+    def check_status(response, poll_job = true)
       job = response.body
       job_response = json_or_die(job)
       say_error_and_exit job_response['error'] if job_response['error']
 
-      job_id = job_response['job_id']
-      check_job job_id
+      if poll_job
+        job_id = job_response['job_id'] || job_response['pending_job_id']
+        check_job job_id
+      end
     end
 
     def check_job(job_id)
@@ -76,7 +88,7 @@ module ZendeskAppsTools
         if %w(completed failed).include? status
           case status
           when 'completed'
-            cache.save 'app_id' => app_id
+            cache.save 'app_id' => app_id if app_id
             say_status @command, 'OK'
           when 'failed'
             say_status @command, message, :red

data/lib/zendesk_apps_tools/package_helper.rb

@@ -6,6 +6,10 @@ module ZendeskAppsTools
       @app_package ||= ZendeskAppsSupport::Package.new(app_dir.to_s)
     end
 
+    def manifest
+      @manifest ||= app_package.manifest
+    end
+
     def zip(archive_path)
       require 'zip'
       Zip::File.open(archive_path, 'w') do |zipfile|

data/lib/zendesk_apps_tools/server.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
 require 'sinatra/cross_origin'
+require 'zendesk_apps_support' # dependency of zendesk_apps_support/package
 require 'zendesk_apps_support/package'
 
 module ZendeskAppsTools

data/lib/zendesk_apps_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.37.5
+  version: 2.0.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor