nutella_framework 0.6.21 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d8353ce5b98a9d01a65de966e1e019948878bed
-  data.tar.gz: 7a139d76298eba6ba31c43f308af6cbdc4b98dc6
+  metadata.gz: 7750cdf08b41df1aa16fe91e81a7139a44673183
+  data.tar.gz: 123af08b4f4fb8c05044faee20a8e81680fc0742
 SHA512:
-  metadata.gz: 1ce4c41c641d5ef024c59da00ed0c8adb5cecba87cf05d00721cb9f97148d75fabf3741feeea803e0878775e57dba2e6271a20a36b7e45414030845dddcf12f1
-  data.tar.gz: 7d4fd5f9fe747787c11af1ba398353f645347c2fef1aff874c175055fe7ec72c7012306c114828acada2993ea4268c32ff05cf4507dee5c8812bb117a0a80a46
+  metadata.gz: a0a51409dfbc5339be31211186c36316c1e6ca0fc8577a8fcbd87b718aaa1f0a9c4c2d5e7d9017c2e6c9ff1dd5f9a94decfa33c323db470c432f3ecdf292987b
+  data.tar.gz: 2f045bde885636db2ae0f75a85f3bfd45ad02f37d177398a683573177748cc99aa5cba02ee40973e1e2a5f422665e24a39b6280f307c3e92afb1484a87ef145e

data/Gemfile

@@ -10,7 +10,6 @@ gem 'nokogiri', '~>1.6'
 gem 'slop', '~>4.0'
 gem 'nutella_lib','~>0.4', '>=0.4.24'
 gem 'activesupport', '~>4.2'
-gem 'mandrill-api', '~>1.0', '>=1.0.53'
 gem 'bson', '~> 3.0'
 
 group :development do

data/README.md

