oneis 1.0.1-java → 1.0.4-java

data/lib/notifications.rb

@@ -1,9 +1,12 @@
 
 module PluginTool
 
+  @@notification_options = nil
+  @@notification_have_suppressed_first_system_audit_entry = false
   @@notification_announce_reconnect = false
 
-  def self.start_notifications
+  def self.start_notifications(options)
+    @@notification_options = options
     @@notification_queue_name = nil
     Thread.new do
       while true
@@ -60,8 +63,25 @@ module PluginTool
     when 'log '
       # Output from console.log()
       puts "LOG:#{data}"
+    when 'audt'
+      decoded = JSON.parse(data)
+      kind = decoded.find { |name,value| name == 'auditEntryType' }.last
+      if kind =~ /\A[A-Z\-]+\z/
+        # System audit entry - suppressed by default
+        unless @@notification_options.show_system_audit
+          unless @@notification_have_suppressed_first_system_audit_entry
+            @@notification_have_suppressed_first_system_audit_entry = true
+            puts "NOTICE: System audit trail entries are not being shown. Run with --show-system-audit to display."
+          end
+          return
+        end
+      end
+      puts "AUDIT -------------------------------------------"
+      decoded.each do |key, value|
+        puts sprintf("%22s: %s", key, value.to_s)
+      end
     else
-      puts "WARNING: Unknown notification received from server. Upgrade the plugin tool."
+      puts "WARNING: Unknown notification received from server. Upgrade the plugin tool using 'jgem update oneis'."
       sleep(5) # throttle problematic responses
     end
   end

data/lib/plugin.rb

@@ -19,50 +19,32 @@ module PluginTool
       # Setup for using the plugin
       @plugin_dir = @name
       end_on_error "logic error" unless @plugin_dir =~ /\A[a-zA-Z0-9_-]+\z/
-      @registration_file = "registration.#{@plugin_dir}.yaml"
+      @loaded_plugin_id = nil
       puts "Plugin: #{@plugin_dir}"
     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 = {}
 
-      # Get info about the current plugin
-      @loaded_plugin_id = nil
-      if File.exists? @registration_file
-        reg_info = YAML::load(File.open(@registration_file) { |f| f.read })
-        @loaded_plugin_id = reg_info[:plugin_id]
-        if @loaded_plugin_id != nil
-          # Check with server to see if this is still registered, and if so, what files it has on the server
-          s_reg_info = PluginTool.get_yaml("/api/development_plugin_loader/manifest/#{@loaded_plugin_id}")
-          end_on_error "Couldn't communicate successfully with server." if s_reg_info[:protocol_error]
-          if s_reg_info[:result] == 'success'
-            @current_manifest = s_reg_info[:manifest]
-          else
-            puts "NOTICE: Discarding registration information from #{@registration_file}"
-            @loaded_plugin_id = nil
-          end
-        end
-      end
-
       # If minimisation is active, clear the current manifest so all files are uploaded again.
       if @options.minimiser != nil
         @current_manifest = {}
       end
 
-      # Flag for registration file save
-      registration_file_needs_update = false
-
-      # If the current plugin registration isn't known, see if the server knows about it
-      if @loaded_plugin_id == nil
-        s_found_info = PluginTool.post_yaml("/api/development_plugin_loader/find_registration", {:name => @name})
-        if s_found_info[:found]
-          # Store info returned by the server
-          puts "NOTICE: Found existing registration for #{@name} on server. Using it."
-          @loaded_plugin_id = s_found_info[:plugin_id]
-          @current_manifest = s_found_info[:manifest]
-          registration_file_needs_update = true
-        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]
+        # Store info returned by the server
+        @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
@@ -71,12 +53,6 @@ module PluginTool
         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]
-        registration_file_needs_update = true
-      end
-
-      # Update registration file for next run?
-      if registration_file_needs_update
-        File.open(@registration_file, 'w') { |f| f.write YAML::dump(:plugin_id => @loaded_plugin_id) }
       end
     end
 

data/lib/plugin_tool.rb

@@ -15,7 +15,7 @@ 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, :args).new
+options = Struct.new(:output, :minimiser, :no_console, :show_system_audit, :args).new
 
 # Parse arguments
 show_help = false
@@ -24,6 +24,7 @@ opts = GetoptLong.new(
   ['--plugin', '-p', GetoptLong::OPTIONAL_ARGUMENT],
   ['--output', GetoptLong::REQUIRED_ARGUMENT],
   ['--no-console', '-n', GetoptLong::NO_ARGUMENT],
+  ['--show-system-audit', '-s', GetoptLong::NO_ARGUMENT],
   ['--minimise', '--minimize', '-m', GetoptLong::NO_ARGUMENT]
 )
 option_output = nil
@@ -37,6 +38,8 @@ opts.each do |opt, argument|
     options.output = argument
   when '--no-console'
     options.no_console = true
+  when '--show-system-audit'
+    options.show_system_audit = true
   when '--minimise', '--minimize'
     options.minimiser = PluginTool::Minimiser.new
   end
@@ -135,7 +138,7 @@ end
 PluginTool.start_syntax_check
 
 # Notifications support (including console)
-PluginTool.start_notifications unless options.no_console
+PluginTool.start_notifications(options) unless options.no_console
 
 # Open watcher
 watcher = PluginTool.make_watcher(plugins.map { |p| p.plugin_dir })

data/lib/version.txt

@@ -1 +1 @@
-71e32da87b
+30ba1d4d14

data/oneis.gemspec

@@ -3,14 +3,14 @@ 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.1'
-  s.date        = '2013-02-13'
+  s.version     = '1.0.4'
+  s.date        = '2013-03-30'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]
   s.email       = 'client.services@oneis.co.uk'
   s.platform    = "java"
-  s.add_dependency('jruby-openssl', '>= 0.7.7')
+  s.add_dependency('jruby-openssl', '>= 0.8.7')
   s.add_dependency('json', '>= 1.7.7')
   s.files       = files
   s.executables = ['oneis-plugin']

metadata

@@ -2,7 +2,7 @@
 name: oneis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.4
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-13 00:00:00 Z
+date: 2013-03-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.7.7
+            version: 0.8.7
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency