haplo 2.3.6-java → 2.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d7dc8a7f2805538445aaf8f1395f7c12f2f0e5175622109faefd25b52ea918
-  data.tar.gz: 9416b8519d66169b4bad95aa0c657251e73af33135cd1e29a3a0897e2945188e
+  metadata.gz: 46492c3a4a0a11361880fca6b8867f92519a1c22d18dd2d45622f63614243606
+  data.tar.gz: 1f53526404acf0d48d5b83dc8bd0a5507c1485469db009b94f895319eedfac70
 SHA512:
-  metadata.gz: 2b9f4f2ff2b553c9b60eb260659d6f2c82396290b77e61c9be3177024efd3c1d76c2eefbdc722a7e26bd70c61e1cd5a26d7ade503c36ea3b1228941c465cef54
-  data.tar.gz: 16bb2d85c8d9fd2104f9a7e0f5f575960eed30ee99b25d9196a00b58068e3fc8180914ade6da1f9111625f50672b9768b15e239579569369ec106e9e5965ca33
+  metadata.gz: 5756f22e3b507f021755eebde4d5eb7f7cb3bf28d52c6c0118132fe78a76cd1a8b17aa561cde910877013839cea9f2033d83c74e1117280759395cc7f0594405
+  data.tar.gz: add428a9a6c3cd65ed391cde852fd073570c13f1750147062935f922d669f6f849899856538c0ca2adf08a167a09fb499820f7667ed605c26522f7106ca5ccfd

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.6'
-  s.date        = '2018-03-12'
+  s.version     = '2.4.0'
+  s.date        = '2018-06-15'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see https://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/manifest.rb

@@ -27,7 +27,7 @@ module PluginTool
         next
       end
       # Get hash of file
-      digest = File.open(pathname) { |f| Digest::SHA256.hexdigest(f.read) }
+      digest = File.open(pathname, "rb") { |f| Digest::SHA256.hexdigest(f.read) }
       # And add to manifest
       manifest[filename] = digest
     end

data/lib/packing.rb

@@ -9,7 +9,7 @@ module PluginTool
 
   PACKING_EXCLUDE = ['developer.json', 'readme.txt']
 
-  def self.pack_plugin(plugin, output_directory, errors = [])
+  def self.pack_plugin(plugin, output_directory, restrict_to_app_id, errors = [])
     STDOUT.write("#{plugin.name}: ")
     raise "Bad plugin name when packing" unless plugin.name =~ /\A[a-zA-Z0-9_]+\z/
     # Get filenames and sort
@@ -29,7 +29,7 @@ module PluginTool
       ok
     end .sort
     # Clean output directory
-    output_plugin_dir = "#{output_directory}/#{plugin.name}"
+    output_plugin_dir = "#{output_directory}/#{restrict_to_app_id ? "#{restrict_to_app_id}." : ''}#{plugin.name}"
     if File.exist? output_plugin_dir
       FileUtils.rm_r(output_plugin_dir)
     end
@@ -40,7 +40,13 @@ module PluginTool
     minimiser = PluginTool::Minimiser.new
     files.each do |filename|
       STDOUT.write("."); STDOUT.flush
-      data = File.open("#{plugin_dir}/#{filename}") { |f| f.read }
+      data = File.open("#{plugin_dir}/#{filename}", "rb") { |f| f.read }
+      # Rewrite plugin.json?
+      if filename == 'plugin.json' && restrict_to_app_id
+        plugin_json = JSON.parse(data)
+        plugin_json['restrictToApplicationId'] = restrict_to_app_id
+        data = JSON.pretty_generate(plugin_json)
+      end
       # Minimise file?
       unless filename =~ /\A(js|test)\//
         data = minimiser.process(data, filename)

data/lib/plugin.rb

@@ -109,7 +109,7 @@ module PluginTool
         generate_license_key(application_id)
 
       when 'pack'
-        PluginTool.pack_plugin(self, @options.output, errors)
+        PluginTool.pack_plugin(self, @options.output, @options.restrict_to_app_id, errors)
 
       when 'reset-db'
         puts "Resetting database on server for #{@name}..."
