nutella_framework 0.4.18 → 0.4.19

data/framework_components/monitoring-bot/nutella.json

@@ -0,0 +1,6 @@
+{
+    "name": "monitoring-bot",
+    "version": "0.0.1",
+    "type": "bot",
+    "description": "Monitoring bot"
+}

data/framework_components/monitoring-bot/startup

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+BASEDIR=$(dirname $0)
+
+ruby $BASEDIR/monitoring-bot.rb # > /dev/null 2>&1 &
+echo $! > $BASEDIR/.pid

data/lib/commands/checkup.rb

@@ -45,7 +45,7 @@ module Nutella
       File.chmod( 0755, 'startup' )
     
       # Write configuration into config.json
-      Nutella.config['broker'] = 'localhost'
+      Nutella.config['broker'] = '127.0.0.1'
       out1 && out2
     end
     
@@ -69,8 +69,14 @@ module Nutella
         out.slice!(0,5)
         Semantic::Version.new "#{out[0..2]}.0"
       end
+      # Mongo version lambda
+      mongo_semver = lambda do
+        out = `mongod --version`
+        out.slice!(0,12)
+        Semantic::Version.new out[0..4]
+      end
       # Check versions
-      return true if check_version?('node', '0.10.0', node_semver) && check_version?('git', '1.8.0', git_semver) && check_version?('tmux', '1.8.0', tmux_semver)
+      return true if check_version?('node', '0.10.0', node_semver) && check_version?('git', '1.8.0', git_semver) && check_version?('tmux', '1.8.0', tmux_semver) && check_version?('mongodb', '2.6.9', mongo_semver)
       # If even one of the checks fails, return false
       false
     end

data/lib/commands/start.rb

@@ -94,6 +94,8 @@ module Nutella
     def start_all_components( app_id, app_path, run_id, params )
       # Start the internal broker
       return false unless ComponentsStarter.start_internal_broker
+      # Start mongo db
+      return false unless ComponentsStarter.start_mongo_db
       # Start all framework-level components (if needed)
       return false unless ComponentsStarter.start_framework_components
       # Start all app-level bots (if any, if needed)

data/lib/commands/stop.rb

@@ -34,6 +34,7 @@ module Nutella
       # If running on the internal broker, stop it if needed
       if Nutella.runlist.empty?
         stop_internal_broker
+        stop_mongo
       end
 
       # Output success message
@@ -80,6 +81,12 @@ module Nutella
     end
 
 
+    def stop_mongo
+      pid_file_path = "#{Nutella.config['config_dir']}.mongo_pid"
+      kill_process_with_pid pid_file_path
+    end
+
+
     # Does the process pid file exist?
     # If it does we send a SIGKILL to the process with that pid
     # to stop the process and delete the pid file

data/lib/commands/util/components_starter.rb

@@ -24,6 +24,27 @@ class ComponentsStarter
   end
 
 
+  # Starts mongodb if it's not started already.
+  # This operation is only necessary on mac because Ubuntu automatically
+  # installs mongo as a service and runs it.
+  # @return [boolean] true if mongo has been correctly started, false otherwise
+  def self.start_mongo_db
+    pid_file_path = "#{Nutella.config['config_dir']}.mongo_pid"
+    # Check if the process with pid indicated in the pidfile is alive
+    return true if sanitize_pid_file pid_file_path
+    # Check that mongo is not running 'unsupervised' (i.e. check port 27017), if it is, return
+    return true unless mongo_port_free?
+    # Mongo is not running and there is no pid file so we try to start it and create a new pid file.
+    # Note that the pid file is created by the `startup` script, not here.
+    pid = fork
+    exec("mongod --config /usr/local/etc/mongod.conf > /dev/null 2>&1 & \necho $! > #{pid_file_path}") if pid.nil?
+    # Wait a bit to give the chance to mongo to actually start up
+    sleep 1
+    # All went well so we return true
+    true
+  end
+
+
   # Starts all framework components. If order.json is present, components are started
   # in that order.
   # @return [boolean] true if all components are started correctly, false otherwise
@@ -128,6 +149,21 @@ class ComponentsStarter
   private_class_method :broker_port_free?
 
 
+  # Checks if port 27017 (MongoDB standard port) is free
+  # or some other service is already listening on it
+  # @return [boolean] true if there is no mongo listening on port 27017, false otherwise
+  def self.mongo_port_free?
+    begin
+      s = TCPServer.new('0.0.0.0', 27017)
+      s.close
+    rescue
+      return false
+    end
+    true
+  end
+  private_class_method :mongo_port_free?
+
+
   # Starts a single framework component
   # @return [boolean] true if the component has been started successfully, false otherwise
   def self.start_framework_component( component_dir )

data/nutella_framework.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nutella_framework 0.4.18 ruby lib
+# stub: nutella_framework 0.4.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.4.18"
+  s.version = "0.4.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alessandro Gnoli"]
-  s.date = "2015-05-05"
+  s.date = "2015-05-12"
   s.description = "utella is a framework to create and run RoomApps"
   s.email = "tebemis@gmail.com"
   s.executables = ["nutella"]
@@ -103,6 +103,11 @@ Gem::Specification.new do |s|
     "framework_components/main_interface/startup",
     "framework_components/main_interface/views/index.erb",
     "framework_components/main_interface/views/not_found_404.erb",
+    "framework_components/monitoring-bot/.gitignore",
+    "framework_components/monitoring-bot/README.md",
+    "framework_components/monitoring-bot/monitoring-bot.rb",
+    "framework_components/monitoring-bot/nutella.json",
+    "framework_components/monitoring-bot/startup",
     "framework_components/order.json",
     "framework_components/roomcast-bot/data/default/channels-data.json",
     "framework_components/roomcast-bot/data/default/channels.json",
@@ -334,6 +339,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_runtime_dependency(%q<slop>, ["~> 4.0"])
       s.add_runtime_dependency(%q<nutella_lib>, [">= 0.4.12", "~> 0.4"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.2"])
+      s.add_runtime_dependency(%q<mandrill-api>, [">= 1.0.53", "~> 1.0"])
       s.add_development_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
@@ -350,6 +357,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_dependency(%q<slop>, ["~> 4.0"])
       s.add_dependency(%q<nutella_lib>, [">= 0.4.12", "~> 0.4"])
+      s.add_dependency(%q<activesupport>, ["~> 4.2"])
+      s.add_dependency(%q<mandrill-api>, [">= 1.0.53", "~> 1.0"])
       s.add_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
@@ -367,6 +376,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, ["~> 1.6"])
     s.add_dependency(%q<slop>, ["~> 4.0"])
     s.add_dependency(%q<nutella_lib>, [">= 0.4.12", "~> 0.4"])
+    s.add_dependency(%q<activesupport>, ["~> 4.2"])
+    s.add_dependency(%q<mandrill-api>, [">= 1.0.53", "~> 1.0"])
     s.add_dependency(%q<shoulda>, ["~> 3.0"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])

data/nutella_lib/framework_net.rb

@@ -169,14 +169,19 @@ module Nutella
       #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
       def self.subscribe_to_all_runs( channel, callback )
         # Check the passed callback has the right number of arguments
-        raise 'You need to pass a callback with 4 parameters (payload, app_id, run_id, from) when subscribing to all runs!' if callback.parameters.length!=4
+        raise 'You need to pass a callback with 4 parameters (payload, app_id, run_id, from) when subscribing to all runs!' if callback.parameters.length!=4 && callback.parameters.length!=5
         # Pad channel
         padded_channel = Nutella::Net.pad_channel(channel, '+', '+')
         mqtt_cb = lambda do |mqtt_message, mqtt_channel|
           begin
             type, from, payload, _ = Nutella::Net.extract_fields_from_message mqtt_message
             app_id, run_id = self.extract_run_id_and_app_id mqtt_channel
-            callback.call(payload, app_id, run_id, from) if type=='publish'
+            if channel.include?('#')
+              unpadded_channel = un_pad_wildcard_channel(mqtt_channel)
+              callback.call(unpadded_channel, payload, app_id, run_id, from) if type=='publish'
+            else
+              callback.call(payload, app_id, run_id, from) if type=='publish'
+            end
           rescue JSON::ParserError
             # Make sure the message is JSON, if not drop the message
             return
@@ -193,6 +198,11 @@ module Nutella
         Nutella::Net.publish_to('subscriptions', {'type' => 'subscribe', 'channel' => padded_channel}, nil, nil)
       end
 
+      def self.un_pad_wildcard_channel(channel)
+        regex = Regexp.new '/nutella/apps/[^"\/"]+/runs/[^"\/"]+/'
+        channel.gsub(regex, '')
+      end
+
 
       # Allows framework-level APIs to unsubscribe from a run-level channel *for ALL runs*
       #
@@ -270,6 +280,32 @@ module Nutella
         Nutella::Net.publish_to('subscriptions', {'type' => 'handle_requests', 'channel' => padded_channel}, nil, nil)
       end
 
+      def self.catch_requests_on_all_runs_wildcard(callback)
+        # Pad channel
+        padded_channel = Nutella::Net.pad_channel("#", '+', '+')
+        mqtt_cb = lambda do |request, mqtt_channel|
+          begin
+            # Extract nutella fields
+            type, from, payload, id = Nutella::Net.extract_fields_from_message request
+            app_id, run_id = self.extract_run_id_and_app_id mqtt_channel
+            # Only handle requests that have proper id set
+            return if type!='request' || id.nil?
+            # Execute callback and send response
+            regex = Regexp.new '/nutella/apps/[^"\/"]+/runs/[^"\/"]+/'
+            unpadded_channel = mqtt_channel.gsub(regex, '')
+            callback.call( unpadded_channel, payload, app_id, run_id, from)
+          rescue JSON::ParserError
+            # Make sure that request contains JSON, if not drop the message
+            return
+          rescue ArgumentError
+            # Check the passed callback has the right number of arguments
+            STDERR.puts "The callback you passed to subscribe has the #{$!}: it needs 'request', 'app_id', 'run_id' and 'from'"
+          end
+        end
+        # Subscribe to the channel
+        Nutella.mqtt.subscribe( padded_channel, mqtt_cb )
+      end
+
       # @!endgroup
 
       # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -142,6 +142,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: mandrill-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.53
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.53
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +352,11 @@ files:
 - framework_components/main_interface/startup
 - framework_components/main_interface/views/index.erb
 - framework_components/main_interface/views/not_found_404.erb
+- framework_components/monitoring-bot/.gitignore
+- framework_components/monitoring-bot/README.md
+- framework_components/monitoring-bot/monitoring-bot.rb
+- framework_components/monitoring-bot/nutella.json
+- framework_components/monitoring-bot/startup
 - framework_components/order.json
 - framework_components/roomcast-bot/data/default/channels-data.json
 - framework_components/roomcast-bot/data/default/channels.json