zendesk_apps_tools 1.35.11 → 1.35.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b590166d112e3309f57870547f57b7e51921d703
-  data.tar.gz: fbb76bd83735b89783189a77581c683a871c5956
+  metadata.gz: be55a0877485f6d34b67d629a6a1ca3562d121f9
+  data.tar.gz: 56ade4847ce3103595920229fcb26511a622f80a
 SHA512:
-  metadata.gz: 5cf45f3def67a621d420b31bd4895b7a94892dd25583405a6db415b26773834089d1a0d65e06475ddcac0c42a2bc217a9319131e919a95dc23aa9a08b10148fb
-  data.tar.gz: 23ddeac568077a45abfe5ae321ba59667652b4a939ab59c91d265fb344eea684615699e7c8b995cc0e03114b36e41093266723483aea0aefd8898dddf1f0be84
+  metadata.gz: 2a95c5c105d438134efbfe8b3331320af32026f0619cd5870a5679eeaacf51c07dd62a7f5aeeca9f39ab88fa93d7bb725a3a41eff57176a3d71517b0e6352a7a
+  data.tar.gz: aa19c646749f82cc54480117efd0d6eb026baec280c7fe51b2271f2d5607708511446069d74b2f39043fda2ee2bdfffd2295a782c2709abfdb55aff4db905e16

data/lib/zendesk_apps_tools/command.rb

@@ -121,11 +121,11 @@ module ZendeskAppsTools
     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'
+    shared_options(except: [:clean])
     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
-    method_option :bind, default: "127.0.0.1", required: false
+    method_option :bind, required: false
     def server
       setup_path(options[:path])
       manifest = app_package.manifest
@@ -142,7 +142,7 @@ module ZendeskAppsTools
       require 'zendesk_apps_tools/server'
       ZendeskAppsTools::Server.tap do |server|
         server.set :settings_helper, settings_helper
-        server.set :bind, options[:bind]
+        server.set :bind, options[:bind] if options[:bind]
         server.set :port, options[:port]
         server.set :root, options[:path]
         server.set :public_folder, File.join(options[:path], 'assets')

data/lib/zendesk_apps_tools/common.rb

@@ -38,29 +38,31 @@ module ZendeskAppsTools
     end
 
     def get_value_from_stdin(prompt, opts = {})
-      error_if_unattended(prompt)
-      options = {
-        valid_regex: opts[:allow_empty] ? /^.*$/ : /\S+/,
-        error_msg: 'Invalid, try again:',
-        allow_empty: false
-      }.merge(opts)
+      error_or_default_if_unattended(prompt, opts) do
+        options = {
+          valid_regex: opts[:allow_empty] ? /^.*$/ : /\S+/,
+          error_msg: 'Invalid, try again:',
+          allow_empty: false
+        }.merge(opts)
 
-      thor_options = { default: options[:default] }
+        thor_options = { default: options[:default] }
 
-      while input = ask(prompt, thor_options)
-        return '' if options[:allow_empty] && input.empty?
-        break if input.to_s =~ options[:valid_regex]
-        say_error options[:error_msg]
-      end
+        while input = ask(prompt, thor_options)
+          return '' if options[:allow_empty] && input.empty?
+          break if input.to_s =~ options[:valid_regex]
+          say_error options[:error_msg]
+        end
 
-      input
+        input
+      end
     end
 
     def get_password_from_stdin(prompt)
-      error_if_unattended(prompt)
-      password = ask(prompt, echo: false)
-      say ''
-      password
+      error_or_default_if_unattended(prompt) do
+        password = ask(prompt, echo: false)
+        say ''
+        password
+      end
     end
 
     def json_or_die(value)
@@ -72,10 +74,14 @@ module ZendeskAppsTools
 
     private
 
-    def error_if_unattended(prompt)
-      return unless options[:unattended]
-      say_error 'Would have prompted for a value interactively, but we are running unattended.'
-      say_error_and_exit prompt
+    def error_or_default_if_unattended(prompt, opts = {})
+      if options[:unattended]
+        return opts[:default] if opts.key? :default
+        say_error 'Would have prompted for a value interactively, but zat is not listening to keyboard input.'
+        say_error_and_exit prompt
+      else
+        yield
+      end
     end
   end
 end

data/lib/zendesk_apps_tools/server.rb

@@ -4,8 +4,8 @@ require 'zendesk_apps_support/package'
 
 module ZendeskAppsTools
   class Server < Sinatra::Base
-    set :protection, :except => :frame_options
-    ZENDESK_DOMAINS_REGEX = /^http(?:s)?:\/\/[a-z0-9-]+\.(?:zendesk|zopim|zd-(?:dev|master|staging))\.com$/
+    set :protection, except: :frame_options
+    ZENDESK_DOMAINS_REGEX = %r{^http(?:s)?://[a-z0-9-]+\.(?:zendesk|zopim|zd-(?:dev|master|staging))\.com$}
 
     get '/app.js' do
       access_control_allow_origin
@@ -44,18 +44,23 @@ module ZendeskAppsTools
       super(*args)
     end
 
+    def request_from_zendesk?
+      request.env['HTTP_ORIGIN'] =~ ZENDESK_DOMAINS_REGEX
+    end
+
     # This is for any preflight request
     # It reads 'Access-Control-Request-Headers' to set 'Access-Control-Allow-Headers'
     # And also sets 'Access-Control-Allow-Origin' header
-    options "*" do
+    options '*' do
       access_control_allow_origin
-      headers 'Access-Control-Allow-Headers' => request.env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'] if request.env['HTTP_ORIGIN'] =~ ZENDESK_DOMAINS_REGEX
+      if request_from_zendesk?
+        headers 'Access-Control-Allow-Headers' => request.env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']
+      end
     end
 
     # This sets the 'Access-Control-Allow-Origin' header for requests coming from zendesk
     def access_control_allow_origin
-      origin = request.env['HTTP_ORIGIN']
-      headers 'Access-Control-Allow-Origin' => origin if origin =~ ZENDESK_DOMAINS_REGEX
+      headers 'Access-Control-Allow-Origin' => request.env['HTTP_ORIGIN'] if request_from_zendesk?
     end
   end
 end

data/lib/zendesk_apps_tools/settings.rb

@@ -10,7 +10,7 @@ module ZendeskAppsTools
       return {} if parameters.nil?
 
       parameters.inject({}) do |settings, param|
-        if param['default']
+        if param.key? 'default'
           input = @cli.get_value_from_stdin("Enter a value for parameter '#{param['name']}':\n", default: param['default'])
         elsif param['required']
           input = @cli.get_value_from_stdin("Enter a value for required parameter '#{param['name']}':\n")

data/lib/zendesk_apps_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.35.11
+  version: 1.35.12
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Tools to help you develop Zendesk Apps.