haplo 2.2.2-java → 2.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 190d565dbf232dd436f471739be9aefc29971fcf
-  data.tar.gz: 0afe0ae84193295c0bd5ed7597f1586af5c7855a
+  metadata.gz: 1208fad2d6e09f5e211febcbf66db8d7e001d4a5
+  data.tar.gz: db04bc4e201be9ac114b7ce0e5a443e157100ce5
 SHA512:
-  metadata.gz: 4e540d591d93b81d105ab3f8f3efa07ea05ad98a950de35c7bf8fd210fe8c9a6ab2f948a636b490692813dde5348eac80fa628aa73bb78f0fa6ce458c5ff7222
-  data.tar.gz: 88e45b40016126f1a5cf38023c60ba72333b0f77017341a7752d9ca507b53162af5ca42414481ae518227d5d80de936a1d1a03ce2f883bedcb3403aec0c853bc
+  metadata.gz: a359b495e0434d0df43228ee04f12a4bc27e88046037f9b0c0c1849f34294710eeb86f980c8528ea4263c34fcd6888d393399570e984fca8ce4a1e950484b381
+  data.tar.gz: 65460374ff546f428de0493408a8c7d29d52244c7cc584499eb7f3a7ec9c95cc8e7981abd5c00f30038c6df994fee9dcf0bc83b3be1e7d6b1353cb1d493b5aa1

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.2.2'
-  s.date        = '2016-05-23'
+  s.version     = '2.2.3'
+  s.date        = '2016-05-30'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see http://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/check.rb

@@ -37,7 +37,7 @@ module PluginTool
       next unless File.file?(pathname)
       next if plugin.exclude_files_from_syntax_check.include?(pathname)
       plugin_relative_name = pathname[plugin_dir.length+1, pathname.length]
-      if pathname =~ /\.(js|hsvt)\z/i
+      if pathname =~ SYNTAX_CHECK_REGEXP
         STDOUT.write("."); STDOUT.flush
         # Check JavaScript
         report = syntax_check_one_file(plugin, plugin_relative_name)
@@ -45,7 +45,7 @@ module PluginTool
           check_file_result(plugin, plugin_relative_name, :OK)
         else
           puts "\n**** #{plugin_relative_name} has errors:\n#{report}\n"
-          check_file_result(plugin, plugin_relative_name, (plugin_relative_name =~ /\A(js|template)\//) ? :FAIL : :WARN)
+          check_file_result(plugin, plugin_relative_name, (plugin_relative_name =~ /\A(js|template|file)\//) ? :FAIL : :WARN)
         end
       else
         # TODO: Checks for other file types, including the plugin.json

data/lib/manifest.rb

@@ -7,7 +7,7 @@
 
 module PluginTool
 
-  PLUGIN_ACCEPTABLE_FILENAME = /\A(js|static|template|test|data)\/([A-Za-z0-9_-]+\/)*[A-Za-z0-9_-]+\.[A-Za-z0-9]+\z/
+  PLUGIN_ACCEPTABLE_FILENAME = /\A(js|static|template|test|file)\/([A-Za-z0-9_-]+\/)*[A-Za-z0-9_-]+\.[A-Za-z0-9]+\z/
   PLUGIN_ACCEPTABLE_FILENAME_EXCEPTIONS = ['plugin.json', 'requirements.schema', 'global.js', 'certificates-temp-http-api.pem', 'developer.json', 'readme.txt']
   def self.plugin_filename_allowed?(filename)
     (filename =~ PLUGIN_ACCEPTABLE_FILENAME) || (PLUGIN_ACCEPTABLE_FILENAME_EXCEPTIONS.include?(filename))

data/lib/new_plugin.rb

@@ -15,8 +15,8 @@ module PluginTool
       end_on_error "File or directory #{plugin_name} already exists"
     end
     FileUtils.mkdir(plugin_name)
-    ['js', 'static', 'template', 'test'].each do |dir|
-      FileUtils.mkdir("#{plugin_name}/#{dir}")
+    ['js', 'static', 'template', 'test', 'file/form'].each do |dir|
+      FileUtils.mkdir_p("#{plugin_name}/#{dir}")
     end
     random = java.security.SecureRandom.new()
     rbytes = Java::byte[20].new

data/lib/plugin.rb

@@ -186,7 +186,7 @@ module PluginTool
             # Otherwise mark as a failed upload to stop an apply operation which will fail
             upload_failed = true
           end
-          PluginTool.syntax_check(self, filename) if filename =~ /\.(js|hsvt)\z/i
+          PluginTool.syntax_check(self, filename) if filename =~ SYNTAX_CHECK_REGEXP
         end
       end
       if upload_failed

data/lib/plugin_tool.rb

@@ -18,7 +18,7 @@ PluginTool.try_load_custom
 
 WORKSPACE_FILE = 'workspace.json'
 LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true, "new" => true}
-NO_DEPENDENCY_COMMANDS = LOCAL_ONLY_COMMANDS.dup
+NO_DEPENDENCY_COMMANDS = {"reset-db" => true}.merge(LOCAL_ONLY_COMMANDS)
 PLUGIN_SEARCH_PATH = ['.']
 
 # Options for passing to plugin objects

data/lib/syntax_checking.rb

@@ -7,6 +7,8 @@
 
 module PluginTool
 
+  SYNTAX_CHECK_REGEXP = /\.(js|hsvt|json)\z/i
+
   @@syntax_check_queue = []
   @@syntax_check_queue_lock = Mutex.new
   @@syntax_check_queue_semaphore = Mutex.new
@@ -46,6 +48,7 @@ module PluginTool
     api_version = (plugin_json["apiVersion"] || '0').to_i
     # Determine kind of file
     return syntax_check_haplo_template(plugin, file) if file =~ /\.hsvt\z/i
+    return syntax_check_json_file(plugin, file) if file =~ /\.json\z/i
     kind = (file =~ /\A(\w+)\//) ? $1 : file
     # Is this file referenced?
     report = nil
@@ -103,6 +106,15 @@ module PluginTool
   end
   PARSER_CONFIG = TemplateParserConfiguration.new
 
+  def self.syntax_check_json_file(plugin, file)
+    begin
+      JSON.parse(File.read("#{plugin.plugin_dir}/#{file}"))
+      nil
+    rescue => e
+      "  #{e.message}"
+    end
+  end
+
   def self.do_syntax_checking
     init_syntax_checking
     while(true)

data/lib/version.txt

@@ -1 +1 @@
-b3aebf0
+fc8a30a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haplo
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: java
 authors:
 - Haplo Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies: []
 description: Development tools for developing Haplo plugins, see http://haplo.org
 email: client.services@haplo-services.com