haplo 2.3.2-java → 2.3.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8c72a6903130fcb13c248890c699aacae90c5b8cfdd574175ced37bc3c84bb
-  data.tar.gz: f3c99d27f274d326d02e48b68bd28c191caa00917e9fd10273084dc6bd1ab2b1
+  metadata.gz: a625e32b13020b9e1e21ebe7041081ad3cfee0a283eac518c3517828d87a44c5
+  data.tar.gz: 42d526bd0248e97912aad0fe0f3eaca86ea69efa96f27c63bbc958741be48bd2
 SHA512:
-  metadata.gz: 20625fedf138fae9b50852a57de0a3e88bcd518a9a1100e19947066e0656b554f0fbe2b38ade89638ed6572e086b4db38b4b3d302fa8db8effaa65b17b66c3a7
-  data.tar.gz: 4e257c0eb2cb950b8c587816c73d86f44ce1bdb896a9f2a775fbef83acf412e2a9d755558073bb8b824949bc1ae01afa5a262e3fa0d7f5542a8122fc75473565
+  metadata.gz: bce84b22af2815c0367e1e432745f6fc6779987c1b04dc5d1e48c0be4e42aa72416469ba14477927f114d4db89f0705058e598fb92147179fc5bb76af33ec1a7
+  data.tar.gz: 3b3786343fbc5f532d9468d27253d2df7395956892d34e4c8a94fca93cbdf456d435adfef59c84fe34c99f4f08a4abf6d4147039279c28c113cb2ef8de5e4545

data/haplo.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'haplo'
-  s.version     = '2.3.2'
-  s.date        = '2017-12-14'
+  s.version     = '2.3.3'
+  s.date        = '2018-01-03'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see https://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/plugin.rb

@@ -32,6 +32,7 @@ module PluginTool
     # ---------------------------------------------------------------------------------------------------------
 
     @@pending_apply = []
+    @@pending_apply_kinds = {}
     @@apply_with_turbo = false
 
     # ---------------------------------------------------------------------------------------------------------
@@ -189,7 +190,23 @@ module PluginTool
             upload_failed = true
           end
           PluginTool.syntax_check(self, filename) if filename =~ SYNTAX_CHECK_REGEXP
+          if filename == 'requirements.schema'
+            # Check all JS files if schema requirements changes, as removing an 'as' statement
+            # could break JS files.
+            ((File.open("#{@plugin_dir}/plugin.json") { |f| JSON.parse(f.read) } ['load']) || []).each do |js|
+              PluginTool.syntax_check(self, js)
+            end
+          end
+        end
+        # Mark what kinds of files are being applied
+        apply_kind = if filename =~ /\Astatic\//
+          :static
+        elsif filename =~ /\Atemplate\//
+          :template
+        else
+          :other
         end
+        @@pending_apply_kinds[apply_kind] = true
       end
       if upload_failed
         puts "\n#{@name}: Not applying changes due to failure\n\n"
@@ -209,10 +226,18 @@ module PluginTool
       params = {
         :plugins => @@pending_apply.map { |p| p.loaded_plugin_id }.join(' ')
       }
-      params[:turbo] = '1' if @@apply_with_turbo
+      if @@apply_with_turbo
+        params[:turbo] = '1'
+        if @@pending_apply_kinds == {:static=>true}
+          params[:static_only] = '1'
+        elsif @@pending_apply_kinds == {:template=>true}
+          params[:template_change] = '1'
+        end
+      end
       r = PluginTool.post_with_json_response("/api/development-plugin-loader/apply", params)
       if r["result"] == 'success'
         @@pending_apply = []
+        @@pending_apply_kinds = {}
       else
         puts "\n\nDidn't apply changes on server\n\n"
         PluginTool.beep

data/lib/plugin_tool.rb

@@ -100,18 +100,19 @@ if show_help || PLUGIN_TOOL_COMMAND == 'help'
 end
 
 # Find all plugins in the repository
+# Normally only search in exact directory of workspace, but if checking plugins
+# search recursively to find as many as possible.
+glob_pattern = '*/plugin.json'
+glob_pattern = '**/*/plugin.json' if PLUGIN_TOOL_COMMAND == 'check'
 plugin_paths = []
 PLUGIN_SEARCH_PATH.each do |directory|
-  Dir.glob("#{directory}/*/plugin.json").each do |p|
+  Dir.glob("#{directory}/#{glob_pattern}").each do |p|
     if p =~ /\A(.+)\/plugin\.json\z/
-      plugin_paths << $1
+      plugin_paths << File.expand_path($1)
     end
   end
 end
-
-if plugin_paths.length == 1 && plugin_paths[0] == 'ALL'
-  plugin_paths = find_all_plugins()
-end
+plugin_paths.uniq!
 
 # Some commands don't require a server or plugin to be specified
 case PLUGIN_TOOL_COMMAND

data/lib/version.txt

@@ -1 +1 @@
-2c8d256
+1f78941

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haplo
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: java
 authors:
 - Haplo Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Development tools for developing Haplo plugins, see https://haplo.org
 email: client.services@haplo-services.com