oneis 2.0.1-java → 2.0.2-java

data/bin/oneis-plugin

@@ -23,6 +23,7 @@ end
 require JS_JAR
 
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/hmac.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/local_config.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/manifest.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/auth.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/server.rb"

data/lib/local_config.rb

@@ -0,0 +1,28 @@
+
+module PluginTool
+
+  module LocalConfig
+
+    LOCAL_CONFIG_FILENAME = "server.config.json"
+
+    def self.load
+      if File.exist? LOCAL_CONFIG_FILENAME
+        @@local_config = JSON.parse(File.open(LOCAL_CONFIG_FILENAME) { |f| f.read })
+      else
+        @@local_config = {}
+      end
+    end
+
+    def self.get_list(list_name)
+      lookup = @@local_config[list_name]
+      return [] unless lookup
+      list = []
+      server_name = PluginTool.get_server_hostname
+      list.concat(lookup['*']) if lookup.has_key?('*')
+      list.concat(lookup[server_name]) if server_name && lookup.has_key?(server_name)
+      list
+    end
+
+  end
+
+end

data/lib/plugin_tool.rb

@@ -8,6 +8,8 @@ File.open("#{File.dirname(__FILE__)}/version.txt") do |f|
   puts "ONEIS Plugin Tool (#{f.read.chomp})"
 end
 
+PluginTool::LocalConfig.load
+
 # Commands not needing server
 LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true}
 
@@ -54,6 +56,8 @@ end
 PLUGIN_TOOL_COMMAND = (ARGV.shift || 'develop')
 options.args = ARGV
 
+automatic_plugin_exclusion = false
+
 # Help message?
 if show_help || PLUGIN_TOOL_COMMAND == 'help'
   puts File.open("#{File.dirname(__FILE__)}/usage.txt") { |f| f.read }
@@ -73,6 +77,7 @@ end
 
 if plugin_names.length == 1 && plugin_names[0] == 'ALL'
   plugin_names = find_all_plugins()
+  automatic_plugin_exclusion = true
 end
 
 # Some commands don't require a server or plugin to be specified
@@ -131,7 +136,19 @@ end
 unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
   PluginTool.setup_auth(options)
   PluginTool.check_for_certificate_file
-  # Ask plugins to set themselves up
+
+  if automatic_plugin_exclusion
+    exclusions = PluginTool::LocalConfig.get_list("exclude")
+    plugins = plugins.select do |plugin|
+      if exclusions.include?(plugin.name)
+        puts "NOTICE: Excluded plugin #{plugin.name}"
+        false
+      else
+        true
+      end
+    end
+  end
+
   plugins.each { |p| p.setup_for_server }
 end
 

data/lib/server.rb

@@ -7,6 +7,10 @@ module PluginTool
     @@server_key = key
   end
 
+  def self.get_server_hostname
+    @@server_hostname
+  end
+
   def self.check_for_certificate_file
     @@server_ca = nil
     hostname_parts = (@@server_hostname || '').split('.')

data/lib/version.txt

@@ -1 +1 @@
-c7c8ef009b
+0aa65198b7

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     = '2.0.1'
-  s.date        = '2015-01-05'
+  s.version     = '2.0.2'
+  s.date        = '2015-01-09'
   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: 2.0.1
+  version: 2.0.2
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-05 00:00:00 Z
+date: 2015-01-09 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -53,6 +53,7 @@ files:
   - lib/js_min.js
   - lib/js_syntax_test.js
   - lib/jshint.js
+  - lib/local_config.rb
   - lib/manifest.rb
   - lib/minimise.rb
   - lib/misc.rb