oneis 1.0.4-java → 1.1.0-java

data/lib/new_plugin.rb

@@ -16,37 +16,39 @@ module PluginTool
     rbytes = Java::byte[20].new
     random.nextBytes(rbytes)
     install_secret = String.from_java_bytes(rbytes).unpack('H*').join
+    plugin_url_fragment = plugin_name.gsub('_','-')
     File.open("#{plugin_name}/plugin.json",'w') do |file|
       file.write(<<__E)
 {
-	"pluginName": "#{plugin_name}",
-	"pluginAuthor": "TODO Your Company",
-	"pluginVersion": 1,
-	"displayName": "#{plugin_name.split('_').map {|e| e.capitalize} .join(' ')}",
-	"displayDescription": "TODO Longer description of plugin",
-	"installSecret": "#{install_secret}",
-	"apiVersion": 0,
-	"load": ["js/#{plugin_name}.js"],
-	"respond": ["/do/#{plugin_name}"]
+  "pluginName": "#{plugin_name}",
+  "pluginAuthor": "TODO Your Company",
+  "pluginVersion": 1,
+  "displayName": "#{plugin_name.split('_').map {|e| e.capitalize} .join(' ')}",
+  "displayDescription": "TODO Longer description of plugin",
+  "installSecret": "#{install_secret}",
+  "apiVersion": 2,
+  "load": [
+      "js/#{plugin_name}.js"
+    ],
+  "respond": ["/do/#{plugin_url_fragment}"]
 }
 __E
     end
     File.open("#{plugin_name}/js/#{plugin_name}.js",'w') do |file|
       file.write(<<__E)
 
-var #{plugin_name} = O.plugin("#{plugin_name}", {
-});
+var #{plugin_name} = O.plugin("#{plugin_name}");
 
-(function() {
+(function(P) {
 
-    #{plugin_name}.respond("GET", "/do/#{plugin_name}/example", [
+    P.respond("GET", "/do/#{plugin_url_fragment}/example", [
     ], function(E) {
         E.render({
             pageTitle: "Example page"
         });
     });
 
-})();
+})(#{plugin_name});
 
 __E
     end
@@ -77,12 +79,10 @@ Plugin #{plugin_name} has been created. Run
 
 to upload it to the server, then visit
 
-  https://<HOSTNAME>/do/#{plugin_name}/example
+  https://<HOSTNAME>/do/#{plugin_url_fragment}/example
 
 to see a sample page.
 
-Add additional hook handlers in the js/#{plugin_name}.js file.
-
 See http://docs.oneis.co.uk/dev/plugin for more information.
 
 __E

data/lib/plugin.rb

@@ -2,6 +2,8 @@
 module PluginTool
 
   class Plugin
+    DEFAULT_PLUGIN_LOAD_PRIORITY = 9999999
+
     def initialize(name, options)
       @name = name
       @options = options
@@ -20,9 +22,17 @@ module PluginTool
       @plugin_dir = @name
       end_on_error "logic error" unless @plugin_dir =~ /\A[a-zA-Z0-9_-]+\z/
       @loaded_plugin_id = nil
-      puts "Plugin: #{@plugin_dir}"
     end
     
+    def plugin_load_priority
+      pj = File.open("#{@plugin_dir}/plugin.json") { |f| JSON.parse(f.read) }
+      pj['loadPriority'] || DEFAULT_PLUGIN_LOAD_PRIORITY
+    end
+
+    def print_banner
+      puts "Plugin: #{@plugin_dir}"
+    end
+
     def setup_for_server
       # Delete any legacy registration file for this plugin
       registration_file = "registration.#{@plugin_dir}.yaml"
@@ -152,6 +162,7 @@ module PluginTool
             puts "\n\n#{@name}: Didn't apply changes on server\n\n"
             PluginTool.beep
           end
+          PluginTool.push_delayed_apply(@name) if r[:requires_delayed_apply]
         end
       end
       PluginTool.finish_with_connection

data/lib/plugin_tool.rb

@@ -101,11 +101,17 @@ if plugin_names.empty?
   plugin_names = all_plugins
 end
 
-# Make plugin objects and start them
+# Make plugin objects, start them, sort by order the server will load them
 plugins = plugin_names.map do |name|
   PluginTool::Plugin.new(name, options)
 end
 plugins.each { |p| p.start }
+plugins.sort! do |a,b| 
+  pri_a = a.plugin_load_priority
+  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 }
 
 # Special handling for some commands
 case PLUGIN_TOOL_COMMAND
@@ -151,6 +157,7 @@ first_run = true
 while(true)
   puts "Scanning plugin files..."
   plugins.each { |p| p.develop_scan_and_upload(first_run) }
+  PluginTool.do_delayed_apply
   puts "Waiting for changes..."
   if first_run
     puts "  Any changes you make to your local copy of the plugin will be automatically"

data/lib/server.rb

@@ -128,4 +128,18 @@ EOF
     r
   end
 
+  # Delayed apply support
+  @@delayed_apply_queue = []
+  def self.push_delayed_apply(name)
+    @@delayed_apply_queue.push(name)
+  end
+  def self.do_delayed_apply
+    return if @@delayed_apply_queue.empty?
+    puts "Updating server..."
+    self.post_yaml("/api/development_plugin_loader/delayed_apply", {"plugins" => @@delayed_apply_queue.join(',')})
+    self.finish_with_connection
+    puts "Updated."
+    @@delayed_apply_queue = []
+  end
+
 end

data/lib/version.txt

@@ -1 +1 @@
-30ba1d4d14
+ef06a9244e

data/oneis.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        = 'oneis'
-  s.version     = '1.0.4'
-  s.date        = '2013-03-30'
+  s.version     = '1.1.0'
+  s.date        = '2014-10-03'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]

metadata

@@ -2,7 +2,7 @@
 name: oneis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.1.0
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-30 00:00:00 Z
+date: 2014-10-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl