haplo 2.1.6-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2580e89728f71a5f2e81403599254853ebd038ca
-  data.tar.gz: 8c968ba0d72039f7808074c9f446537ed276f374
+  metadata.gz: 5c0a878dd42f37f3aec318b396740eb2673cb94d
+  data.tar.gz: 24bba608eb2e1aa21b5def4f12f8965e0e31e6e9
 SHA512:
-  metadata.gz: 87d9fb09cf7626aade9acc0d551e4a4512c9df50c12e1fc85e3130709c8c063ac61f0c1515d1e0def2b79222e702bcf9080e13a12d150617b78584a97ec29f7e
-  data.tar.gz: 2422f6a43b7ab1680d56e165be2f07896773f527e2e6cdc7e2e2a8f6d985a522cb77cd13ccc6aeeeed8d3534b4e9ea9c2632e193378f3e6488efa4d90eafabe1
+  metadata.gz: eeb2c6fe5e9c54846f8c8b7c697981adda3cd20b5ab45ca032597b9ac174c5d0b3a7f545c5a79677b88a4d2249099664f90d177514f0568521857e14f5fcfc4a
+  data.tar.gz: ac136d52d8c9a2bacef648d826d72f142ef640c91b9e47f805f686bf062554ea6b7a65c85b545eec6b9d9e008b2e04858b6bd620a3b3b580caa5d312dd4cdd26

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.6'
-  s.date        = '2016-04-28'
+  s.version     = '2.2.0'
+  s.date        = '2016-05-13'
   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

@@ -10,12 +10,22 @@ module PluginTool
   class Plugin
     DEFAULT_PLUGIN_LOAD_PRIORITY = 9999999
 
-    def initialize(name, options)
-      @name = name
+    def initialize(dir, options)
+      @plugin_dir = dir
       @options = options
+      # Check to see if the plugin is valid
+      unless File.file?("#{@plugin_dir}/plugin.json")
+        end_on_error "Plugin #{@plugin_dir} does not exist (no plugin.json file)"
+      end
+      pj = File.open("#{@plugin_dir}/plugin.json") { |f| JSON.parse(f.read) }
+      @name = pj["pluginName"]
+      end_on_error "#{@plugin_dir}/plugin.json: invalid pluginName" unless @name.kind_of?(String)
+      @depend = pj["depend"] || []
+      end_on_error "#{@plugin_dir}/plugin.json: invalid pluginName" unless @depend.kind_of?(Array)
     end
     attr_accessor :name
     attr_accessor :plugin_dir
+    attr_accessor :depend
     attr_accessor :loaded_plugin_id
 
     # ---------------------------------------------------------------------------------------------------------
@@ -25,13 +35,7 @@ module PluginTool
     # ---------------------------------------------------------------------------------------------------------
 
     def start
-      # Check to see if the plugin is valid
-      unless File.file?("#{@name}/plugin.json")
-        end_on_error "Plugin #{@name} does not exist (no plugin.json file)"
-      end
       # Setup for using the plugin
-      @plugin_dir = @name
-      end_on_error "logic error" unless @plugin_dir =~ /\A[a-zA-Z0-9_-]+\z/
       @loaded_plugin_id = nil
     end
 

data/lib/plugin_tool.rb

@@ -20,18 +20,20 @@ PluginTool::LocalConfig.load
 
 # Commands not needing server
 LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true}
-
-# Plugin names
-plugin_names = []
+PLUGIN_SEARCH_PATH = ['.']
 
 # Options for passing to plugin objects
-options = Struct.new(:output, :minimiser, :no_console, :show_system_audit, :args, :force, :server_substring).new
+options = Struct.new(:output, :minimiser, :no_dependency, :no_console, :show_system_audit, :args, :force, :server_substring).new
 
 # Parse arguments
 show_help = false
+workspace_file = nil
+requested_plugins = []
 opts = GetoptLong.new(
   ['--help', '-h', GetoptLong::NO_ARGUMENT],
+  ['--workspace', '-w', GetoptLong::REQUIRED_ARGUMENT],
   ['--plugin', '-p', GetoptLong::OPTIONAL_ARGUMENT],
+  ['--no-dependency', GetoptLong::NO_ARGUMENT],
   ['--server', '-s', GetoptLong::REQUIRED_ARGUMENT],
   ['--force', GetoptLong::NO_ARGUMENT],
   ['--output', GetoptLong::REQUIRED_ARGUMENT],
@@ -44,8 +46,12 @@ opts.each do |opt, argument|
   case opt
   when '--help'
     show_help = true
+  when '--workspace'
+    workspace_file = argument
   when '--plugin'
-    plugin_names = argument.split(',').map {|n| n.gsub(/[\/\\]+\z/,'')} # remove trailing dir separators
+    requested_plugins = argument.split(',').map {|n| n.gsub(/[\/\\]+\z/,'')} # remove trailing dir separators
+  when '--no-dependency'
+    options.no_dependency = true
   when '--server'
     options.server_substring = argument
   when '--output'
@@ -64,6 +70,35 @@ end
 PLUGIN_TOOL_COMMAND = (ARGV.shift || 'develop')
 options.args = ARGV
 
+# Parse workspace file
+if workspace_file
+  workspace_json = JSON.parse(File.read(workspace_file))
+  if workspace_json.has_key?("base")
+    workspace_base_json = JSON.parse(File.read(File.dirname(workspace_file)+'/'+workspace_json["base"]))
+    workspace_json = workspace_base_json.merge(workspace_json)
+  end
+  if workspace_json.has_key?("search")
+    PLUGIN_SEARCH_PATH.clear
+    workspace_json["search"].each do |entry|
+      if entry.has_key?("path")
+        path = File.expand_path(File.dirname(workspace_file)+'/'+entry["path"])
+        unless Dir.exist?(path)
+          puts "Can't find directory: #{path}"
+          puts "  #{entry["name"]}" if entry.has_key?("name")
+          puts "  #{entry["obtain"]}" if entry.has_key?("obtain")
+          exit 1
+        end
+        PLUGIN_SEARCH_PATH.push(path)
+      end
+    end
+  end
+  if workspace_json.has_key?("plugins")
+    if requested_plugins.empty?
+      requested_plugins = workspace_json["plugins"]
+    end
+  end
+end
+
 automatic_plugin_exclusion = false
 
 # Help message?
@@ -72,28 +107,27 @@ if show_help || PLUGIN_TOOL_COMMAND == 'help'
   exit 0
 end
 
-# Plugin names handling
-def find_all_plugins()
-  all_plugins = []
-  Dir.glob("**/plugin.json").each do |p|
-    if p =~ /\A([a-zA-Z0-9_]+)\/plugin\.json\z/
-      all_plugins << $1
+# Find all plugins in the repository
+plugin_paths = []
+PLUGIN_SEARCH_PATH.each do |directory|
+  Dir.glob("#{directory}/*/plugin.json").each do |p|
+    if p =~ /\A(.+)\/plugin\.json\z/
+      plugin_paths << $1
     end
   end
-  all_plugins
 end
 
-if plugin_names.length == 1 && plugin_names[0] == 'ALL'
-  plugin_names = find_all_plugins()
+if plugin_paths.length == 1 && plugin_paths[0] == 'ALL'
+  plugin_paths = find_all_plugins()
   automatic_plugin_exclusion = true
 end
 
 # Some commands don't require a server or plugin to be specified
 case PLUGIN_TOOL_COMMAND
 when 'new'
-  end_on_error "Plugin name not specified, use --plugin option." if plugin_names.empty?
-  end_on_error "Only one plugin name should be specified for new command" if plugin_names.length > 1
-  PluginTool.make_new_plugin(plugin_names.first)
+  end_on_error "Plugin name not specified, use --plugin option." if requested_plugins.empty?
+  end_on_error "Only one plugin name should be specified for new command" if requested_plugins.length > 1
+  PluginTool.make_new_plugin(requested_plugins.first)
   exit 0
 when 'auth'
   PluginTool.cmd_auth options
@@ -103,24 +137,47 @@ when 'server'
   exit 0
 end
 
-# Find a plugin if none was specified
-if plugin_names.empty?
-  all_plugins = find_all_plugins()
-  end_on_error "No plugin found" if all_plugins.length == 0
-  if all_plugins.length > 1
-    puts "Too many plugins in the current directory for automatic selection."
-    puts "Use -p plugin_name to specify. Eg:"
-    all_plugins.each do |name|
-      puts "  #{$0} -p #{name}"
-    end
-    exit 1
-  end
-  plugin_names = all_plugins
+# Check that the user requested a plugin
+if requested_plugins.empty?
+  end_on_error "No plugin specified, use -p plugin_name to specify or use workspace"
+end
+
+def find_plugin_in_list(list, name)
+  list.find { |p| p.name == name }
 end
 
 # Make plugin objects, start them, sort by order the server will load them
-plugins = plugin_names.map do |name|
-  PluginTool::Plugin.new(name, options)
+plugins = plugin_paths.map do |path|
+  PluginTool::Plugin.new(path, options)
+end
+unless requested_plugins == ["ALL"]
+  selected_plugins = plugins.select { |plugin| requested_plugins.include?(plugin.name) }
+  # Attempt to resolve dependencies
+  unless options.no_dependency
+    while true
+      selected_plugins_expanded = selected_plugins.dup
+      selected_plugins.each do |plugin|
+        plugin.depend.each do |name|
+          unless name =~ /\Astd_/
+            unless find_plugin_in_list(selected_plugins_expanded, name)
+              add_plugin = find_plugin_in_list(plugins, name)
+              if add_plugin
+                selected_plugins_expanded << add_plugin
+              else
+                puts "WARNING: Can't find dependency #{name}"
+              end
+            end
+          end
+        end
+      end
+      break if selected_plugins_expanded.length == selected_plugins.length
+      selected_plugins = selected_plugins_expanded
+    end
+  end
+  plugins = selected_plugins
+end
+if plugins.length == 0
+  end_on_error "No plugins selected, check -p option (requested: #{requested_plugins.join(',')})"
 end
 plugins.each { |p| p.start }
 plugins.sort! do |a,b|

data/lib/version.txt

@@ -1 +1 @@
-6c3573a
+6a8b347

metadata

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