zendesk_apps_tools 1.35.2 → 1.35.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35cc1aed2dc4672a92d4b2668727ebf8deca7b89
-  data.tar.gz: 96a2be40599ae9cfbd86c786c929bdf0c9edfa86
+  metadata.gz: 343966d2380b3c6d32c9fc42d96267f3206b7006
+  data.tar.gz: 7d71b9491415e36fc335ab2a1d2b47b33756ecda
 SHA512:
-  metadata.gz: 2d033b5b7ae1bf7ed0ba68b0c4f12da4a4e307e5aa3e6ea7a254058c2e6b3f4fb20018f61c8fcea5347d50093f54741c7b4c9b8a81648f93a5ce1a2cd9a148c7
-  data.tar.gz: c207f8f3b3ef8be41fda1e85e49a519c075551c7f6337750337993b234b17b473ab7cccf6fec0bf109c3d4e2184396fd7df33f5a689bd72eab22a7fb231f9495
+  metadata.gz: 0b59451499cb844d058bbafc5009b72c1e07a12e53ed6f9cfc3f1fe1c121dd9ddd1b10f062ede756d143b6b58f395427be46b42cc01f72a94d7e624a91da1070
+  data.tar.gz: 2da8f6270e4fb93e0f5b895dfec71152fab50939c614f716eb7c2b54b7b9c075a202805e503370c8af5dc356476349e21ff98b807cf299905332e342ee2d6fea

data/lib/zendesk_apps_tools/api_connection.rb

@@ -4,11 +4,11 @@ module ZendeskAppsTools
     URL_TEMPLATE = 'https://%s.zendesk.com/'
 
     def prepare_api_auth
-      @subdomain ||= fetch_cache('subdomain') || get_value_from_stdin('Enter your Zendesk subdomain or full Zendesk URL:')
-      @username  ||= fetch_cache('username') || get_value_from_stdin('Enter your username:')
-      @password  ||= fetch_cache('password') || get_password_from_stdin('Enter your password:')
+      @subdomain ||= cache.fetch('subdomain') || get_value_from_stdin('Enter your Zendesk subdomain or full Zendesk URL:')
+      @username  ||= cache.fetch('username', @subdomain) || get_value_from_stdin('Enter your username:')
+      @password  ||= cache.fetch('password', @subdomain) || get_password_from_stdin('Enter your password:')
 
-      save_cache 'subdomain' => @subdomain, 'username' => @username
+      cache.save 'subdomain' => @subdomain, 'username' => @username
     end
 
     def get_connection(encoding = :url_encoded)

data/lib/zendesk_apps_tools/cache.rb

@@ -1,25 +1,58 @@
+# frozen_string_literal: true
+require 'json'
+
 module ZendeskAppsTools
-  module Cache
+  class Cache
     CACHE_FILE_NAME = '.zat'
 
-    def save_cache(hash)
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def save(hash)
       return if options[:zipfile]
 
-      @cache = File.exist?(cache_path) ? JSON.parse(File.read(@cache_path)).update(hash) : hash
-      File.open(@cache_path, 'w') { |f| f.write JSON.pretty_generate(@cache) }
+      local_cache.update(hash)
+      File.open(local_cache_path, 'w') { |f| f.write JSON.pretty_generate(local_cache) }
+    end
+
+    def fetch(key, subdomain = nil)
+      # drop the default_proc and replace with Hash#dig if older Ruby versions are unsupported
+      local_cache[key] || global_cache[subdomain][key] || global_cache['default'][key]
+    end
+
+    def clear
+      File.delete local_cache_path if options[:clean] && File.exist?(local_cache_path)
+    end
+
+    private
+
+    def local_cache
+      @local_cache ||= File.exist?(local_cache_path) ? JSON.parse(File.read(local_cache_path)) : {}
     end
 
-    def fetch_cache(key)
-      @cache ||= File.exist?(cache_path) ? JSON.parse(File.read(@cache_path)) : {}
-      @cache[key] if @cache
+    def global_cache
+      @global_cache ||= begin
+        if File.exist?(global_cache_path)
+          JSON.parse(File.read(global_cache_path)).tap do |cache|
+            cache.default_proc = proc do |_hash, _key|
+              {}
+            end
+          end
+        else
+          Hash.new({})
+        end
+      end
     end
 
-    def clear_cache
-      File.delete cache_path if options[:clean] && File.exist?(cache_path)
+    def global_cache_path
+      @global_cache_path ||= File.join(Dir.home, CACHE_FILE_NAME)
     end
 
-    def cache_path
-      @cache_path ||= File.join options[:path], CACHE_FILE_NAME
+    def local_cache_path
+      @local_cache_path ||= File.join(options[:path], CACHE_FILE_NAME)
     end
   end
 end

data/lib/zendesk_apps_tools/command.rb

@@ -155,7 +155,7 @@ module ZendeskAppsTools
     method_options SHARED_OPTIONS
     method_option :zipfile, default: nil, required: false, type: :string
     def create
-      clear_cache
+      cache.clear
       @command = 'Create'
 
       unless options[:zipfile]
@@ -169,10 +169,10 @@ module ZendeskAppsTools
     method_options SHARED_OPTIONS
     method_option :zipfile, default: nil, required: false, type: :string
     def update
-      clear_cache
+      cache.clear
       @command = 'Update'
 
-      app_id = fetch_cache('app_id') || find_app_id
+      app_id = cache.fetch('app_id') || find_app_id
       unless /\d+/ =~ app_id.to_s
         say_error_and_exit "App id not found\nPlease try running command with --clean or check your internet connection"
       end

data/lib/zendesk_apps_tools/command_helpers.rb

@@ -1,4 +1,3 @@
-require 'zendesk_apps_tools/cache'
 require 'zendesk_apps_tools/common'
 require 'zendesk_apps_tools/api_connection'
 require 'zendesk_apps_tools/deploy'
@@ -9,11 +8,17 @@ require 'zendesk_apps_tools/bump'
 
 module ZendeskAppsTools
   module CommandHelpers
-    include ZendeskAppsTools::Cache
     include ZendeskAppsTools::Common
     include ZendeskAppsTools::APIConnection
     include ZendeskAppsTools::Deploy
     include ZendeskAppsTools::Directory
     include ZendeskAppsTools::PackageHelper
+
+    def cache
+      @cache ||= begin
+        require 'zendesk_apps_tools/cache'
+        Cache.new(options)
+      end
+    end
   end
 end

data/lib/zendesk_apps_tools/deploy.rb

@@ -48,7 +48,7 @@ module ZendeskAppsTools
       say_error_and_exit('The app was not found. Please verify your credentials, subdomain, and app name are correct.') unless app_json
       app_id = app_json['id']
 
-      save_cache 'app_id' => app_id
+      cache.save 'app_id' => app_id
       app_id
     rescue Faraday::Error::ClientError => e
       say_error_and_exit e.message
@@ -76,7 +76,7 @@ module ZendeskAppsTools
         if %w(completed failed).include? status
           case status
           when 'completed'
-            save_cache 'app_id' => app_id
+            cache.save 'app_id' => app_id
             say_status @command, 'OK'
           when 'failed'
             say_status @command, message, :red

data/lib/zendesk_apps_tools/server.rb

@@ -39,6 +39,11 @@ module ZendeskAppsTools
 
     enable :cross_origin
 
+    def send_file(*args)
+      access_control_allow_origin
+      super(*args)
+    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

data/lib/zendesk_apps_tools/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAppsTools
-  VERSION = "1.35.2"
+  VERSION = "1.35.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.35.2
+  version: 1.35.3
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor