nutella_framework 0.4.5 → 0.4.8

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.5 ruby lib
+# stub: nutella_framework 0.4.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.4.5"
+  s.version = "0.4.8"
 
   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-03-26"
+  s.date = "2015-04-08"
   s.description = "utella is a framework to create and run RoomApps"
   s.email = "tebemis@gmail.com"
   s.executables = ["nutella"]
@@ -32,7 +32,67 @@ Gem::Specification.new do |s|
     "data/startup",
     "example_framework_components/example_framework_bot/example_framework_bot.rb",
     "example_framework_components/example_framework_bot/startup",
+    "framework_components/beacon-cloud-bot/README.md",
+    "framework_components/beacon-cloud-bot/beacon_cloud_bot.rb",
+    "framework_components/beacon-cloud-bot/nutella.json",
+    "framework_components/beacon-cloud-bot/startup",
+    "framework_components/beacon-cloud-interface/LICENSE",
+    "framework_components/beacon-cloud-interface/Readme.md",
+    "framework_components/beacon-cloud-interface/bower.json",
+    "framework_components/beacon-cloud-interface/bower_components/bower-mqttws/.bower.json",
+    "framework_components/beacon-cloud-interface/bower_components/bower-mqttws/bower.json",
+    "framework_components/beacon-cloud-interface/bower_components/bower-mqttws/mqttws31.js",
+    "framework_components/beacon-cloud-interface/bower_components/bower-mqttws/readme.md",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/.bower.json",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/LICENSE",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/README.md",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/bower.json",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/examples/browser/mqtt_client_hello_world.html",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/examples/browser/nutella_hello_world.html",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/examples/node/mqtt_client_hello_world.js",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/examples/node/nutella_hello_world.js",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/nutella_lib.js",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/package.json",
+    "framework_components/beacon-cloud-interface/bower_components/nutella_lib/simple-js-mqtt-client.js",
+    "framework_components/beacon-cloud-interface/css/animation.css",
+    "framework_components/beacon-cloud-interface/css/cursor.css",
+    "framework_components/beacon-cloud-interface/css/page_layout.css",
+    "framework_components/beacon-cloud-interface/index.html",
+    "framework_components/beacon-cloud-interface/js/lib/nutella_lib.js",
+    "framework_components/beacon-cloud-interface/js/react/beacon-add.js",
+    "framework_components/beacon-cloud-interface/js/react/beacon-table.js",
+    "framework_components/beacon-cloud-interface/js/react/beacon.js",
+    "framework_components/beacon-cloud-interface/nutella.json",
     "framework_components/example_framework_web_interface/index.html",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/.npmignore",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/.travis.yml",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/LICENSE",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/README.md",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/dist/nutella_lib.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/dist/nutella_lib.js.map",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/examples/browser_hello_world.html",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/examples/node_hello_world.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/gulpfile.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/package.json",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/app_core.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/app_core_browser.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/app_log.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/app_net.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/app_persist.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/fr_core_browser.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/fr_log.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/fr_net.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/nutella_i.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/nutella_i_browser.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/nutella_lib.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/nutella_lib_browser.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/run_log.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/run_net.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/run_persist.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/src/util/net.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/test/nutella.test.js",
+    "framework_components/example_framework_web_interface/node_modules/nutella_lib/test/runner.html",
+    "framework_components/example_framework_web_interface/package.json",
     "framework_components/logging_bot/logging_bot.rb",
     "framework_components/logging_bot/startup",
     "framework_components/logging_bot/utils.rb",
@@ -41,8 +101,8 @@ 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/order.json.example",
-    "framework_components/runs_list_bot/app_runs_list_bot.rb",
+    "framework_components/order.json",
+    "framework_components/runs_list_bot/runs_list_bot.rb",
     "framework_components/runs_list_bot/startup",
     "lib/commands/broker.rb",
     "lib/commands/checkup.rb",
