brpm_content_framework 0.2.23 → 0.2.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDVkOWNjZTU4NGY5ZmIzZmIxNmIzOTIxOTYzMmEzYmQwMTJkZWJmYw==
+    YzViYmI0MTk3MjM1MThmZGFkNTQ5YjQ4NDBkMjZhNDQ3N2M3MDkyMg==
   data.tar.gz: !binary |-
-    Mzc0NTM4ODM1OWQwMTRhOTBmYThkNjgyZWNjNjI1YjE2YTczNjhmYw==
+    ODNmZmEwMzM3ZmY1N2Q4YjM4MTFjNTYxYjE3NjNmNGY0OTI1MDQ2Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZDRkZDIyMTA4ZjNmOTEzZmNiMzAzZDI3ZGYxN2IyNmE4ZDQzMGEyNzhmNWQ2
-    ZDMyNjdiMmE5MTQ2NzgxNjYwYTE4YmMxMTk3MzIwMmRjZGIzNWFmMmYwMjFk
-    NDIzNWExZTM0ODc2ZDk3MjRmNzNiNzE1NjNmOGMyYjg4ZGU4M2E=
+    NmI0NGM5ZjMwOWZhNmQzMDMxZjJkOWJlZGMzOTk1Y2NlYWRkNGExN2M5MmJh
+    NjFhODEwMTM2NWU0NWNjODFjYjIyYmRkZDk2NGFjOTM0ZGUzOTg5YTlkNTZl
+    MjcwMDliZGNiNTE2YzVjYWYxZWFmMjAyYTUyZjQxNTdkMTBjYTM=
   data.tar.gz: !binary |-
-    N2RiMjMzNmQ2OTE3YWUzZTZjODk0YTljNDdiMmNmY2VkYWFiYjAwYWZiYzU0
-    MjExYTY2NTA5NjIxZTJmZDc2YTQ2NzAzMjNlNTc1NzAyMWY1YzNiODJlNDFk
-    ODE4ZDk1YjcxODFiMTc3M2YwZWM3NzNkYTlmZjdlYTlmZDc0MTE=
+    ZDNjZWNjYTk1M2ExYzZlZDQ0MjUwM2NkMzA3ZDBjOWJhYTZjMTVlMWExMmFk
+    ZjE4MDBkODBmNzQyZGU5YzQyODk1NjIwMGNkNDg3OGQ4ZTIxN2Y0YzY4NzUz
+    NWZkY2UwYmE0YTNlNDM4M2NjN2NkOTk0ZWM1MGMzOTMxOGEzMzQ=

data/bin/event_handler

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'torquebox'
-require 'torquebox-messaging'
+require 'stomp'
 require 'xmlsimple'
 require "brpm_script_executor"
 
@@ -12,47 +10,39 @@ port = ENV["EVENT_HANDLER_MESSAGING_PORT"]
 username = ENV["EVENT_HANDLER_MESSAGING_USERNAME"]
 password = ENV["EVENT_HANDLER_MESSAGING_PASSWORD"]
 process_event_script = ENV["EVENT_HANDLER_PROCESS_EVENT_SCRIPT"]
+messaging_path = "jms.topic./topics/messaging/brpm_event_queue"
 
 require process_event_script
 
-class MessagingProcessor < TorqueBox::Messaging::MessageProcessor
+def process(message)
+  begin
+    BrpmAuto.log "Processing new event..."
+    BrpmAuto.log "Message content:" if ENV["EVENT_HANDLER_LOG_EVENT"]=="1"
+    BrpmAuto.log message if ENV["EVENT_HANDLER_LOG_EVENT"]=="1"
+    xml = "<root>#{message}</root>"
 
-  MESSAGING_PATH = '/topics/messaging/brpm_event_queue'
+    event = XmlSimple.xml_in(xml)
 
-  def initialize(host, port, username, password)
-    BrpmAuto.log "Initializing the message processor..."
-    @destination = TorqueBox::Messaging::Topic.new(
-        MESSAGING_PATH,
-        :host => host,
-        :port => port,
-        :username => username,
-        :password => password
-    )
-  end
-
-  def run
-    begin
-      xml = "<root>#{@destination.receive}</root>"
+    process_event(event)
 
