oneis 1.2.2-java → 2.0.1-java

data/bin/oneis-plugin

@@ -2,7 +2,6 @@
 
 require 'java'
 
-require 'yaml'
 require 'digest/sha1'
 require 'net/http'
 require 'net/https'
@@ -25,6 +24,7 @@ require JS_JAR
 
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/hmac.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"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/syntax_checking.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/notifications.rb"

data/lib/auth.rb

@@ -0,0 +1,168 @@
+
+module PluginTool
+
+  @@keys_pathname = "#{Dir.getwd}/.server.json"
+
+  # ---------------------------------------------------------------------------------------------------------
+
+  def self.setup_auth(options)
+    keys = load_keys_file()
+    server = keys['default']
+    if options.server_substring
+      server = select_server(keys, options.server_substring)
+      end_on_error "No server found for substring '#{options.server_substring}" unless server
+    end
+    key = keys['keys'][server]
+    if key
+      hostname, port, url_base = parse_hostname_with_port(server)
+      set_server(hostname, port, key)
+      puts "Application: #{url_base}"
+    else
+      end_on_error "No server authorised. Run oneis-plugin auth SERVER_NAME"
+    end
+  end
+
+  # ---------------------------------------------------------------------------------------------------------
+
+  def self.cmd_server(options)
+    end_on_error "No server name substring given on command line" if options.args.empty?
+    keys = load_keys_file()
+    server = select_server(keys, options.args.first)
+    end_on_error "No server found for substring '#{options.args.first}" unless server
+    keys['default'] = server
+    puts "Selected server #{server}"
+    save_keys_file(keys)
+  end
+
+  # ---------------------------------------------------------------------------------------------------------
+
+  def self.cmd_auth(options)
+    end_on_error "No hostname given on command line" if options.args.empty?
+    hostname, port, url_base, server_name = parse_hostname_with_port(options.args.first)
+
+    keys = load_keys_file()
+    if keys['keys'].has_key?(server_name) && !options.force
+      puts
+      puts "Already authorised with #{server_name}"
+      puts "Use the --force argument to reauthorise with the server."
+      return
+    end
+
+    set_server(hostname, port, nil)
+    check_for_certificate_file()
+    http = get_http()
+
+    this_hostname = java.net.InetAddress.getLocalHost().getHostName() || "unknown"
+
+    puts "Requesting token from #{url_base} ..."
+    start_auth_path = "/api/plugin-tool-auth/start-auth?name=#{URI.encode(this_hostname)}"
+    request = Net::HTTP::Get.new(start_auth_path)
+    setup_request(request)
+    token = nil
+    begin
+      response = http.request(request)
+      end_on_error "Server returned an error. Check hostname and port." unless response.code == "200"
+      parsed_json = JSON.parse(response.body)
+      token = parsed_json['token']
+      end_on_error "Server doesn't look like a ONEIS server with plugin debugging enabled" unless parsed_json['ONEIS'] == 'plugin-tool-auth' && token
+    rescue => e
+      end_on_error "Failed to start authorisation process. Check hostname and port."
+    end
+
+    # Check token looks OK so we don't form dodgy URLs
+    end_on_error "Bad token" unless token =~ /\A[a-z0-9A-Z_-]+\z/
+
+    user_url = "#{url_base}/do/plugin-tool-auth/create/#{token}"
+    poll_path = "/api/plugin-tool-auth/poll/#{token}"
+
+    puts
+    if java.lang.System.getProperty("os.name") == 'Mac OS X'
+      puts "Attempting to open the following URL in your browser."
+      puts "If the browser does not open, please visit this URL in your browser."
+      system "open #{user_url}"
+    else
+      puts "Please visit this URL in your browser, and authenticate if necessary."
+    end
+    puts "  #{user_url}"
+    puts
+
+    # Poll for a few minutes, waiting for the user to authenticate
+    puts "Waiting for server to authorise..."
+    poll_count = 0
+    key = nil
+    while poll_count < 60 && !key
+      delay = if poll_count < 10
+        2
+      elsif poll_count < 20
+        4
+      else
+        8
+      end
+      sleep delay
+      begin
+        request = Net::HTTP::Get.new(poll_path)
+        setup_request(request)
+        response = http.request(request)
+        parsed_json = JSON.parse(response.body)
+        case parsed_json['status']
+        when 'wait'
+          # poll again
+        when 'available'
+          key = parsed_json['key']
+        else
+          end_on_error "Authorisation process failed."
+        end
+      rescue => e
+        end_on_error "Error communicating with server"
+      end
+    end
+    finish_with_connection()
+
+    end_on_error "Didn't managed to authorise with server." unless key
+
+    puts "Successfully authorised with server."
+
+    keys['default'] = server_name
+    keys['keys'][server_name] = key
+    save_keys_file(keys)
+
+    puts
+    puts "Key stored in #{@@keys_pathname}"
+    puts "#{server_name} selected as default server."
+  end
+
+  # ---------------------------------------------------------------------------------------------------------
+
+  def self.parse_hostname_with_port(hostname_with_port)
+    hostname_with_port = hostname_with_port.downcase.strip
+    unless hostname_with_port =~ /\A([a-z0-9\.-]+)(:(\d+))?\z/
+      end_on_error "Bad hostname #{hostname_with_port}"
+    end
+    hostname = $1
+    port = $3 ? $3.to_i : 443
+    server_name = "#{hostname}#{$3 ? ":#{$3}" : ''}"
+    [hostname, port, "https://#{server_name}", server_name]
+  end
+
+  # ---------------------------------------------------------------------------------------------------------
+
+  def self.load_keys_file
+    if File.exist?(@@keys_pathname)
+      File.open(@@keys_pathname) { |f| JSON.parse(f.read) }
+    else
+      {"_" => "Contains server keys. DO NOT COMMIT TO SOURCE CONTROL.", "default" => nil, "keys" => {}}
+    end
+  end
+
+  def self.save_keys_file(keys)
+    pn = "#{@@keys_pathname}.n"
+    File.open(pn, "w") { |f| f.write(JSON.pretty_generate(keys)) }
+    File.rename(pn, @@keys_pathname)
+  end
+
+  def self.select_server(keys, substring)
+    s = substring.downcase.strip
+    keys['keys'].keys.sort { |a,b| (a.length == b.length) ? (a <=> b) : (a.length <=> b.length) } .find { |a| a.include? s }
+  end
+
+end