@@ -58,6 +118,8 @@ Gem::Specification.new do |s|
     "lib/commands/start.rb",
     "lib/commands/stop.rb",
     "lib/commands/template.rb",
+    "lib/commands/util/components_list.rb",
+    "lib/commands/util/components_starter.rb",
     "lib/config/config.rb",
     "lib/config/current_app_utils.rb",
     "lib/config/persisted_hash.rb",
@@ -92,51 +154,51 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<semantic>, [">= 1.3", "~> 1.3"])
-      s.add_runtime_dependency(%q<logging>, [">= 1.8.2", "~> 1.8"])
-      s.add_runtime_dependency(%q<git>, [">= 1.2.8", "~> 1.2"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
-      s.add_runtime_dependency(%q<thin>, [">= 1.6.3", "~> 1.6.3"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
-      s.add_runtime_dependency(%q<slop>, [">= 4.0.0", "~> 4.0.0"])
-      s.add_runtime_dependency(%q<nutella_lib>, [">= 0.4.6", "~> 0.4.6"])
-      s.add_development_dependency(%q<shoulda>, [">= 3", "~> 3"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
-      s.add_development_dependency(%q<rdoc>, [">= 4.0", "~> 4.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0", "~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0", "~> 0"])
+      s.add_runtime_dependency(%q<semantic>, ["~> 1.4"])
+      s.add_runtime_dependency(%q<logging>, ["~> 1.8"])
+      s.add_runtime_dependency(%q<git>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.4"])
+      s.add_runtime_dependency(%q<thin>, ["~> 1.6"])
+      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.10"])
+      s.add_development_dependency(%q<shoulda>, ["~> 3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.9"])
     else
-      s.add_dependency(%q<semantic>, [">= 1.3", "~> 1.3"])
-      s.add_dependency(%q<logging>, [">= 1.8.2", "~> 1.8"])
-      s.add_dependency(%q<git>, [">= 1.2.8", "~> 1.2"])
-      s.add_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
-      s.add_dependency(%q<thin>, [">= 1.6.3", "~> 1.6.3"])
-      s.add_dependency(%q<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
-      s.add_dependency(%q<slop>, [">= 4.0.0", "~> 4.0.0"])
-      s.add_dependency(%q<nutella_lib>, [">= 0.4.6", "~> 0.4.6"])
-      s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
-      s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
-      s.add_dependency(%q<rdoc>, [">= 4.0", "~> 4.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0", "~> 1.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0", "~> 0"])
+      s.add_dependency(%q<semantic>, ["~> 1.4"])
+      s.add_dependency(%q<logging>, ["~> 1.8"])
+      s.add_dependency(%q<git>, ["~> 1.2"])
+      s.add_dependency(%q<sinatra>, ["~> 1.4"])
+      s.add_dependency(%q<thin>, ["~> 1.6"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.6"])
+      s.add_dependency(%q<slop>, ["~> 4.0"])
+      s.add_dependency(%q<nutella_lib>, ["~> 0.4.10"])
+      s.add_dependency(%q<shoulda>, ["~> 3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.8"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<semantic>, [">= 1.3", "~> 1.3"])
-    s.add_dependency(%q<logging>, [">= 1.8.2", "~> 1.8"])
-    s.add_dependency(%q<git>, [">= 1.2.8", "~> 1.2"])
-    s.add_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
-    s.add_dependency(%q<thin>, [">= 1.6.3", "~> 1.6.3"])
-    s.add_dependency(%q<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
-    s.add_dependency(%q<slop>, [">= 4.0.0", "~> 4.0.0"])
-    s.add_dependency(%q<nutella_lib>, [">= 0.4.6", "~> 0.4.6"])
-    s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
-    s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
-    s.add_dependency(%q<rdoc>, [">= 4.0", "~> 4.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0", "~> 1.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0", "~> 0"])
+    s.add_dependency(%q<semantic>, ["~> 1.4"])
+    s.add_dependency(%q<logging>, ["~> 1.8"])
+    s.add_dependency(%q<git>, ["~> 1.2"])
+    s.add_dependency(%q<sinatra>, ["~> 1.4"])
+    s.add_dependency(%q<thin>, ["~> 1.6"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.6"])
+    s.add_dependency(%q<slop>, ["~> 4.0"])
+    s.add_dependency(%q<nutella_lib>, ["~> 0.4.10"])
+    s.add_dependency(%q<shoulda>, ["~> 3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.8"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0.9"])
   end
 end
 

data/nutella_lib/framework_net.rb

@@ -180,7 +180,7 @@ module Nutella
           rescue JSON::ParserError
             # Make sure the message is JSON, if not drop the message
             return
-          rescue
+          rescue ArgumentError
             # Check the passed callback has the right number of arguments
             STDERR.puts "The callback you passed to subscribe has the #{$!}: it needs 'payload', 'app_id', 'run_id' and 'from'"
           end
@@ -189,8 +189,8 @@ module Nutella
         Nutella::Net.subscriptions.push padded_channel
         Nutella::Net.callbacks.push mqtt_cb
         Nutella.mqtt.subscribe( padded_channel, mqtt_cb )
-        # Notify subscriptions bot
-        Nutella::Net.publish_to('subscriptions', {'channel' => padded_channel}, nil, nil)
+        # Notify subscription
+        Nutella::Net.publish_to('subscriptions', {'type' => 'subscribe', 'channel' => padded_channel}, nil, nil)
       end
 
 
@@ -259,13 +259,16 @@ module Nutella
           rescue JSON::ParserError
             # Make sure that request contains JSON, if not drop the message
             return
-          rescue
+          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
+        puts padded_channel
         Nutella.mqtt.subscribe( padded_channel, mqtt_cb )
+        # Notify subscription
+        Nutella::Net.publish_to('subscriptions', {'type' => 'handle_requests', 'channel' => padded_channel}, nil, nil)
       end
 
       # @!endgroup
@@ -380,7 +383,7 @@ module Nutella
           rescue JSON::ParserError
             # Make sure the message is JSON, if not drop the message
             return
-          rescue
+          rescue ArgumentError
             # Check the passed callback has the right number of arguments
             STDERR.puts "The callback you passed to subscribe has the #{$!}: it needs 'payload', 'app_id' and 'from'"
           end
@@ -389,8 +392,8 @@ module Nutella
         Nutella::Net.subscriptions.push padded_channel
         Nutella::Net.callbacks.push mqtt_cb
         Nutella.mqtt.subscribe( padded_channel, mqtt_cb )
-        # Notify subscriptions bot
-        Nutella::Net.publish_to('subscriptions', {'channel' => padded_channel}, nil, nil)
+        # Notify subscription
+        Nutella::Net.publish_to('subscriptions', {'type' => 'subscribe', 'channel' => padded_channel}, nil, nil)
       end
 
 
@@ -454,33 +457,34 @@ module Nutella
           rescue JSON::ParserError
             # Make sure that request contains JSON, if not drop the message
             return
-          rescue
+          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' and 'from'"
           end
         end
         # Subscribe to the channel
         Nutella.mqtt.subscribe( padded_channel, mqtt_cb )
+        # Notify subscription
+        Nutella::Net.publish_to('subscriptions', {'type' => 'handle_requests', 'channel' => padded_channel}, nil, nil)
       end
 
       # @!endgroup
 
+
       # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+
       # Listens for incoming messages. All this function
       # does is to put the thread to sleep and wait for something to
       # happen over the network to wake up.
       def self.listen
-        begin
-          sleep
-        rescue Interrupt
-          # Simply returns once interrupted
-        end
+        Nutella::Net.listen
       end
 
 
       private
 
+
       def self.extract_run_id_and_app_id( mqtt_channel )
         sp =  mqtt_channel.sub('/nutella/apps/', '').split('/')
         return sp[0], sp[2]