@@ -11,7 +11,7 @@ Nutella is written in ruby but it leverages a bunch of other technologies that n
 1. _ruby_ (version >= 2.1.0). Do yourself a favor and use [RVM](https://rvm.io/rvm/install) to install Ruby.
 1. _git_ (version >= 1.8.0). Do yourself a favor and use [Homebrew](http://brew.sh/) to install git, if you are on OSX.
 1. _tmux_ (version >= 1.8.0). Do yourself a favor and use [Homebrew](http://brew.sh/) to install tmux, if you are on OSX.
-1. _node.js_ (version >= 0.10.0). Yes, really, you need to install node becaue we use it to run the broker that handles all communications between all the pieces of the framework. Do yourself a favor and use [nvm](https://github.com/creationix/nvm).
+1. _Docker_ (version >= 17.03.0). We use Docker to run the broker that handles all communications between all the pieces of the framework. Do yourself a favor and use [Docker for mac](https://store.docker.com/editions/community/docker-ce-desktop-mac), if you are on OSX.
 1. _mongoDB_ (optional). You'll need mongoDB if you want to use it with `nutella.persist`.
 
 Once you have all of these, to install nutella simply do:

data/VERSION

@@ -1 +1 @@
-0.6.21
+0.7.0

data/framework_components/monitoring-bot/monitoring-bot.rb

@@ -3,27 +3,13 @@ require_relative '../../lib/config/config'
 require_relative '../../nutella_lib/framework_core'
 require_relative '../../lib/commands/util/components_list'
 require 'active_support/core_ext/object/deep_dup'
-require 'mandrill'
 require 'mongo'
 require 'bson'
 
-# Framework bots can access all the parameters they need directly
-# from the configuration file and the runlist,
-# to which they have full access to.
-
-# Access the config file like so:
-# Nutella.config['broker']
-
-# Access the runs list like so:
-# Nutella.runlist.all_runs
-
 
 # Initialize this bot as framework component
 nutella.f.init(Nutella.config['broker'], 'monitoring_bot')
 
-# Mandrill access key
-$m = Mandrill::API.new 'i4frQYcTBMyZ6bYyLkEVOQ'
-
 # Open the resources database
 $messages = nutella.f.persist.get_json_object_store('messages')
 
@@ -69,8 +55,6 @@ def send_subscription_mail(mail, application, instance = nil, component = nil)
       ],
       :from_email=>'nutellamonitoring@gmail.com'
   }
-
-  sending = $m.messages.send_template template_name, template_content, message
 end
 
 def send_notification_mail(mail, application, instance = nil, component = nil)
@@ -105,10 +89,6 @@ def send_notification_mail(mail, application, instance = nil, component = nil)
       ],
       :from_email=>'nutellamonitoring@gmail.com'
   }
-
-  sending = $m.messages.send_template template_name, template_content, message
-  puts sending
-
 end
 
 # Add an alert on a specific application/instance/component

data/lib/commands/checkup.rb

@@ -12,7 +12,7 @@ module Nutella
       
       # Check if we have a local broker installed
       # and install one if we don't
-      if File.directory? Nutella.config['broker_dir']
+      if broker_exists
         console.info 'You have a local broker installed. Yay!'
       else
         console.warn 'You don\'t seem to have a local broker installed so we are going to go ahead and install one for you. This might take some time...'
@@ -33,29 +33,33 @@ module Nutella
     private 
     
   
+    def broker_exists
+      # Check if Docker image for the broker was already pulled
+      if `docker images matteocollina/mosca:v2.3.0 --format "{{.ID}}"` != ""
+        # If so, check that a broker configuration exists and create one if it doesn't
+        Nutella.config['broker'] = '127.0.0.1' if Nutella.config['broker'].nil? 
+        true
+      else
+        false
+      end
+    end
+
+
     def install_local_broker
-      # Clone, cd and npm install
-      broker_version = 'v0.28.1'
-      out1 = system "git clone -b #{broker_version} --depth 1 git://github.com/mcollina/mosca.git #{Nutella.config['broker_dir']} > /dev/null 2>&1"
-      Dir.chdir(Nutella.config['broker_dir'])
-      out2 = system 'npm install > /dev/null 2>&1'
-    
-      # Add startup script and make it executable
-      File.open('startup', 'w') { |file| file.write("#!/bin/sh\n\nBASEDIR=$(dirname $0)\n$BASEDIR/bin/mosca --disable-stats --http-port 1884 > /dev/null 2>&1 &\necho $! > $BASEDIR/bin/.pid\n") }
-      File.chmod( 0755, 'startup' )
-    
-      # Write configuration into config.json
+      # Docker pull to install
+      system "docker pull matteocollina/mosca:v2.3.0 > /dev/null 2>&1"
+      # Write broker setting inside config.json
       Nutella.config['broker'] = '127.0.0.1'
-      out1 && out2
     end
     
     
     def all_dependencies_installed?
-      # Node version lambda
-      node_semver = lambda do
-        out = `node --version`
-        out[0] = ''
-        Semantic::Version.new out
+      # Docker version lambda
+      docker_semver = lambda do
+        out = `docker --version`
+        token = out.split(' ')
+        token[2].slice(0..1)
+        Semantic::Version.new token[2].slice(0..1).concat('.0.0')
       end
       # Git version lambda
       git_semver = lambda do
@@ -81,7 +85,7 @@ module Nutella
         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) && check_version?('mongodb', '2.6.9', mongo_semver)
