nutella_lib 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6803b3cb787519bd1f861c931211696fa0b35afb
-  data.tar.gz: 20537f9462a2a9bdbacb51c2d24d801788b29ed1
+  metadata.gz: 2016c67f84255831a77a366b0e60feb41d533933
+  data.tar.gz: 5249682d97501eda22d951916126f3e539aaf425
 SHA512:
-  metadata.gz: 83cbd543626b9031e998e4cbf1bd4c0e94af45d0d09e4c689d8c2d1a1d34cb80a4c60ff6079c6cfcef73b420daf579dd6f9b09366629beeb064c91bf393a6371
-  data.tar.gz: 086aed862b969022d4cfec48defbe19eacb3e7f949ff4c21da2e0c5d44a9bd81d69e496956ed54af0200acc2e057f80e335782a76ef77cab1cb29e3711b54d41
+  metadata.gz: 68d73aba562d55c2f487fcedd3ffbbb0081dd342486fd6079722d2d718fbcc06b79ffeaa1c28301347f479d664fb37c52c3d04dd3f39b3ed1f4fe801ade57f0e
+  data.tar.gz: d9d0434e9ac3dec3bcfb2e3a79aca838b4eeda46313bbddebe44f9059c60e4de39538f9e3a20badd0820493d74f09ac1afd3c265e21a26ceac755abbc0aea8cf

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'mqtt', '~> 0.3', '>= 0.3'
+gem 'ansi', '~> 1.5', '>= 1.4'
 
 group :development do
   gem 'shoulda', '~> 3', '>= 3'

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/nutella_lib/app_core.rb

@@ -0,0 +1,57 @@
+module Nutella
+
+  module App
+
+    # Initializes this component as an application component
+    # @param [String] broker_hostname
+    # @param [String] component_id
+    def self.init( broker_hostname, app_id, component_id )
+      Nutella.app_id = app_id
+      Nutella.run_id = nil
+      Nutella.component_id = component_id
+      Nutella.resource_id = nil
+      Nutella.mqtt = SimpleMQTTClient.new broker_hostname
+      # Fetch the `run_id`s list for this application and subscribe to its updates
+      # @app_runs_list = net.sync_request('app_runs_list')
+      # self.net.subscribe('app_runs_list', lambda {|message, _| Nutella.app.app_runs_list = message })
+    end
+
+    # Setter/getter for runs_list
+    def self.app_runs_list=(val) @app_runs_list=val; end
+    def self.app_runs_list; @app_runs_list end
+
+    # Accessors for sub-modules
+    def self.net; Nutella::App::Net; end
+    def self.log; Nutella::App::Log; end
+
+
+    # Parse command line arguments for app level components
+    #
+    # @param [Array] args command line arguments array
+    # @return [String, String] broker and app_id
+    def self.parse_args(args)
+      if args.length < 2
+        STDERR.puts 'Couldn\'t read broker address and app_id from the command line, impossible to initialize component!'
+        return
+      end
+      return args[0], args[1]
+    end
+
+    # Extracts the component name from the folder where the code for this component is located
+    #
+    # @return [String] the component name
+    def self.extract_component_id
+      Nutella.extract_component_id
+    end
+
+    # Sets the resource id
+    #
+    # @param [String] resource_id the resource id (i.e. the particular instance of this component)
+    def self.set_resource_id( resource_id )
+      Nutella.set_resource_id resource_id
+    end
+
+
+  end
+
+end

data/lib/nutella_lib/app_log.rb

@@ -0,0 +1,49 @@
+require 'ansi'
+
+module Nutella
+
+  module App
+
+    module Log
+
+      def self.debug(message, code=nil)
+        puts( ANSI.cyan + message + ANSI.reset )
+        Nutella.app.net.publish( 'logging', log_to_json(message, code, __method__) )
+        code
+      end
+
+      def self.info(message, code=nil)
+        puts( message )
+        Nutella.app.net.publish( 'logging', log_to_json(message, code, __method__) )
+        code
+      end
+
+      def self.success(message, code=nil)
+        puts( ANSI.green + message + ANSI.reset )
+        Nutella.app.net.publish( 'logging', log_to_json(message, code, __method__) )
+        code
+      end
+
+      def self.warn(message, code=nil)
+        puts( ANSI.yellow + message + ANSI.reset )
+        Nutella.app.net.publish( 'logging', log_to_json(message, code, __method__) )
+        code
+      end
+
+      def self.error(message, code=nil)
+        puts( ANSI.red + message + ANSI.reset )
+        Nutella.app.net.publish( 'logging', log_to_json(message, code, __method__) )
+        code
+      end
+
+      private
+
+      def self.log_to_json( message, code, level)
+        code.nil? ? {level: level, message: message} : {level: level, message: message, code: code}
+      end
+
+    end
+
+  end
+
+end

data/lib/nutella_lib/{net_app.rb → app_net.rb}

@@ -1,8 +1,9 @@
 module Nutella
-  module Net
+
+  module App
 
     # This module implements the pub/sub and request/response APIs at the application level
-    module App
+    module Net
 
 
       # @!group Application-level communication APIs
@@ -15,7 +16,7 @@ module Nutella
       #   - [String] message: the received message. Messages that are not JSON are discarded.
       #   - [String] channel: the application-level channel the message was received on (optional, only for wildcard subscriptions)
       #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
-      def App.subscribe (channel, callback)
+      def self.subscribe (channel, callback)
         Nutella::Net.subscribe_to(channel, callback, Nutella.app_id, nil)
       end
 
@@ -23,7 +24,7 @@ module Nutella
       # Un-subscribes from an application-level channel
       #
       # @param [String] channel the application level channel we want to unsubscribe from. Can contain wildcard(s).
-      def App.unsubscribe( channel )
+      def self.unsubscribe( channel )
         Nutella::Net.unsubscribe_to(channel, Nutella.app_id, nil)
       end
 
@@ -33,7 +34,7 @@ module Nutella
       # @param [String] channel the application-level channel we want to publish the message to. *CANNOT* contain wildcard(s)!
       # @param [Object] message the message we are publishing. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-      def App.publish(channel, message=nil)
+      def self.publish(channel, message=nil)
         Nutella::Net.publish_to(channel, message, Nutella.app_id, nil)
       end
 
@@ -43,7 +44,7 @@ module Nutella
       # @param [String] channel the application-level channel we want to make the request to. *CANNOT* contain wildcard(s)!
       # @param [Object] message the body of request. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-      def App.sync_request ( channel, message=nil )
+      def self.sync_request ( channel, message=nil )
         Nutella::Net.sync_request_to(channel, message, Nutella.app_id, nil)
       end
 
@@ -54,7 +55,7 @@ module Nutella
       # @param [Object] message the body of request. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
       # @param [Proc] callback the callback that is fired whenever a response is received. It takes one parameter (response).
-      def App.async_request ( channel, message=nil, callback )
+      def self.async_request ( channel, message=nil, callback )
         Nutella::Net.async_request_to(channel, message, callback, Nutella.app_id, nil)
       end
 
@@ -67,7 +68,7 @@ module Nutella
       #   - [String] the received message (payload). Messages that are not JSON are discarded.
       #   - [Hash] the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
       #   - [*returns* Hash] The response sent back to the client that performed the request. Whatever is returned by the callback is marshaled into a JSON string and sent via MQTT.
-      def App.handle_requests( channel, callback )
+      def self.handle_requests( channel, callback )
         Nutella::Net.handle_requests_on(channel, callback, Nutella.app_id, nil)
       end
 
@@ -85,7 +86,7 @@ module Nutella
       #   - [String] message: the received message. Messages that are not JSON are discarded.
       #   - [String] channel: the application-level channel the message was received on (optional, only for wildcard subscriptions)
       #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
-      def App.subscribe_to_run( run_id, channel, callback )
+      def self.subscribe_to_run( run_id, channel, callback )
         Nutella::Net.subscribe_to(channel, callback, Nutella.app_id, run_id)
       end
 
@@ -94,7 +95,7 @@ module Nutella
       #
       # @param [String] run_id the specific run we are un-subscribing from
       # @param [String] channel the run-level channel we want to unsubscribe from. Can contain wildcard(s).
-      def App.unsubscribe_to_run( run_id, channel )
+      def self.unsubscribe_to_run( run_id, channel )
         Nutella::Net.unsubscribe_to(channel, Nutella.app_id, run_id)
       end
 
@@ -105,7 +106,7 @@ module Nutella
       # @param [String] channel the run-level channel we want to publish the message to. *CANNOT* contain wildcard(s)!
       # @param [String] message the message we are publishing. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-      def App.publish_to_run( run_id, channel, message )