@@ -171,7 +171,7 @@ module PluginTool
           PluginTool.post_with_json_response("/api/development-plugin-loader/delete-file/#{@loaded_plugin_id}", params)
         else
           puts "  #{@name}: Uploading #{filename}"
-          data = File.open("#{@plugin_dir}/#{filename}") { |f| f.read }
+          data = File.open("#{@plugin_dir}/#{filename}", "rb") { |f| f.read }
           hash = action
           # Minimise file before uploading?
           if @options.minimiser != nil && filename =~ /\A(static|template)\//

data/lib/plugin_tool.rb

@@ -23,7 +23,7 @@ NO_DEPENDENCY_COMMANDS.delete('list')
 PLUGIN_SEARCH_PATH = ['.']
 
 # Options for passing to plugin objects
-options = Struct.new(:output, :minimiser, :no_dependency, :no_console, :show_system_audit, :args, :force, :turbo, :server_substring).new
+options = Struct.new(:output, :minimiser, :no_dependency, :with_dependency, :exclude_with_prefix, :no_console, :show_system_audit, :args, :force, :turbo, :server_substring, :restrict_to_app_id).new
 
 # Parse arguments
 show_help = false
@@ -32,10 +32,13 @@ opts = GetoptLong.new(
   ['--help', '-h', GetoptLong::NO_ARGUMENT],
   ['--plugin', '-p', GetoptLong::OPTIONAL_ARGUMENT],
   ['--no-dependency', GetoptLong::NO_ARGUMENT],
+  ['--with-dependency', GetoptLong::NO_ARGUMENT],
+  ['--exclude-with-prefix', GetoptLong::REQUIRED_ARGUMENT],
   ['--server', '-s', GetoptLong::REQUIRED_ARGUMENT],
   ['--force', GetoptLong::NO_ARGUMENT],
   ['--turbo', GetoptLong::NO_ARGUMENT],
   ['--output', GetoptLong::REQUIRED_ARGUMENT],
+  ['--pack-restrict-to-app-id', GetoptLong::REQUIRED_ARGUMENT],
   ['--no-console', '-n', GetoptLong::NO_ARGUMENT],
   ['--show-system-audit', GetoptLong::NO_ARGUMENT],
   ['--minimise', '--minimize', '-m', GetoptLong::NO_ARGUMENT]
@@ -49,10 +52,16 @@ opts.each do |opt, argument|
     requested_plugins = argument.split(',').map {|n| n.gsub(/[\/\\]+\z/,'')} # remove trailing dir separators
   when '--no-dependency'
     options.no_dependency = true
+  when '--with-dependency'
+    options.with_dependency = true
+  when '--exclude-with-prefix'
+    options.exclude_with_prefix = argument
   when '--server'
     options.server_substring = argument
   when '--output'
     options.output = argument
+  when '--pack-restrict-to-app-id'
+    options.restrict_to_app_id = argument.to_i
   when '--no-console'
     options.no_console = true
   when '--show-system-audit'
@@ -199,7 +208,13 @@ end
 if requested_plugins == ["ALL"]
   plugins = ALL_PLUGINS.dup
 else
-  plugins = plugins_with_dependencies(requested_plugins, options.no_dependency || NO_DEPENDENCY_COMMANDS[PLUGIN_TOOL_COMMAND])
+  no_dependency = options.no_dependency || NO_DEPENDENCY_COMMANDS[PLUGIN_TOOL_COMMAND]
+  no_dependency = false if options.with_dependency
+  plugins = plugins_with_dependencies(requested_plugins, no_dependency)
+end
+if options.exclude_with_prefix
+  exclude_regexp = Regexp.new("\\A(#{options.exclude_with_prefix.split(',').join('|')})")
+  plugins = plugins.select { |plugin| plugin.name !~ exclude_regexp }
 end
 if plugins.length == 0
   end_on_error "No plugins selected, check -p option (requested: #{requested_plugins.join(',')})"

data/lib/version.txt

@@ -1 +1 @@
-1e1d187
+8fc7036

metadata

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