-      BrpmAuto.log "Processing new event..."
-      BrpmAuto.log xml if ENV["EVENT_HANDLER_LOG_EVENT"]=="1"
+  rescue Exception => e
+    BrpmAuto.log_error(e)
+    BrpmAuto.log "\n\t" + e.backtrace.join("\n\t")
+  end
+end
 
-      event = XmlSimple.xml_in(xml)
+begin
 
-      process_event(event)
+  BrpmAuto.log "Connecting to the BRPM event system ..."
+  client = Stomp::Client.new username, password, host, port, true
 
-    rescue Exception => e
-      BrpmAuto.log_error(e)
-      BrpmAuto.log "\n\t" + e.backtrace.join("\n\t")
-    end
+  BrpmAuto.log "Subscribing to the BRPM event queue ..."
+  client.subscribe messaging_path do |message|
+    process(Marshal.load(message.body))
   end
-end
 
-begin
-  consumer = MessagingProcessor.new(host, port, username, password)
-  BrpmAuto.log "Starting to listen for events ..."
   loop do
-    consumer.run
+    sleep 1
   end
 
 rescue Exception => e

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.23
+version: 0.2.24
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/infrastructure/scripts/run_event_handler.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+# temporarily link it to the jruby platform because we depend on torquebox to receive the messages
+export JAVA_HOME="$BRPM_HOME/lib/jre"
+export JRUBY_HOME="$BRPM_HOME/lib/jruby"
+export GEM_HOME="$BRPM_HOME/modules"
+
+export PATH="$GEM_HOME/bin:$JRUBY_HOME/bin:$PATH"
+
 # mandatory settings
 export EVENT_HANDLER_BRPM_HOST=localhost
 

data/infrastructure/scripts/run_webhook_receiver.cmd

@@ -11,5 +11,5 @@ set WEBHOOK_RECEIVER_BRPM_PORT=8080
 set WEBHOOK_RECEIVER_BRPM_TOKEN=???
 set WEBHOOK_RECEIVER_JIRA_RELEASE_FIELD_ID=???
 
-jruby -J-Djava.library.path= webhook_receiver
+webhook_receiver
 

data/infrastructure/scripts/run_webhook_receiver.sh

@@ -12,4 +12,4 @@ export WEBHOOK_RECEIVER_BRPM_PORT=8088
 export WEBHOOK_RECEIVER_BRPM_TOKEN=???
 export WEBHOOK_RECEIVER_JIRA_RELEASE_FIELD_ID=???
 
-jruby -J-Djava.library.path= $(which webhook_receiver)
+webhook_receiver

data/lib/brpm_script_executor.rb

@@ -20,7 +20,6 @@ class BrpmScriptExecutor
       BrpmAuto.log "Executing #{automation_type} '#{name}' from module '#{modul}' in a separate process..."
 
       env_vars = {}
-      env_vars["JRUBY_OPTS"] = "-Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF" # improve jvm startup time (see http://rexchung.com/2013/08/02/speed-up-jruby-rails-startup-time/)
       env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
 
       BrpmAuto.log "Finding the module path..."
@@ -59,7 +58,7 @@ class BrpmScriptExecutor
       end
 
       BrpmAuto.log "Executing the script in a separate process..."
-      return_value = Bundler.clean_system(env_vars, RbConfig.ruby, "-e", "#{require_bundler}require 'brpm_script_executor'; BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_file}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")")
+      return_value = Bundler.clean_system(env_vars, "ruby", "-e", "#{require_bundler}require 'brpm_script_executor'; BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_file}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")")
       FileUtils.rm(params_file) if File.exists?(params_file)
       if return_value.nil?
         message = "The process that executed the automation script returned with 'Command execution failed'."

data/module.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.required_rubygems_version = ">= 2.1.9"
 
+  spec.add_runtime_dependency "bundler"
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "savon", '~>1.1.0'
@@ -23,6 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
+  spec.add_development_dependency "stomp"
+  spec.add_development_dependency "xml-simple"
+
   spec.files         = `git ls-files`.split("\n")
   spec.require_path  = 'lib'
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stomp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The BRPM Content Framework is a lightweight framework that allows to
   run automation logic on top of BRPM in a modular, re-usable, testable and developer-friendly
   way