+      def self.publish_to_run( run_id, channel, message )
         Nutella::Net.publish_to(channel, message, Nutella.app_id, run_id)
       end
 
@@ -116,7 +117,7 @@ module Nutella
       # @param [String] channel the channel we want to make the request to. *CANNOT* contain wildcard(s)!
       # @param [Object] request the body of request. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-      def App.sync_request_to_run( run_id, channel, request)
+      def self.sync_request_to_run( run_id, channel, request)
         Nutella::Net.sync_request_to(channel, request, Nutella.app_id, run_id)
       end
 
@@ -128,7 +129,7 @@ module Nutella
       # @param [Object] request the body of request. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
       # @param [Proc] callback the callback that is fired whenever a response is received. It takes one parameter (response).
-      def App.async_request_to_run( run_id, channel, request, callback)
+      def self.async_request_to_run( run_id, channel, request, callback)
         Nutella::Net.async_request_to(channel, request, callback, Nutella.app_id, run_id)
       end
 
@@ -142,7 +143,7 @@ module Nutella
       #   - [String] the received message (payload). Messages that are not JSON are discarded.
       #   - [Hash] the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
       #   - [*returns* Hash] The response sent back to the client that performed the request. Whatever is returned by the callback is marshaled into a JSON string and sent via MQTT.
-      def App.handle_requests_on_run( run_id, channel, callback )
+      def self.handle_requests_on_run( run_id, channel, callback )
         Nutella::Net.handle_requests_on(channel, callback, Nutella.app_id, run_id)
       end
 
@@ -159,7 +160,7 @@ module Nutella
       #   - [String] message: the received message. Messages that are not JSON are discarded.
       #   - [String] run_id: the run_id of the channel the message was sent on
       #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
-      def App.subscribe_to_all_runs( channel, callback )
+      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 3 parameters (payload, run_id, from) when subscribing to all runs!' if callback.parameters.length!=3
         # Pad channel
@@ -187,7 +188,7 @@ module Nutella
       # Allows application-level APIs to unsubscribe from a run-level channel *for ALL runs*
       #
       # @param [String] channel the run-level channel we want to unsubscribe from. Can contain wildcard(s).
-      def App.unsubscribe_from_all_runs( channel )
+      def self.unsubscribe_from_all_runs( channel )
         Nutella::Net.unsubscribe_to(channel, Nutella.app_id, '+')
       end
 
@@ -197,8 +198,8 @@ module Nutella
       # @param [String] channel the run-level channel we want to publish the message to. *CANNOT* contain wildcard(s)!
       # @param [Object] message the message we are publishing. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-      def App.publish_to_all_runs( channel, message )
-        Nutella.app_runs_list.each do |run_id|
+      def self.publish_to_all_runs( channel, message )
+        Nutella.app.app_runs_list.each do |run_id|
           Nutella::Net.publish_to(channel, message, Nutella.app_id, run_id)
         end
       end
@@ -210,8 +211,8 @@ module Nutella
       # @param [Object] request the body of request. This can be,
       #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
       # @param [Proc] callback the callback that is fired whenever a response is received. It takes one parameter (response).
-      def App.async_request_to_all_runs(channel, request, callback)
-        Nutella.app_runs_list.each do |run_id|
+      def self.async_request_to_all_runs(channel, request, callback)
+        Nutella.app.app_runs_list.each do |run_id|
           Nutella::Net.async_request_to(channel, request, callback, Nutella.app_id, run_id)
         end
       end
@@ -226,7 +227,7 @@ module Nutella
       #   - [String] run_id: the run_id of the channel the message was sent on
       #   - [Hash] the sender's identifiers (from containing, run_id, app_id, component_id and optionally resource_id)
       #   - [*returns* Hash] The response sent back to the client that performed the request. Whatever is returned by the callback is marshaled into a JSON string and sent via MQTT.
-      def App.handle_requests_on_all_runs(channel, callback)
+      def self.handle_requests_on_all_runs(channel, callback)
         # Check the passed callback has the right number of arguments
         raise 'You need to pass a callback with 3 parameters (request, run_id, from) when handling requests!' if callback.parameters.length!=3
         # Pad channel
@@ -257,9 +258,21 @@ module Nutella
       # @!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
+      end
+
+
       private
 
-      def App.extract_run_id_from_ch( app_id, mqtt_channel )
+      def self.extract_run_id_from_ch( app_id, mqtt_channel )
         head = "/nutella/apps/#{app_id}/runs/"
         mqtt_channel.gsub(head, '').split('/')[0]
       end
@@ -268,4 +281,5 @@ module Nutella
     end
 
   end
+
 end

data/lib/nutella_lib/core.rb

@@ -15,50 +15,32 @@ module Nutella
   end
 
 
-  # Initializes this component as an application component
-  # @param [String] broker_hostname
-  # @param [String] component_id
-  def self.init_as_app_component( broker_hostname, app_id, component_id )
-    @app_id = app_id
-    @run_id = nil
-    @component_id = component_id
-    @resource_id = nil
-    @mqtt = SimpleMQTTClient.new broker_hostname
-    # Fetch the `run_id`s list for this application and subscribe to its updates
-    @app_runs_list = net.app.sync_request('app_runs_list')
-    net.app.subscribe('app_runs_list', lambda {|message, _| @app_runs_list = message })
-  end
-
-
-  # Accessors for app_id
+  # Variables accessors
   def self.app_id; @app_id end
-
-  # Accessors for run_id
   def self.run_id; @run_id end
-
-  # Accessors for mqtt client
-  def self.mqtt;
-    raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @mqtt.nil?
-    @mqtt
-  end
-
-  # Accessors for component_id
+  def self.resource_id; @resource_id end
   def self.component_id;
     raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @component_id.nil?
     @component_id
   end
+  def self.mqtt;
+    raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @mqtt.nil?
+    @mqtt
+  end
 
-  # Accessors for resource_id
-  def self.resource_id; @resource_id end
-
-  # Accessor for runs list
-  def self.app_runs_list; @app_runs_list end
+  # Variables Setters
+  def self.app_id=(val); @app_id=val; end
+  def self.run_id=(val); @run_id=val; end
+  def self.resource_id=(val); @resource_id=val; end
+  def self.component_id=(val); @component_id=val; end
+  def self.mqtt=(val); @mqtt=val; end
 
-  # Accessor for the net module
-  def self.net; Nutella::Net end
 
-  # Accessor for the persist module
-  def self.persist; Nutella::Persist end
+  # Accessors for sub-modules
+  def self.app; Nutella::App; end
+  def self.net; Nutella::Net; end
+  def self.log; Nutella::Log; end
+  def self.persist; Nutella::Persist; end
 
 
   # Utility functions
@@ -68,7 +50,7 @@ module Nutella
   #
   # @param [Array] args command line arguments array
   # @return [String, String, String] broker, app_id and run_id
-  def self.parse_run_component_args(args)
+  def self.parse_args(args)
     if args.length < 3
       STDERR.puts 'Couldn\'t read broker address, app_id and run_id from the command line, impossible to initialize component!'
       return
@@ -77,19 +59,6 @@ module Nutella
   end
 
 
-  # Parse command line arguments for app level components
-  #
-  # @param [Array] args command line arguments array
-  # @return [String, String] broker and app_id
-  def self.parse_app_component_args(args)
-    if args.length < 2
-      STDERR.puts 'Couldn\'t read broker address and app_id from the command line, impossible to initialize component!'
-      return
-    end
-    return args[0], args[1]
-  end
-
-
   # Extracts the component name from the folder where the code for this component is located
   #
   # @return [String] the component name

data/lib/nutella_lib/log.rb

@@ -0,0 +1,46 @@
+require 'ansi'
+
+module Nutella
+
+  module Log
+
+    def self.debug(message, code=nil)
+      puts( ANSI.cyan + message + ANSI.reset )
+      Nutella.net.publish( 'logging', log_to_json(message, code, __method__) )
+      code
+    end
+
+    def self.info(message, code=nil)
+      puts( message )
+      Nutella.net.publish( 'logging', log_to_json(message, code, __method__) )
+      code
+    end
+
+    def self.success(message, code=nil)
+      puts( ANSI.green + message + ANSI.reset )
+      Nutella.net.publish( 'logging', log_to_json(message, code, __method__) )
+      code
+    end
+
+    def self.warn(message, code=nil)
+      puts( ANSI.yellow + message + ANSI.reset )
+      Nutella.net.publish( 'logging', log_to_json(message, code, __method__) )
+      code
+    end
+
+    def self.error(message, code=nil)
+      puts( ANSI.red + message + ANSI.reset )
+      Nutella.net.publish( 'logging', log_to_json(message, code, __method__) )
+      code
+    end
+
+    private
+
+    def self.log_to_json( message, code, level)
+      code.nil? ? {level: level, message: message} : {level: level, message: message, code: code}
+    end
+
+
+  end
+
+end

