haplo 2.1.4-java → 2.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b57db6dd8959c97a21ba14cb5b9940a343d7873
-  data.tar.gz: e72b35f09b0594747c79bf798e2eb8c420afec64
+  metadata.gz: bfa6979121ba2e2ed596e02f9faf5bac9d9aa8e7
+  data.tar.gz: 95c98823f92be457fa20021644be110f5812cd6f
 SHA512:
-  metadata.gz: 617b0ad328c0de02f5ecf9e3bf056735bb27f8d8260074ade0d6d16891a115c4bce3be286fa06517f844822a9f76bb35fc8b62d24538da6d51db3db913f20fb1
-  data.tar.gz: f8e0d3b004f0aa63adbeaeda6f53f9ca90a618818c9b0666419a79a7ae521e62df69a15b62a3a1456569ac9f0ddef31c8bb09b2fff0c33ab27372ca6d499d761
+  metadata.gz: 2109252a9deabcee929449ef4eaf98b19997f8891510a026391258d656967552aa6eb4b240c68200e9d1bb5a3403c6ed552e01b1c173ab1167566506ae80e821
+  data.tar.gz: c20f9a22838d355ec5ca08f90366416a0af904d0161ee865989345a271f7786f18096740bc23e00c62c5ee20aa75b113242b05ea9f6b30b770981537bf0aa833

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

data/lib/manifest.rb

@@ -7,8 +7,11 @@
 
 module PluginTool
 
-  # NOTE: Also update packing.rb if this changes
-  ALLOWED_PLUGIN_DIRS = ['js', 'static', 'template', 'test', 'data']
+  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_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))
+  end
 
   def self.generate_manifest(directory)
     manifest = Hash.new
@@ -19,13 +22,9 @@ module PluginTool
       next if pathname =~ /\~/
       # Check file
       filename = pathname.slice(directory.length + 1, pathname.length)
-      raise "Bad filename for #{filename}" unless filename =~ /\A([a-zA-Z0-9_\/\-]+\/)?([a-zA-Z0-9_-]+\.[a-z0-9]+)\z/
-      dir = $1
-      name = $2
-      if dir != nil
-        dir = dir.gsub(/\/\z/,'')
-        raise "Bad directory #{dir}" unless dir =~ /\A([a-zA-Z0-9_\-]+)[a-zA-Z0-9_\/\-]*\z/
-        raise "Bad root directory #{$1}" unless ALLOWED_PLUGIN_DIRS.include?($1)
+      unless plugin_filename_allowed?(filename)
+        puts "WARNING: Ignoring #{filename}"
+        next
       end
       # Get hash of file
       digest = File.open(pathname) { |f| Digest::SHA256.hexdigest(f.read) }

data/lib/packing.rb

@@ -7,11 +7,10 @@
 
 module PluginTool
 
-  PACKING_ACCEPTABLE_FILENAME = /\A(js|static|template|test|data)\/([a-z0-9_-]+\/)*[a-z0-9_-]+\.[a-z0-9]+\z/
-  PACKING_ACCEPTABLE_EXCEPTIONS = ['plugin.json', 'requirements.schema', 'global.js', 'certificates-temp-http-api.pem']
-  PACKING_EXCLUDE = ['developer.json']
+  PACKING_EXCLUDE = ['developer.json', 'readme.txt']
 
-  def self.pack_plugin(plugin_name, output_directory)
+  def self.pack_plugin(plugin_name, output_directory, errors = [])
+    STDOUT.write("#{plugin_name}: ")
     # Get filenames and sort
     files = Dir.glob("#{plugin_name}/**/*").map do |filename|
       if File.file? filename
@@ -19,29 +18,26 @@ module PluginTool
       else
         nil
       end
-    end .select { |f| !PACKING_EXCLUDE.include?(f) }.compact.sort
-    # Check each filename is acceptable
-    files.each do |filename|
-      unless filename =~ PACKING_ACCEPTABLE_FILENAME || PACKING_ACCEPTABLE_EXCEPTIONS.include?(filename)
-        puts "File '#{filename}' has an unacceptable filename"
-        exit 1
+    end .compact.select do |filename|
+      ok = plugin_filename_allowed?(filename) && !PACKING_EXCLUDE.include?(filename)
+      unless ok || PACKING_EXCLUDE.include?(filename)
+        STDOUT.write("!")
+        errors.push("IGNORED: #{plugin_name}/#{filename}")
       end
-    end
+      ok
+    end .sort
     # Clean output directory
     output_plugin_dir = "#{output_directory}/#{plugin_name}"
-    puts "Output directory: #{output_plugin_dir}"
     if File.exist? output_plugin_dir
-      puts "Removing old output directory #{output_plugin_dir}"
       FileUtils.rm_r(output_plugin_dir)
     end
     # Make file structure
     FileUtils.mkdir(output_plugin_dir)
     # Process each file, building a manifest
-    puts "Processing files:"
     manifest = ''
     minimiser = PluginTool::Minimiser.new
     files.each do |filename|
-      puts "  #{filename}"
+      STDOUT.write("."); STDOUT.flush
       data = File.open("#{plugin_name}/#{filename}") { |f| f.read }
       # Minimise file?
       unless filename =~ /\Ajs\//
@@ -56,13 +52,12 @@ module PluginTool
       # Filename entry in Manifest
       manifest << "F #{hash} #{filename}\n"
     end
+    STDOUT.write("\n")
     minimiser.finish
     # Write manifest and version
     File.open("#{output_plugin_dir}/manifest", "w") { |f| f.write manifest }
     version = Digest::SHA256.hexdigest(manifest)
     File.open("#{output_plugin_dir}/version", "w") { |f| f.write "#{version}\n" }
-    # All done
-    puts "Version: #{version}\nPlugin packed."
   end
 
 end

data/lib/plugin.rb

@@ -40,10 +40,6 @@ module PluginTool
       pj['loadPriority'] || DEFAULT_PLUGIN_LOAD_PRIORITY
     end
 
-    def print_banner
-      puts "Plugin: #{@plugin_dir}"
-    end
-
     def setup_for_server
       # Make the first empty manifest (may be replaced from server)
       @current_manifest = {}
@@ -96,7 +92,7 @@ module PluginTool
 
     # ---------------------------------------------------------------------------------------------------------
 
-    def command(cmd)
+    def command(cmd, errors)
       case cmd
       when 'license-key'
         application_id = @options.args.first
@@ -106,7 +102,7 @@ module PluginTool
         generate_license_key(application_id)
 
       when 'pack'
-        PluginTool.pack_plugin(@name, @options.output)
+        PluginTool.pack_plugin(@name, @options.output, errors)
 
       when 'reset-db'
         puts "Resetting database on server for #{@name}..."

data/lib/plugin_tool.rb

@@ -128,7 +128,7 @@ plugins.sort! do |a,b|
   pri_b = b.plugin_load_priority
   (pri_a == pri_b) ? (a.name <=> b.name) : (pri_a <=> pri_b)
 end
-plugins.each { |p| p.print_banner }
+puts "#{plugins.length} plugin#{plugins.length != 1 ? 's' : ''}"
 
 # Custom behaviour for this repo?
 PluginTool.custom_behaviour.start(plugins, PLUGIN_TOOL_COMMAND, options, LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND])
@@ -166,11 +166,13 @@ unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
 end
 
 # Run the command
-plugins.each { |p| p.command(PLUGIN_TOOL_COMMAND) }
+errors = []
+plugins.each { |p| p.command(PLUGIN_TOOL_COMMAND, errors) }
 
-# It this isn't the long-running develop command, stop now
+# It this isn't the long-running develop command, output errors and stop now
 if PLUGIN_TOOL_COMMAND != 'develop'
-  exit 0
+  errors.each { |error| puts error }
+  exit(errors.empty? ? 0 : 1)
 end
 
 # Syntax checking in the background

data/lib/version.txt

@@ -1 +1 @@
-14b9698
+a8e1cfc

metadata

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