+      return true if check_version?('docker', '17.0.0', docker_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/stop.rb

@@ -76,8 +76,8 @@ module Nutella
 
 
     def stop_internal_broker
-      pid_file_path = "#{Nutella.config['broker_dir']}/bin/.pid"
-      kill_process_with_pid pid_file_path
+      cid = `docker ps --filter ancestor=matteocollina/mosca:v2.3.0 --format "{{.ID}}"`
+      `docker kill #{cid}`
     end
 
 

data/lib/commands/util/components_starter.rb

@@ -7,16 +7,12 @@ class ComponentsStarter
   # Starts the internal broker if it's not started already
   # @return [boolean] true if the broker is correctly started, false otherwise
   def self.start_internal_broker
-    pid_file_path = "#{Nutella.config['broker_dir']}bin/.pid"
-    # Check if the process with pid indicated in the pidfile is alive
-    return true if sanitize_pid_file pid_file_path
+    # Check if the broker has been started already, if it is, return
+    return true if broker_started?
     # Check that broker is not running 'unsupervised' (i.e. check port 1883), if it is, return
     return true unless broker_port_free?
-    # Broker is not running and there is no pid file so we try to start
-    # the internal broker and create a new pid file. Note that the pid file is created by
-    # the `startup` script, not here.
-    pid = fork
-    exec("#{Nutella.config['broker_dir']}/startup") if pid.nil?
+    # Broker is not running  so we try to start the internal broker
+    cid = `docker run -p 1883:1883 -p 1884:80 -d -v #{Nutella.config['broker_dir']}:/db matteocollina/mosca:v2.3.0`
     # Wait a bit to give the chance to the broker to actually start up
     sleep 1
     # All went well so we return true
@@ -134,6 +130,13 @@ class ComponentsStarter
   private_class_method :sanitize_pid_file
 
 
+  # Checks if the broker is running already
+  # @return [boolean] true if there is a container for the broker running already
+  def self.broker_started?
+    `docker ps --filter ancestor=matteocollina/mosca:v2.3.0 --format "{{.ID}}"` != ""
+  end
+  private_class_method :broker_started?
+
   # Checks if port 1883 (MQTT broker port) is free
   # or some other service is already listening on it
   # @return [boolean] true if there is no broker listening on port 1883, false otherwise

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.6.21 ruby lib
+# stub: nutella_framework 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework".freeze
-  s.version = "0.6.21"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Alessandro Gnoli".freeze]
-  s.date = "2017-04-09"
+  s.date = "2017-04-11"
   s.description = "utella is a framework to create and run RoomApps".freeze
   s.email = "tebemis@gmail.com".freeze
   s.executables = ["nutella".freeze]
@@ -655,7 +655,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<slop>.freeze, ["~> 4.0"])
       s.add_runtime_dependency(%q<nutella_lib>.freeze, [">= 0.4.24", "~> 0.4"])
       s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 4.2"])
-      s.add_runtime_dependency(%q<mandrill-api>.freeze, [">= 1.0.53", "~> 1.0"])
       s.add_runtime_dependency(%q<bson>.freeze, ["~> 3.0"])
       s.add_development_dependency(%q<shoulda>.freeze, ["~> 3.0"])
       s.add_development_dependency(%q<yard>.freeze, ["~> 0.8"])
@@ -674,7 +673,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<slop>.freeze, ["~> 4.0"])
       s.add_dependency(%q<nutella_lib>.freeze, [">= 0.4.24", "~> 0.4"])
       s.add_dependency(%q<activesupport>.freeze, ["~> 4.2"])
-      s.add_dependency(%q<mandrill-api>.freeze, [">= 1.0.53", "~> 1.0"])
       s.add_dependency(%q<bson>.freeze, ["~> 3.0"])
       s.add_dependency(%q<shoulda>.freeze, ["~> 3.0"])
       s.add_dependency(%q<yard>.freeze, ["~> 0.8"])
@@ -694,7 +692,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<slop>.freeze, ["~> 4.0"])
     s.add_dependency(%q<nutella_lib>.freeze, [">= 0.4.24", "~> 0.4"])
     s.add_dependency(%q<activesupport>.freeze, ["~> 4.2"])
-    s.add_dependency(%q<mandrill-api>.freeze, [">= 1.0.53", "~> 1.0"])
     s.add_dependency(%q<bson>.freeze, ["~> 3.0"])
     s.add_dependency(%q<shoulda>.freeze, ["~> 3.0"])
     s.add_dependency(%q<yard>.freeze, ["~> 0.8"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.7.0
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -156,26 +156,6 @@ dependencies:
     - - "~>"
       - !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: bson
   requirement: !ruby/object:Gem::Requirement