data/lib/manifest.rb

@@ -22,7 +22,7 @@ module PluginTool
         raise "Bad root directory #{$1}" unless ALLOWED_PLUGIN_DIRS.include?($1)
       end
       # Get hash of file
-      digest = File.open(pathname) { |f| Digest::SHA1.hexdigest(f.read) }
+      digest = File.open(pathname) { |f| Digest::SHA256.hexdigest(f.read) }
       # And add to manifest
       manifest[filename] = digest
     end

data/lib/notifications.rb

@@ -26,7 +26,7 @@ module PluginTool
     puts "NOTICE: Notification connection established." if @@notification_announce_reconnect
     while true
       sleep(0.25) # small throttle of requests
-      path = '/api/development_plugin_loader/get_notifications'
+      path = '/api/development-plugin-loader/get-notifications'
       path << "?queue=#{@@notification_queue_name}" if @@notification_queue_name
       request = Net::HTTP::Get.new(path)
       setup_request(request)

data/lib/packing.rb

@@ -40,7 +40,7 @@ module PluginTool
       unless filename =~ /\Ajs\//
         data = minimiser.process(data, filename)
       end
-      hash = Digest::SHA1.hexdigest(data)
+      hash = Digest::SHA256.hexdigest(data)
       # Make sure output directory exists, write file
       output_pathname = "#{output_plugin_dir}/#{filename}"
       output_directory = File.dirname(output_pathname)
@@ -52,7 +52,7 @@ module PluginTool
     minimiser.finish
     # Write manifest and version
     File.open("#{output_plugin_dir}/manifest", "w") { |f| f.write manifest }
-    version = Digest::SHA1.hexdigest(manifest)
+    version = Digest::SHA256.hexdigest(manifest)
     File.open("#{output_plugin_dir}/version", "w") { |f| f.write "#{version}\n" }
     # All done
     puts "Version: #{version}\nPlugin packed."

data/lib/plugin.rb

@@ -10,6 +10,11 @@ module PluginTool
     end
     attr_accessor :name
     attr_accessor :plugin_dir
+    attr_accessor :loaded_plugin_id
+
+    # ---------------------------------------------------------------------------------------------------------
+
+    @@pending_apply = []
 
     # ---------------------------------------------------------------------------------------------------------
     
@@ -34,13 +39,6 @@ module PluginTool
     end
 
     def setup_for_server
-      # Delete any legacy registration file for this plugin
-      registration_file = "registration.#{@plugin_dir}.yaml"
-      if File.exists? registration_file
-        puts "NOTICE: Deleting legacy registration file for #{@plugin_dir}"
-        File.delete(registration_file)
-      end
-
       # Make the first empty manifest (may be replaced from server)
       @current_manifest = {}
 
@@ -50,19 +48,19 @@ module PluginTool
       end
 
       # See if the plugin has already been registered with the server
-      s_found_info = PluginTool.post_yaml("/api/development_plugin_loader/find_registration", {:name => @name})
-      if s_found_info[:found]
+      s_found_info = PluginTool.post_with_json_response("/api/development-plugin-loader/find-registration", {:name => @name})
+      if s_found_info["found"]
         # Store info returned by the server
-        @loaded_plugin_id = s_found_info[:plugin_id]
-        @current_manifest = s_found_info[:manifest]
+        @loaded_plugin_id = s_found_info["plugin_id"]
+        @current_manifest = s_found_info["manifest"]
       end
 
       # If there isn't an existing plugin registered, create a new one
       if @loaded_plugin_id == nil
-        s_create_info = PluginTool.post_yaml("/api/development_plugin_loader/create")
-        end_on_error "Couldn't communicate successfully with server." if s_create_info[:protocol_error]
-        end_on_error "Failed to create plugin on server" unless s_create_info[:plugin_id] != nil
-        @loaded_plugin_id = s_create_info[:plugin_id]
+        s_create_info = PluginTool.post_with_json_response("/api/development-plugin-loader/create")
+        end_on_error "Couldn't communicate successfully with server." if s_create_info["protocol_error"]
+        end_on_error "Failed to create plugin on server" unless s_create_info["plugin_id"] != nil
+        @loaded_plugin_id = s_create_info["plugin_id"]
       end
     end
 
@@ -82,27 +80,27 @@ module PluginTool
 
       when 'reset-db'
         puts "Resetting database on server for #{@name}..."
-        reset_result = PluginTool.post_yaml("/api/development_plugin_loader/resetdb/#{@loaded_plugin_id}")
-        end_on_error "Couldn't remove old database tables" unless reset_result[:result] == 'success'
-        apply_result = PluginTool.get_yaml("/api/development_plugin_loader/apply/#{@loaded_plugin_id}")
-        end_on_error "Couldn't apply changes" unless apply_result[:result] == 'success'
+        reset_result = PluginTool.post_with_json_response("/api/development-plugin-loader/resetdb/#{@loaded_plugin_id}")
+        end_on_error "Couldn't remove old database tables" unless reset_result["result"] == 'success'
+        apply_result = PluginTool.post_with_json_response("/api/development-plugin-loader/apply", :plugins => @loaded_plugin_id)
+        end_on_error "Couldn't apply changes" unless apply_result["result"] == 'success'
         puts "Done."
 
       when 'uninstall'
         puts "Uninstalling plugin #{@name} from server..."
-        reset_result = PluginTool.post_yaml("/api/development_plugin_loader/uninstall/#{@loaded_plugin_id}")
-        end_on_error "Couldn't uninstall plugin" unless reset_result[:result] == 'success'
+        reset_result = PluginTool.post_with_json_response("/api/development-plugin-loader/uninstall/#{@loaded_plugin_id}")
+        end_on_error "Couldn't uninstall plugin" unless reset_result["result"] == 'success'
         puts "Done."
 
       when 'test'
         puts "Running tests..."
         params = {}
-        params[:test] = @options.args.first unless @options.args.empty?
-        test_result = PluginTool.post_yaml("/api/development_plugin_loader/run_tests/#{@loaded_plugin_id}", params)
-        end_on_error "Couldn't run tests" unless test_result[:result] == 'success'
+        params["test"] = @options.args.first unless @options.args.empty?
+        test_result = PluginTool.post_with_json_response("/api/development-plugin-loader/run-tests/#{@loaded_plugin_id}", params)
+        end_on_error "Couldn't run tests" unless test_result["result"] == 'success'
         puts
-        puts test_result[:output] || ''
-        puts test_result[:summary] || "(unknown results)"
+        puts test_result["output"] || ''
+        puts test_result["summary"] || "(unknown results)"
 
       when 'develop'
         # do nothing here
@@ -119,7 +117,16 @@ module PluginTool
     end
 
     def develop_scan_and_upload(first_run)
+      should_apply = first_run
       next_manifest = PluginTool.generate_manifest(@plugin_dir)
+      if !(next_manifest.has_key?("plugin.json"))
+        # If the plugin.json file is deleted, just uninstall the plugin from the server
+        command('uninstall')
+        @is_uninstalled = true
+        return
+      elsif @is_uninstalled
+        should_apply = true
+      end
       changes = PluginTool.determine_manifest_changes(@current_manifest, next_manifest)
       upload_failed = false
       changes.each do |filename, action|
@@ -128,7 +135,7 @@ module PluginTool
         params[:directory] = $1.gsub(/\/\z/,'') if $1
         if action == :delete
           puts "  #{@name}: Deleting #{filename}"
-          PluginTool.post_yaml("/api/development_plugin_loader/delete_file/#{@loaded_plugin_id}", params)
+          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 }
@@ -138,13 +145,13 @@ module PluginTool
             size_before = data.length
             data = @options.minimiser.process(data, filename)
             size_after = data.length
-            hash = Digest::SHA1.hexdigest(data)
+            hash = Digest::SHA256.hexdigest(data)
             puts "        minimisation: #{size_before} -> #{size_after} (#{(size_after * 100) / size_before}%)"
           end
-          r = PluginTool.post_yaml("/api/development_plugin_loader/put_file/#{@loaded_plugin_id}", params, {:file => [filename, data]})
-          if r[:result] == 'success'
+          r = PluginTool.post_with_json_response("/api/development-plugin-loader/put-file/#{@loaded_plugin_id}", params, {:file => [filename, data]})
+          if r["result"] == 'success'
             # If the file was uploaded successfully, but the hash didn't match, abort now
-            end_on_error "#{@name}: Disagreed with server about uploaded file hash: local=#{hash}, remote=#{r[:hash]}" unless hash == r[:hash]
+            end_on_error "#{@name}: Disagreed with server about uploaded file hash: local=#{hash}, remote=#{r["hash"]}" unless hash == r["hash"]
           else
             # Otherwise mark as a failed upload to stop an apply operation which will fail
             upload_failed = true
@@ -155,22 +162,31 @@ module PluginTool
       if upload_failed
         puts "\n#{@name}: Not applying changes due to failure\n\n"
       else
-        if !(changes.empty?) || first_run
-          puts "  #{@name}: Applying changes on server"
-          r = PluginTool.get_yaml("/api/development_plugin_loader/apply/#{@loaded_plugin_id}")
-          unless r[:result] == 'success'
-            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]
+        if !(changes.empty?) || should_apply
+          @@pending_apply.push(self) unless @@pending_apply.include?(self)
         end
       end
-      PluginTool.finish_with_connection
       @current_manifest = next_manifest
     end
 
     # ---------------------------------------------------------------------------------------------------------
 
+    def self.do_apply
+      return if @@pending_apply.empty?
+      puts "Applying changes on server: #{@@pending_apply.map { |p| p.name } .join(', ')}"
+      r = PluginTool.post_with_json_response("/api/development-plugin-loader/apply", {
+        :plugins => @@pending_apply.map { |p| p.loaded_plugin_id }.join(' ')
+      })
+      if r["result"] == 'success'
+        @@pending_apply = []
+      else
+        puts "\n\nDidn't apply changes on server\n\n"
+        PluginTool.beep
+      end
+    end
+
+    # ---------------------------------------------------------------------------------------------------------
+
     def generate_license_key(application_id)
       info = File.open("#{@plugin_dir}/plugin.json") { |f| JSON.parse(f.read) }
       if info["installSecret"] == nil

data/lib/plugin_tool.rb

@@ -15,16 +15,18 @@ LOCAL_ONLY_COMMANDS = {"license-key" => true, "pack" => true, "check" => true}
 plugin_names = []
 
 # Options for passing to plugin objects
-options = Struct.new(:output, :minimiser, :no_console, :show_system_audit, :args).new
+options = Struct.new(:output, :minimiser, :no_console, :show_system_audit, :args, :force, :server_substring).new
 
 # Parse arguments
 show_help = false
 opts = GetoptLong.new(
   ['--help', '-h', GetoptLong::NO_ARGUMENT],
   ['--plugin', '-p', GetoptLong::OPTIONAL_ARGUMENT],
+  ['--server', '-s', GetoptLong::REQUIRED_ARGUMENT],
+  ['--force', GetoptLong::NO_ARGUMENT],
   ['--output', GetoptLong::REQUIRED_ARGUMENT],
   ['--no-console', '-n', GetoptLong::NO_ARGUMENT],
-  ['--show-system-audit', '-s', GetoptLong::NO_ARGUMENT],
+  ['--show-system-audit', GetoptLong::NO_ARGUMENT],
   ['--minimise', '--minimize', '-m', GetoptLong::NO_ARGUMENT]
 )
 option_output = nil
@@ -34,6 +36,8 @@ opts.each do |opt, argument|
     show_help = true
   when '--plugin'
     plugin_names = argument.split(',').map {|n| n.gsub(/[\/\\]+\z/,'')} # remove trailing dir separators
+  when '--server'
+    options.server_substring = argument
   when '--output'
     options.output = argument
   when '--no-console'
@@ -42,6 +46,8 @@ opts.each do |opt, argument|
     options.show_system_audit = true
   when '--minimise', '--minimize'
     options.minimiser = PluginTool::Minimiser.new
+  when '--force'
+    options.force = true
   end
 end
 # Handle rest of command line -- first arg is the command, the rest are passed on
@@ -69,21 +75,19 @@ if plugin_names.length == 1 && plugin_names[0] == 'ALL'
   plugin_names = find_all_plugins()
 end
 
-# Quick handle of the new command
-if PLUGIN_TOOL_COMMAND == 'new'
+# 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)
   exit 0
-end
-
-case 'develop' # TODO!!!!remove this
-when 'develop', 'reset-db', 'uninstall', 'check', 'license-key'
-  # ... continue afterwards
-when 'pack'
-
-else
-  end_on_error "Command not known. Use --help option for usage information."
+when 'auth'
+  PluginTool.cmd_auth options
+  exit 0
+when 'server'
+  PluginTool.cmd_server options
+  exit 0
 end
 
 # Find a plugin if none was specified
@@ -125,9 +129,8 @@ end
 
 # Set up server communications
 unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
-  # Load server info
-  server_info_errors = PluginTool.load_server_info
-  end_on_error server_info_errors unless server_info_errors == nil
+  PluginTool.setup_auth(options)
+  PluginTool.check_for_certificate_file
   # Ask plugins to set themselves up
   plugins.each { |p| p.setup_for_server }
 end
@@ -157,7 +160,8 @@ first_run = true
 while(true)
   puts "Scanning plugin files..."
   plugins.each { |p| p.develop_scan_and_upload(first_run) }
-  PluginTool.do_delayed_apply
+  PluginTool::Plugin.do_apply
+  PluginTool.finish_with_connection
   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

@@ -1,29 +1,33 @@
 
 module PluginTool
 
-  SERVER_INFO = 'server.yaml'
-  SERVER_CERTIFICATE = 'server.crt'
-  REQUIRED_SERVER_INFO_KEYS = [:hostname, :key]
+  def self.set_server(hostname, port, key)
+    @@server_hostname = hostname
+    @@server_port = port
+    @@server_key = key
+  end
 
-  def self.load_server_info
-    @@server = YAML::load(File.open(SERVER_INFO) { |f| f.read })
-    REQUIRED_SERVER_INFO_KEYS.each do |key|
-      return "#{SERVER_INFO} does not contain :#{key}" unless @@server.has_key? key
+  def self.check_for_certificate_file
+    @@server_ca = nil
+    hostname_parts = (@@server_hostname || '').split('.')
+    search_list = (0..hostname_parts.length).map do |n|
+      filename = "server"
+      search_parts = hostname_parts[n..hostname_parts.length]
+      filename << '.' unless search_parts.empty?
+      filename << search_parts.join('.')
+      filename << ".crt"
     end
-    if File.file?(SERVER_CERTIFICATE)
-      # Use provided server.crt if it exists
-      @@server_ca = SERVER_CERTIFICATE
-      puts "NOTICE: Using alternative CAs for SSL from #{SERVER_CERTIFICATE}"
+    @@server_ca = search_list.find { |f| File.file?(f) }
+    if @@server_ca
+      puts "NOTICE: Using alternative CAs for SSL from #{@@server_ca}"
     else
       # Use build in certificate bundle
       @@server_ca = "#{File.dirname(__FILE__)}/CertificateBundle.pem"
     end
