haplo 2.2.3-java → 2.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1208fad2d6e09f5e211febcbf66db8d7e001d4a5
-  data.tar.gz: db04bc4e201be9ac114b7ce0e5a443e157100ce5
+  metadata.gz: 6fe34a8b772a94f2081c13061dbeaa847bd8d59f
+  data.tar.gz: 6feb4525fb78d5ea42e4b9df4d2c7b6745f80737
 SHA512:
-  metadata.gz: a359b495e0434d0df43228ee04f12a4bc27e88046037f9b0c0c1849f34294710eeb86f980c8528ea4263c34fcd6888d393399570e984fca8ce4a1e950484b381
-  data.tar.gz: 65460374ff546f428de0493408a8c7d29d52244c7cc584499eb7f3a7ec9c95cc8e7981abd5c00f30038c6df994fee9dcf0bc83b3be1e7d6b1353cb1d493b5aa1
+  metadata.gz: abe4e42470ab21c5faa712c2c8e39169107d7e9c206c6861af15262bffcdbd6d453654ea16fba355ac9ef1c534b0a0fe9e42beec3a8da8197f3ba972dd543fad
+  data.tar.gz: 648bef2f9722e6fe327e2a73835e6d0161bf81f15f607b97da8b653cbf8b8c4483f183331c079df75090e828a1d391a6be85f7f85b1676d0260a63e8f613be7a

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

data/lib/packing.rb

@@ -9,12 +9,14 @@ module PluginTool
 
   PACKING_EXCLUDE = ['developer.json', 'readme.txt']
 
-  def self.pack_plugin(plugin_name, output_directory, errors = [])
-    STDOUT.write("#{plugin_name}: ")
+  def self.pack_plugin(plugin, output_directory, errors = [])
+    STDOUT.write("#{plugin.name}: ")
+    raise "Bad plugin name when packing" unless plugin.name =~ /\A[a-zA-Z0-9_]+\z/
     # Get filenames and sort
-    files = Dir.glob("#{plugin_name}/**/*").map do |filename|
+    plugin_dir = plugin.plugin_dir
+    files = Dir.glob("#{plugin_dir}/**/*").map do |filename|
       if File.file? filename
-        filename[plugin_name.length+1, filename.length]
+        filename[plugin_dir.length+1, filename.length]
       else
         nil
       end
@@ -22,12 +24,12 @@ module PluginTool
       ok = plugin_filename_allowed?(filename) && !PACKING_EXCLUDE.include?(filename)
       unless ok || PACKING_EXCLUDE.include?(filename)
         STDOUT.write("!")
-        errors.push("IGNORED: #{plugin_name}/#{filename}")
+        errors.push("IGNORED: #{plugin_dir}/#{filename}")
       end
       ok
     end .sort
     # Clean output directory
-    output_plugin_dir = "#{output_directory}/#{plugin_name}"
+    output_plugin_dir = "#{output_directory}/#{plugin.name}"
     if File.exist? output_plugin_dir
       FileUtils.rm_r(output_plugin_dir)
     end
@@ -38,7 +40,7 @@ module PluginTool
     minimiser = PluginTool::Minimiser.new
     files.each do |filename|
       STDOUT.write("."); STDOUT.flush
-      data = File.open("#{plugin_name}/#{filename}") { |f| f.read }
+      data = File.open("#{plugin_dir}/#{filename}") { |f| f.read }
       # Minimise file?
       unless filename =~ /\Ajs\//
         data = minimiser.process(data, filename)

data/lib/plugin.rb

@@ -106,7 +106,7 @@ module PluginTool
         generate_license_key(application_id)
 
       when 'pack'
-        PluginTool.pack_plugin(@name, @options.output, errors)
+        PluginTool.pack_plugin(self, @options.output, errors)
 
       when 'reset-db'
         puts "Resetting database on server for #{@name}..."

data/lib/version.txt

@@ -1 +1 @@
-fc8a30a
+0f48ed9

metadata

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