data/lib/nutella_lib/net.rb

@@ -7,14 +7,11 @@ module Nutella
     @subscriptions = []
     @callbacks = []
 
-    # Provides access to the net.app sub-module
-    def Net.app; Nutella::Net::App end
-
     # Provides access to the subscriptions
-    def Net.subscriptions; @subscriptions end
+    def self.subscriptions; @subscriptions end
 
     # Provides access to callbacks
-    def Net.callbacks; @callbacks end
+    def self.callbacks; @callbacks end
 
 
     # Subscribes to a channel or to a set of channels.
@@ -25,7 +22,7 @@ module Nutella
     #   - [String] message: the received message. Messages that are not JSON are discarded.
     #   - [String] channel: the channel the message was received on (optional, only for wildcard subscriptions)
     #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
-    def Net.subscribe( channel, callback )
+    def self.subscribe( channel, callback )
       subscribe_to( channel, callback, Nutella.app_id, Nutella.run_id)
     end
 
@@ -33,7 +30,7 @@ module Nutella
     # Un-subscribes from a channel
     #
     # @param [String] channel we want to unsubscribe from. Can contain wildcard(s).
-    def Net.unsubscribe( channel )
+    def self.unsubscribe( channel )
       unsubscribe_to( channel, Nutella.app_id, Nutella.run_id)
     end
 
@@ -43,7 +40,7 @@ module Nutella
     # @param [String] channel we want to publish the message to. *CANNOT* contain wildcard(s)!
     # @param [Object] message the message we are publishing. This can be,
     #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-    def Net.publish( channel, message=nil )
+    def self.publish( channel, message=nil )
       publish_to( channel, message, Nutella.app_id, Nutella.run_id)
     end
 
@@ -53,7 +50,7 @@ module Nutella
     # @param [String] channel we want to make the request to. *CANNOT* contain wildcard(s)!
     # @param [Object] message the body of request. This can be,
     #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
-    def Net.sync_request( channel, message=nil )
+    def self.sync_request( channel, message=nil )
       sync_request_to(channel, message, Nutella.app_id, Nutella.run_id)
     end
 
@@ -64,7 +61,7 @@ module Nutella
     # @param [Object] message the body of request. This can be,
     #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
     # @param [Proc] callback the callback that is fired whenever a response is received. It takes one parameter (response).
-    def Net.async_request( channel, message=nil, callback )
+    def self.async_request( channel, message=nil, callback )
       async_request_to(channel, message, callback, Nutella.app_id, Nutella.run_id)
     end
 
@@ -78,7 +75,7 @@ module Nutella
     #   - [Hash] the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
     #   - [*returns* Hash] The response sent back to the client that performed the request. Whatever is returned by the callback is marshaled into a JSON string and sent via MQTT.
     #
-    def Net.handle_requests( channel, callback )
+    def self.handle_requests( channel, callback )
       handle_requests_on(channel, callback, Nutella.app_id, Nutella.run_id)
     end
 
@@ -86,7 +83,7 @@ module Nutella
     # 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 Net.listen
+    def self.listen
       begin
         sleep
       rescue Interrupt
@@ -98,26 +95,26 @@ module Nutella
     private
 
 
-    def Net.extract_fields_from_message(message)
+    def self.extract_fields_from_message(message)
       mh = JSON.parse message
       return mh['type'], mh['from'], mh['payload'], mh['id']
     end
 
-    def Net.pad_channel( channel, app_id, run_id )
+    def self.pad_channel( channel, app_id, run_id )
       raise 'If the run_id is specified, app_id needs to also be specified' if (!run_id.nil? && app_id.nil?)
       return "/nutella/#{channel}" if (app_id.nil? && run_id.nil?)
       return "/nutella/apps/#{app_id}/#{channel}" if (!app_id.nil? && run_id.nil?)
       "/nutella/apps/#{app_id}/runs/#{run_id}/#{channel}"
     end
 
-    def Net.un_pad_channel( channel, app_id, run_id )
+    def self.un_pad_channel( channel, app_id, run_id )
       raise 'If the run_id is specified, app_id needs to also be specified' if (!run_id.nil? && app_id.nil?)
       return channel.gsub('/nutella/', '') if (app_id.nil? && run_id.nil?)
       return channel.gsub("/nutella/apps/#{app_id}/", '') if (!app_id.nil? && run_id.nil?)
       channel.gsub("/nutella/apps/#{app_id}/runs/#{run_id}/", '')
     end
 
