zendesk_apps_tools 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde3cf9743fb66d2cd461b4db74033cc4d675371
-  data.tar.gz: 6227eaaff8be779ae75f08503106b777d35b8f13
+  metadata.gz: 0e7d6b299a5da2b66693249f07d74a807d06436f
+  data.tar.gz: a40ba73b1a3a97a805ab289407492b818b8d69f8
 SHA512:
-  metadata.gz: b23e03abce5b45dd88310a787edeab0c405e9b432e95b618f14e081ec12475e4deedadbaef10981dbef1a93957d28ed8649190bf234c56082eb6b50f2699e778
-  data.tar.gz: 8e1094b299535bfd64724b01755f39289581f82dfce59a79ff8481561c7843bb5ecb9abd72585087361d9531cb9dfc4d9ae3201ff441833139af7df6a3536279
+  metadata.gz: 853c67600f5fd2864735011984fb6fe665785f002593a3cdd3f04c89d3c20139931d17f18f6e2ebb5bdacd27afbd6e128d770f139f767a9f6e55a4ee50307601
+  data.tar.gz: 0e49261911a2349ac3ce6b10415c6c24f54d571569dadf1ebfe422b70e4a99d869d14b0a484554041773e52e8f4cae3db1daff1b0460aaa557d4e869dc58489a

data/features/support/webmock.rb

@@ -6,7 +6,7 @@ unless defined?(Cucumber)
   require 'webmock'
 
   WebMock::API.stub_request(:post, 'https://app-account.zendesk.com/api/v2/apps/uploads.json').to_return(body: JSON.dump(id: '123'))
-  WebMock::API.stub_request(:post, 'https://app-account.zendesk.com/api/v2/apps.json').with(body: JSON.dump(name: 'John Test App', upload_id: '123')).to_return(body: JSON.dump(job_id: '987'))
+  WebMock::API.stub_request(:post, 'https://app-account.zendesk.com/api/apps.json').with(body: JSON.dump(name: 'John Test App', upload_id: '123')).to_return(body: JSON.dump(job_id: '987'))
   WebMock::API.stub_request(:get, 'https://app-account.zendesk.com/api/v2/apps/job_statuses/987').to_return(body: JSON.dump(status: 'working')).then.to_return(body: JSON.dump(status: 'completed', app_id: '55'))
 
   WebMock.enable!

data/lib/zendesk_apps_tools/command.rb

@@ -162,11 +162,13 @@ module ZendeskAppsTools
         app_name = manifest.name
       end
       app_name ||= get_value_from_stdin('Enter app name:')
-      deploy_app(:post, '/api/v2/apps.json', name: app_name)
+      deploy_app(:post, '/api/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))
+      product_names(manifest).each do |product_name|
+        say_status 'Install', "installing in #{product_name}"
+        install_app(has_requirements, product_name, app_id: cache.fetch('app_id'), settings: settings.merge(name: app_name))
+      end
     end
 
     desc 'update', 'Update app on the server'
@@ -191,6 +193,14 @@ module ZendeskAppsTools
 
     protected
 
+    def product_names(manifest)
+      product_codes(manifest).collect{ |code| ZendeskAppsSupport::Product.find_by( code: code ) }.collect(&:name)
+    end
+
+    def product_codes(manifest)
+      manifest.location_options.collect{ |option| option.location.product_code } 
+    end
+
     def setup_path(path)
       @destination_stack << relative_to_original_destination_root(path) unless @destination_stack.last == path
     end

data/lib/zendesk_apps_tools/deploy.rb

@@ -16,10 +16,10 @@ module ZendeskAppsTools
       say_error_and_exit e.message
     end
 
-    def install_app(poll_job, installation)
+    def install_app(poll_job, product_name, installation)
       connection = get_connection
       response = connection.post do |req|
-        req.url 'api/v2/apps/installations.json'
+        req.url "api/#{product_name}/apps/installations.json"
         req.headers[:content_type] = 'application/json'
         req.body = JSON.generate(installation)
       end
@@ -52,7 +52,7 @@ module ZendeskAppsTools
 
       connection = get_connection
 
-      all_apps = connection.get('/api/v2/apps.json').body
+      all_apps = connection.get('/api/apps.json').body
 
       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

data/lib/zendesk_apps_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Tools to help you develop Zendesk Apps.