-    puts "Application: https://#{@@server[:hostname]}/"
-    nil
   end
 
   def self.make_http_connection
-    http = Net::HTTP.new(@@server[:hostname], 443)
+    http = Net::HTTP.new(@@server_hostname, @@server_port)
     ssl_ca = OpenSSL::X509::Store.new
     unless ssl_ca.respond_to? :add_file
       puts
@@ -54,7 +58,7 @@ module PluginTool
 
   def self.setup_request(req)
     req['User-Agent'] = 'plugin-tool'
-    req['X-ONEIS-Key'] = @@server[:key]
+    req['X-ONEIS-Key'] = @@server_key if @@server_key
   end
 
   def self.get(path)
@@ -64,8 +68,8 @@ module PluginTool
     http.request(request).body
   end
   
-  def self.get_yaml(path)
-    report_errors_from_server(YAML::load(get(path)))
+  def self.get_with_json_response(path)
+    report_errors_from_server(JSON.parse(get(path)))
   end
   
   def self.post(path, params = nil, files = nil)
@@ -105,41 +109,27 @@ EOF
     http.request(request).body
   end
 
-  def self.post_yaml(path, params = nil, files = nil)
-    report_errors_from_server(YAML::load(post(path, params, files)))
+  def self.post_with_json_response(path, params = nil, files = nil)
+    report_errors_from_server(JSON.parse(post(path, params, files)))
   end
   
   def self.report_errors_from_server(r)
     unless r.kind_of? Hash
       r = {
-        :result => 'error',
-        :protocol_error => true,
-        :message => "Unknown error. Either the server is not enabled for development, or the credentials in #{SERVER_INFO} are not valid."
+        "result" => 'error',
+        "protocol_error" => true,
+        "message" => "Unknown error. Either the server is not enabled for development, or the credentials in #{SERVER_INFO} are not valid."
       }
     end
-    if r[:result] != 'success' && r.has_key?(:message)
+    if r["result"] != 'success' && r.has_key?("message")
       puts "\n\n**************************************************************"
       puts "                   ERROR REPORTED BY SERVER"
       puts "**************************************************************\n\n"
-      puts r[:message]
+      puts r["message"]
       puts "\n**************************************************************\n\n"
       beep
     end
     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/usage.txt

@@ -13,6 +13,9 @@ Options:
     in the current directory. If not specified, and there's a single plugin in the current
     directory, it will be selected automatically.
 
+  --server, -s [SUBSTRING]
+    For this run of the plugin tool, use the server containing the given substring.
+
   --minimise
     When uploading templates and client side JavaScript to the server, minimise the files
     to match the pre-deployment pre-processing. Use this for final testing before
@@ -27,6 +30,12 @@ Commands:
   develop (default command)
     Developer mode. Push plugin to the specified server.
 
+  auth [SERVER]
+    Authorise with server. SERVER can optionally include a non-default port number.
+
+  server [SUBSTRING]
+    Change the default server to the one containing the given substring.
+
   test [NAME]
     Run the tests on the server, then report on the results.
     This command does *not* upload changes to the plugin or tests to the server.
@@ -61,10 +70,10 @@ To initialise a new plugin, run a command like
 and then edit the generated files.
 
 
-Requirements:
-
-  server.yaml - server configuration (hostname, authentication token)
-  server.crt - server's SSL certificate root (optional)
+If the server certificate does not use a known public CA, a alternative certificate can be
+provided using a server.crt file in the current working directory. This may optionally contain
+elements of the hostname, eg app.example.com would select the first file from:
+   server.app.example.com.crt server.example.com.crt server.com.crt server.crt
 
 
 For more information, see http://docs.oneis.co.uk/dev/tool/plugin

data/lib/version.txt

@@ -1 +1 @@
-b7aeea18fc
+c7c8ef009b

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.2.2'
-  s.date        = '2014-12-11'
+  s.version     = '2.0.1'
+  s.date        = '2015-01-05'
   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.2.2
+  version: 2.0.1
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-11 00:00:00 Z
+date: 2015-01-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -45,6 +45,7 @@ extra_rdoc_files: []
 files: 
   - oneis.gemspec
   - README.txt
+  - lib/auth.rb
   - lib/CertificateBundle.pem
   - lib/check.rb
   - lib/hmac.rb