-    def Net.assemble_from
+    def self.assemble_from
       from = Hash.new
       if Nutella.run_id.nil?
         from['type'] = 'app'
@@ -131,14 +128,14 @@ module Nutella
       from
     end
 
-    def Net.prepare_message_for_publish( message )
+    def self.prepare_message_for_publish( message )
       if message.nil?
         return {type: 'publish', from: assemble_from}.to_json
       end
       {type: 'publish', from: assemble_from, payload: message}.to_json
     end
 
-    def Net.prepare_message_for_request( message )
+    def self.prepare_message_for_request( message )
       id = message.hash + Random.rand(100)
       if message.nil?
         return {id: id, type: 'request', from: assemble_from}.to_json, id
@@ -146,7 +143,7 @@ module Nutella
       return {id: id, type: 'request', from: assemble_from, payload: message}.to_json, id
     end
 
-    def Net.prepare_message_for_response( message, id )
+    def self.prepare_message_for_response( message, id )
       if message.nil?
         return {id: id, type: 'response', from: assemble_from}.to_json
       end
@@ -164,7 +161,7 @@ module Nutella
     #   - [Hash] from: the sender's identifiers (run_id, app_id, component_id and optionally resource_id)
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.subscribe_to( channel, callback, app_id, run_id )
+    def self.subscribe_to( channel, callback, app_id, run_id )
       # Check the passed callback has the right number of arguments
       if Nutella.mqtt.is_channel_wildcard?(channel)
         raise 'You need to pass a callback with 3 parameters (message, channel, from) when subscribing to a wildcard channel!' if callback.parameters.length!=3
@@ -216,7 +213,7 @@ module Nutella
     # @param [String] channel we want to unsubscribe from. Can contain wildcard(s).
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.unsubscribe_to( channel, app_id, run_id )
+    def self.unsubscribe_to( channel, app_id, run_id )
       # Pad channel
       padded_channel = pad_channel(channel, app_id, run_id)
       idx = @subscriptions.index padded_channel
@@ -238,15 +235,16 @@ module Nutella
     #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.publish_to( channel, message=nil, app_id, run_id )
+    def self.publish_to( channel, message=nil, app_id, run_id )
       # Pad channel
       padded_channel = pad_channel(channel, app_id, run_id)
       # Throw exception if trying to publish something that is not JSON
       begin
-        m = Net.prepare_message_for_publish message
+        m = self.prepare_message_for_publish message
         Nutella.mqtt.publish( padded_channel, m )
       rescue
         STDERR.puts 'Error: you are trying to publish something that is not JSON'
+        STDERR.puts $!
       end
     end
 
@@ -258,7 +256,7 @@ module Nutella
     #   nil/empty (default), a string, a hash and, in general, anything with a .to_json method.
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.sync_request_to( channel, message=nil, app_id, run_id )
+    def self.sync_request_to( channel, message=nil, app_id, run_id )
       # Pad channel
       padded_channel = pad_channel(channel, app_id, run_id)
       # Prepare message
@@ -291,7 +289,7 @@ module Nutella
     # @param [Proc] callback the callback that is fired whenever a response is received. It takes one parameter (response).
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.async_request_to( channel, message=nil, callback, app_id, run_id )
+    def self.async_request_to( channel, message=nil, callback, app_id, run_id )
       # Check the passed callback has the right number of arguments
       raise 'You need to pass a callback with 1 parameter (response) when making an asynchronous request!' if callback.parameters.length!=1
       # Pad channel
@@ -323,7 +321,7 @@ module Nutella
     #   - [*returns* Hash] The response sent back to the client that performed the request. Whatever is returned by the callback is marshaled into a JSON string and sent via MQTT.
     # @param [String] app_id used to pad channels
     # @param [String] run_id used to pad channels
-    def Net.handle_requests_on( channel, callback, app_id, run_id )
+    def self.handle_requests_on( channel, callback, app_id, run_id )
       # Check the passed callback has the right number of arguments
       raise 'You need to pass a callback with 2 parameter (request, from) when handling requests!' if callback.parameters.length!=2
       # Pad channel
@@ -335,7 +333,7 @@ module Nutella
           # Only handle requests that have proper id set
           return if type!='request' || id.nil?
           # Execute callback and send response
