haplo 2.1.3-java → 2.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44039bac7161d320c4953fadca10cd0a99e1a6ab
-  data.tar.gz: c35e2b0305765eb0f17ba4f95e735fd7b3baded3
+  metadata.gz: 5b57db6dd8959c97a21ba14cb5b9940a343d7873
+  data.tar.gz: e72b35f09b0594747c79bf798e2eb8c420afec64
 SHA512:
-  metadata.gz: 724b1e1f8944bb6040445baa038df7920b6cd9e1888b1c09f49ab51bda147c328f226f088345969ba12fe6e34a72245d1fd6a81451a4cf3fe9bb4dc4a730aa14
-  data.tar.gz: a1fbe535acea52e111c316dc4671a005d276bd68e08fc75f7d65be8be9d0a843ef3944dadc3a845459d15086079b2a5bb09bdd16b6de973309a05095360d091b
+  metadata.gz: 617b0ad328c0de02f5ecf9e3bf056735bb27f8d8260074ade0d6d16891a115c4bce3be286fa06517f844822a9f76bb35fc8b62d24538da6d51db3db913f20fb1
+  data.tar.gz: f8e0d3b004f0aa63adbeaeda6f53f9ca90a618818c9b0666419a79a7ae521e62df69a15b62a3a1456569ac9f0ddef31c8bb09b2fff0c33ab27372ca6d499d761

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

data/lib/plugin.rb

@@ -72,18 +72,25 @@ module PluginTool
 
     # ---------------------------------------------------------------------------------------------------------
 
+    def developer_json
+      @developer_json ||= begin
+        developer_json_pathname = "#{@plugin_dir}/developer.json"
+        if File.exist? developer_json_pathname
+          JSON.parse(File.read(developer_json_pathname))
+        else
+          {}
+        end
+      end
+    end
+
     def exclude_files_from_syntax_check
       @exclude_files_from_syntax_check ||= begin
         # developer.json file might contain some files which should not be syntax checked
-        exclude_files_from_check = []
-        developer_json_pathname = "#{@plugin_dir}/developer.json"
-        if File.exist? developer_json_pathname
-          developer_json = JSON.parse(File.read(developer_json_pathname))
-          if developer_json['excludeFromSyntaxCheck'].kind_of?(Array)
-            exclude_files_from_check = developer_json['excludeFromSyntaxCheck']
-          end
+        if developer_json['excludeFromSyntaxCheck'].kind_of?(Array)
+          developer_json['excludeFromSyntaxCheck']
+        else
+          []
         end
-        exclude_files_from_check
       end
     end
 

data/lib/syntax_checking.rb

@@ -77,6 +77,13 @@ module PluginTool
         # global.js requires server side syntax checking, but doesn't have any extra globals, not even the plugin name.
         kind = 'js' if kind == 'global.js'
       end
+      # Add extra symbols from developer.json?
+      extra_globals.concat(
+        case kind
+          when 'js', 'test'; plugin.developer_json['syntaxCheckGlobalsServer']
+          when 'static'; plugin.developer_json['syntaxCheckGlobalsBrowser']
+          else; []
+        end || [])
       # Do syntax checking
       lint_report = @@syntax_tester.call(@@cx, @@javascript_scope, @@javascript_scope, [js, kind, JSON.generate(extra_globals)])
       schema_report = schema_requirements ? schema_requirements.report_usage(js) : nil

data/lib/version.txt

@@ -1 +1 @@
-e388b40
+14b9698

metadata

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