-          m = Net.prepare_message_for_response( callback.call( payload, from), id )
+          m = self.prepare_message_for_response( callback.call( payload, from), id )
           Nutella.mqtt.publish( padded_channel, m )
         rescue JSON::ParserError
           # Make sure that request contains JSON, if not drop the message

data/lib/nutella_lib.rb

@@ -1,12 +1,16 @@
+require 'json'
+require 'set'
+
+require 'simple_mqtt_client/simple_mqtt_client'
+
 require 'nutella_lib/core'
 require 'nutella_lib/net'
-require 'nutella_lib/net_app'
+require 'nutella_lib/log'
 require 'nutella_lib/persist'
-require 'simple_mqtt_client/simple_mqtt_client'
 
-# Gems used across the whole library
-require 'json'
-require 'set'
+require 'nutella_lib/app_core'
+require 'nutella_lib/app_net'
+require 'nutella_lib/app_log'
 
 # NO_EXT gets defined when you require "nutella_lib/noext", which
 # signals that you don't want any extensions.

data/nutella_lib.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_lib 0.4.0 ruby lib
+# stub: nutella_lib 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_lib"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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-13"
+  s.date = "2015-03-16"
   s.description = "Implements the nutella protocol and exposes it natively to ruby developers"
   s.email = "tebemis@gmail.com"
   s.extra_rdoc_files = [
@@ -27,15 +27,19 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/nutella_lib.rb",
+    "lib/nutella_lib/app_core.rb",
+    "lib/nutella_lib/app_log.rb",
+    "lib/nutella_lib/app_net.rb",
     "lib/nutella_lib/core.rb",
     "lib/nutella_lib/ext/kernel.rb",
+    "lib/nutella_lib/log.rb",
     "lib/nutella_lib/net.rb",
-    "lib/nutella_lib/net_app.rb",
     "lib/nutella_lib/noext.rb",
     "lib/nutella_lib/persist.rb",
     "lib/simple_mqtt_client/simple_mqtt_client.rb",
     "nutella_lib.gemspec",
     "test/helper.rb",
+    "test/test_logger.rb",
     "test/test_nutella_net.rb",
     "test/test_nutella_net_app.rb",
     "test/test_simple_mqtt_client.rb"
@@ -50,6 +54,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
+      s.add_runtime_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
       s.add_development_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_development_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_development_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -59,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0", "~> 0"])
     else
       s.add_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
+      s.add_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
       s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -69,6 +75,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
+    s.add_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
     s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
     s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
     s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])

data/test/test_logger.rb

@@ -0,0 +1,26 @@
+require 'helper'
+
+class TestNutellaNet < MiniTest::Test
+
+  # nutella.init( 'ltg.evl.uic.edu', 'ale_app_1', 'ale_run_1', 'ale_component_2' )
+  #
+  # def test_logger
+  #   p nutella.log.success 'success', 401
+  #   p nutella.log.info 'info', 401
+  #   p nutella.log.warn 'warn', 401
+  #   p nutella.log.error 'error', 401
+  #   p nutella.log.debug 'debug', 401
+  # end
+
+
+  # nutella.app.init( 'ltg.evl.uic.edu', 'ale_app_1', 'ale_component_2' )
+  #
+  # def test_logger
+  #   p nutella.app.log.success 'success', 401
+  #   p nutella.app.log.info 'info', 401
+  #   p nutella.app.log.warn 'warn', 401
+  #   p nutella.app.log.error 'error', 401
+  #   p nutella.app.log.debug 'debug', 401
+  # end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_lib
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -30,6 +30,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -186,15 +206,19 @@ files:
 - Rakefile
 - VERSION
 - lib/nutella_lib.rb
+- lib/nutella_lib/app_core.rb
+- lib/nutella_lib/app_log.rb
+- lib/nutella_lib/app_net.rb
 - lib/nutella_lib/core.rb
 - lib/nutella_lib/ext/kernel.rb
+- lib/nutella_lib/log.rb
 - lib/nutella_lib/net.rb
-- lib/nutella_lib/net_app.rb
 - lib/nutella_lib/noext.rb
 - lib/nutella_lib/persist.rb
 - lib/simple_mqtt_client/simple_mqtt_client.rb
 - nutella_lib.gemspec
 - test/helper.rb
+- test/test_logger.rb
 - test/test_nutella_net.rb
 - test/test_nutella_net_app.rb
 - test/test_simple_mqtt_client.rb