nutella_framework 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f88ae1dc5c42c292f394ef2a47a646da9b21f7
-  data.tar.gz: 3cd6d1bfa6c0ca8526f49fe1bd9a92484632fa66
+  metadata.gz: b06d936ef60bf41dac3eb872609ba9906a50cecd
+  data.tar.gz: e7a51bdbff02a0fa306eaf5267f80168c3563e30
 SHA512:
-  metadata.gz: ca6269a2cc2b90c4c0b04a5a3119aa0d2abf4b9f0d1b462c589d0feb469ecb6ffd35cbfae91ed899922c373306818a2aca63636f4e7d562e602078993a015ded
-  data.tar.gz: fedcf4af33fb2298edcdec5e0eed539928eeb772ade17ef7f50b019361b1249b8134ade09e38017ab29b0972a66168aeaf32418678c9b4f1c1b48c387d18be5d
+  metadata.gz: 23c35cb1768d1469bd29bd27b3eb4b8686c911082ec233556e9526188b544beee945bc2ff8005f588d64f0ed25f97fb41a4e3bafbd8b8c2be22a71f97003f67b
+  data.tar.gz: 23aa14c916de0d105faf807bf548ea9f6c1249868609a80756d4ba7a53b578a77f330c08080408a6bda34eaccaf920a8687514a052462ea5d8cd593ddaa351a6

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE

data/Gemfile

@@ -3,9 +3,14 @@ source "http://rubygems.org"
 gem 'ansi', '~> 1.4', '>= 1.4.3'
 gem 'semantic', '~> 1.3', '>=1.3'
 gem 'logging', '~> 1.8', '>=1.8.2'
+gem 'git', '~> 1.2', '>=1.2.8'
+gem 'thin', '~> 1.6.3', '>= 1.6.3'
+gem 'sinatra', '~>1.4.5', '>=1.4.5'
+gem 'erubis', '~>2.7.0', '>=2.7.0'
 
 group :development do
   gem 'shoulda', '~> 3', '>= 3'
+  gem "yard", '~> 0.8', '>= 0.8.7'
   gem 'rdoc', '~> 4.0', '>= 4.0'
   gem 'bundler', '~> 1.0', '>= 1.0'
   gem 'jeweler', '~> 2.0.1', '>= 2.0.1'

data/README.md

@@ -1,11 +1,47 @@
 
-# Nutella [![Build Status](https://travis-ci.org/ltg-uic/nutella_framework.svg?branch=master)](https://travis-ci.org/ltg-uic/nutella_framework) [![Dependency Status](https://gemnasium.com/ltg-uic/nutella_framework.svg)](https://gemnasium.com/ltg-uic/nutella_framework) [![Code Climate](https://codeclimate.com/github/ltg-uic/nutella_framework/badges/gpa.svg)](https://codeclimate.com/github/ltg-uic/nutella_framework)
-Nutella is a framework to build and run "Internet of Things"-like learning applications. It's still _very_ under development so keep an eye for new version and help fix the bugs you find by sumbmitting issues.
+[![Gem Version](https://badge.fury.io/rb/nutella_framework.svg)](http://badge.fury.io/rb/nutella_framework) 
+[![Build Status](https://travis-ci.org/nutella-framework/nutella_framework.svg?branch=master)](https://travis-ci.org/nutella-framework/nutella_framework) 
+[![Dependency Status](https://gemnasium.com/nutella-framework/nutella_framework.svg)](https://gemnasium.com/nutella-framework/nutella_framework) 
+[![Code Climate](https://codeclimate.com/github/nutella-framework/nutella_framework/badges/gpa.svg)](https://codeclimate.com/github/nutella-framework/nutella_framework)
+
+# Nutella 
+Nutella is a framework to build and run "Internet of Things"-like learning applications. It's still _very_ under development so keep an eye on new versions and help fix the bugs you find by [submitting issues](https://waffle.io/nutella-framework/nutella_framework). Nutella's goal is to be for the "Internet of Things" what Ruby on Rails has been for web applications. Ambitious? You bet, but where is the fun if the challenge is trivial?
+
+# Installing
+Nutella is a ruby gem so to install it we do:
+```
+gem install nutella_framework
+```
+If all goes as expected you should be able to type `nutella` in your shell and get a welcome message (yay!) together with a warnining (booooo!). Let's see why...
+
+Nutella is written in ruby but is designed to run bots and interfaces written in virtually any programming language. All communications among these components are routed through an _MQTT broker_ which needs to be installed (together with its dependencies) before nutella can actually work correctly. Therefore **right after your install nutella** you should run: 
+```
+nutella checkup
+```
+in order to make sure all the dependencies have been correctly installed.
+
 
 # Hello world
-For a complete guide on how to use Nutella, please refer to [this wiki](https://github.com/ltg-uic/nutella/wiki).
-You can install the most recent version of nutella with `gem install nutella_framework`. If all goes as expected you should be able to type `nutella` in your shell and get a welcome message. 
+So what does nutella do for me? Suppose we want to create a new application called "crepe" (because I like nutella crêpes). Let's do that:
+```
+nutella new crepe
+```
+Nutella will create the basic project structure in a directory called `crepe`. Now that we have created a basic project, we can 
+```
+cd crepe
+``` 
+and start our new project by doing
+```
+nutella start
+```
+Pretty boring isn't it? Nothing is happeninig! Why? Well, because the project we just created is simply an empty shell. Let's spice things up a bit and throw some cinnamon into this crêpe!
+
+## Templates
+What are templates? Templates are simply [boilerplate code](http://en.wikipedia.org/wiki/Boilerplate_code) that you don't have to write.  Templates are there to simplify your life. Let's see how. Our new application is a ...
+**This tutorial is a work in progress**
+
 
+For a complete guide on how to use Nutella, please refer to [this wiki](https://github.com/nutella-framework/nutella_framework/wiki).
 
 # Building & contributing
-Clone the repo, and simply type `rake` in the repo. This will run all the tests. If you want to do some fancier tasks simply type `rake -T` for a list of awesomess.
+Clone the repo, `bundle install` to take care of the dependencies and then `rake` to run all the tests. If you want to perform some fancier task simply type `rake -T` for a list of awesomeness.

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "nutella_framework"
-  gem.homepage = "https://github.com/ltg-uic/nutella_framework"
+  gem.homepage = "https://github.com/nutella-framework/nutella_framework"
   gem.license = "MIT"
   gem.summary = %Q{IoT-like learning applications framework}
   gem.description = %Q{Nutella is a framework to build and run "Internet of Things"-like learning applications}
@@ -40,12 +40,5 @@ end
 
 task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "nutella_framework #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/config/config.rb

@@ -48,6 +48,7 @@ module Nutella
       File.open(@config_file, "w+") do |f|
         f.write(JSON.pretty_generate(hash))
       end
+      File.chmod(0777,@config_file)
     end
     
     def loadConfig   

data/lib/config/runlist.rb

@@ -19,12 +19,7 @@ module Nutella
         # No file, create one
         result = [runid].to_set
       end
-      if result!=nil
-        File.open(RUN_LIST_FILE, "w+") do |f|
-          f.write(JSON.pretty_generate(result.to_a))
-        end
-      end
-      result
+      writeFile(result)
     end
 
     def delete?(runid)
@@ -34,12 +29,7 @@ module Nutella
         removeRunListFile
         result = nil # List is empty, so nil
       end
-      if result!=nil
-        File.open(RUN_LIST_FILE, "w+") do |f|
-          f.write(JSON.pretty_generate(result.to_a))
-        end
-      end
-      result
+      writeFile(result)
     end
 
     def include?(runid)
@@ -71,6 +61,14 @@ module Nutella
         Array.new # There is no file or something went wrong
       end
     end
+
+    def length
+      to_a.length
+    end
+    
+    def extractRunId(run)
+      run.to_s.empty? ? Nutella.currentProject.config["name"] : Nutella.currentProject.config["name"] + "_" + run
+    end
     
     private 
     
@@ -78,6 +76,16 @@ module Nutella
       File.delete(RUN_LIST_FILE) if File.exist?(RUN_LIST_FILE)
     end
     
+    def writeFile(result)
+      if result!=nil
+        File.open(RUN_LIST_FILE, "w+") do |f|
+          f.write(JSON.pretty_generate(result.to_a))
+        end
+        File.chmod(0777, RUN_LIST_FILE)
+      end
+      result
+    end
+    
   end
   
   

data/lib/core/commands/checkup.rb

@@ -46,6 +46,7 @@ module Nutella
       return out1 && out2
     end
     
+    
     def allDependenciesInstalled?
       # Node version lambda
       node_semver = lambda do
@@ -59,8 +60,16 @@ module Nutella
         out.slice!(0,12)
         Semantic::Version.new out[0..4]
       end
+      # Tmux version lambda
+      tmux_semver = lambda do
+        out = `tmux -V`
+        out.slice!(0,5)
+        Semantic::Version.new "#{out[0..2]}.0"
+      end
       # Check versions
-      if checkVersion?("node", "0.10.0", node_semver) && checkVersion?("git", "1.8.0", git_semver)
+      if checkVersion?("node", "0.10.0", node_semver) \
+        and checkVersion?("git", "1.8.0", git_semver) \
+        and checkVersion?("tmux", "1.8.0", tmux_semver) 
         return true
       end
       false

data/lib/core/commands/install.rb

@@ -6,36 +6,32 @@ require 'net/http'
 module Nutella
   
   class Install < Command
-    @description = "Copies an arbitrary template (from central DB, directory or URL) into the current project"
+    @description = 'Copies an arbitrary template (from central DB, directory or URL) into the current project'
   
     def run(args=nil)
       # Is current directory a nutella prj?
-      if !Nutella.currentProject.exist?
-        return
-      end
+      return unless Nutella.currentProject.exist?
     
       # Check args
       if args.empty?
-        console.warn "You need to specify a template name, directory or URL"
+        console.warn 'You need to specify a template name, directory or URL'
         return
       end
-      @template = args[0]
-      if args.length==2
-        @destinationFolder = args[1]
-      end
+      template = args[0]
+      destination_dir = args.length==2 ? args[1] : nil
       
       # Extract project directory
-      @prj_dir = Nutella.currentProject.dir
-    
+      prj_dir = Nutella.currentProject.dir
+
       # What kind of template are we handling?
-      if isTemplateALocalDir?
-        addLocalTemplate
-      elsif isTemplateAGitRepo?
-        addRemoteTemplate
-      elsif isTemplateInCentralDB?
-        addCentralTemplate
+      if is_template_a_local_dir? template
+        add_local_template( template, template, prj_dir, destination_dir )
+      elsif is_template_a_git_repo? template
+        add_remote_template( template, prj_dir, destination_dir)
+      elsif is_template_in_db? template
+        add_central_template( template, prj_dir, destination_dir)
       else
-        console.warn "The specified template is not a valid nutella template"
+        console.warn 'The specified template is not a valid nutella template'
       end
       
     end
@@ -44,107 +40,117 @@ module Nutella
     private
   
   
-    def isTemplateALocalDir?
+    def is_template_a_local_dir?( template_path )
       # Does the specified directory exist?
-      if !File.directory?(@template)
-        return false
-      end
-      return validateTemplate @template
+      return false unless File.directory? template_path
+      validate_template template_path
     end
   
   
-    def isTemplateAGitRepo?
+    def is_template_a_git_repo?( template_git_url )
       begin
-        dest_dir = @template[@template.rindex("/")+1 .. @template.length-5]
-        cloneTemplateFromRemoteTo(dest_dir)
-        return validateTemplate("#{Nutella.config["tmp_dir"]}/#{dest_dir}")
+        tmp_dest_dir = template_git_url[template_git_url.rindex('/')+1 .. template_git_url.length-5]
+        clone_template_from_repo_to( template_git_url, tmp_dest_dir )
+        return validate_template "#{Nutella.config['tmp_dir']}/#{tmp_dest_dir}"
       rescue
         return false 
       end
-      false
     end
   
   
-    def isTemplateInCentralDB?
-      uri = URI.parse("https://raw.githubusercontent.com/ltg-uic/nutella/templates-database/" + @template + ".json")
+    def is_template_in_db?( template_name )
       begin
-        nutella_json = JSON.parse(Net::HTTP.get(uri))
-        if nutella_json["name"]==@template
-          @template = nutella_json["repo"]
-          return isTemplateAGitRepo?
-        end
+        repo = extract_remote_repo_url template_name
+        return is_template_a_git_repo? repo
       rescue
         return false
       end
-      false
-    end  
-  
+    end
+
 
-    def addLocalTemplate
-      templateNutellaFileJson = JSON.parse(IO.read("#{@template}/nutella.json"))
+    def add_local_template ( template, template_dir, prj_dir, dest_dir_name)
+      template_nutella_file_json = JSON.parse(IO.read("#{template_dir}/nutella.json"))
     
       # If destination is not specified, set it to the template name
-      if @destinationFolder==nil
-        @destinationFolder = templateNutellaFileJson["name"]
+      if dest_dir_name.nil?
+        dest_dir_name = template_nutella_file_json['name']
       end
-    
       # Am I trying to copy onto a template that already exists?
-      if templateNutellaFileJson["type"]=="bot"
+      if template_nutella_file_json['type']=='bot'
         # Look into bots folder
-        dest_dir = "#{@prj_dir}/bots/#{@destinationFolder}"
+        dest_dir = "#{prj_dir}/bots/#{dest_dir_name}"
       else
         # Look into interfaces folder
-        dest_dir = "#{@prj_dir}/interfaces/#{@destinationFolder}"
+        dest_dir = "#{prj_dir}/interfaces/#{dest_dir_name}"
       end
       if File.directory?(dest_dir)
-        console.error("Folder #{dest_dir} aready exists! Can't add template #{@template}")
+        console.error("Destination folder #{dest_dir} already exists! Can't add template #{template}")
         return
       end
-      FileUtils.copy_entry @template, dest_dir
-      console.success("Installed template: #{@template} as #{dest_dir}")
+
+      # If all is good, copy the template to dest_dir...
+      FileUtils.copy_entry template_dir, dest_dir
+
+      # ... and remove nutella.json, .git folder and .gitignore file if they exist
+      File.delete "#{dest_dir}/nutella.json" if File.exist? "#{dest_dir}/nutella.json"
+      FileUtils.rm_rf "#{dest_dir}/.git"
+      File.delete "#{dest_dir}/.gitignore" if File.exist? "#{dest_dir}/.gitignore"
+
+      # Make the user feel happy and accomplished! :)
+      console.success("Installed template: #{template} as #{dest_dir_name}")
     end
   
   
-    def addRemoteTemplate
-      templ_name = @template[@template.rindex("/")+1 .. @template.length-5]
-      addLocalTemplate "#{Nutella.config["tmp_dir"]}/#{templ_name}"
+    def add_remote_template ( template, prj_dir, dest_dir)
+      template_name = template[template.rindex('/')+1 .. template.length-5]
+      template_dir = "#{Nutella.config['tmp_dir']}/#{template_name}"
+      add_local_template( template, template_dir, prj_dir, dest_dir )
     end
   
   
-    def addCentralTemplate
-      return addRemoteTemplate
+    def add_central_template( template_name, prj_dir, dest_dir)
+      template_dir = "#{Nutella.config['tmp_dir']}/#{template_name}"
+      add_local_template( template_name, template_dir, prj_dir, dest_dir )
     end
   
   
-    def cloneTemplateFromRemoteTo(dest_dir)
-      cleanTmpDir
-      if !Dir.exists?(Nutella.config["tmp_dir"])
-        Dir.mkdir(Nutella.config["tmp_dir"])
-      end
-      Git.clone(@template, dest_dir, :path => Nutella.config["tmp_dir"])
+    def clone_template_from_repo_to(template, dest_dir)
+      clean_tmp_dir
+      Dir.mkdir Nutella.config['tmp_dir']  unless Dir.exists? Nutella.config['tmp_dir']
+      Git.clone(template, dest_dir, :path => Nutella.config['tmp_dir'])
     end
     
     
-    def validateTemplate(dir)
+    def validate_template( dir )
       # Parse the template's nutella.json file
       begin
-        templateNutellaFileJson = JSON.parse(IO.read("#{dir}/nutella.json"))
+        template_nutella_file_json = JSON.parse(IO.read("#{dir}/nutella.json"))
       rescue
         return false
       end
-      # If template is a bot, perform additional checks
-      if templateNutellaFileJson["type"]=="bot"
-        # Is there a andatory 'startup' script and is it executable
-        if !File.executable?("#{dir}/startup")
-          return false
-        end
-      end 
+      # If template is a bot, perform the appropriate checks
+      if template_nutella_file_json['type']=='bot'
+        # Is there a mandatory 'startup' script and is it executable
+        return false unless File.executable? "#{dir}/startup"
+      end
+      # If template is an interface, perform the appropriate checks
+      if template_nutella_file_json['type']=='interface'
+        # Is there the mandatory index.html file
+        return false unless File.exist? "#{dir}/index.html"
+      end
       true
     end
+
+
+    def extract_remote_repo_url( template_name )
+      uri = URI.parse "https://raw.githubusercontent.com/nutella-framework/nutella_framework/templates-database/#{template_name}.json"
+      nutella_json = JSON.parse Net::HTTP.get uri
+      nutella_json['repo']
+    end
   
   
-    def cleanTmpDir
-      FileUtils.rm_rf Nutella.config["tmp_dir"]
+    def clean_tmp_dir
+      FileUtils.rm_rf "#{Nutella.config['tmp_dir']}"
     end
   
   end

data/lib/core/commands/runs.rb

@@ -8,35 +8,54 @@ module Nutella
     def run(args=nil)
       # If invoked with "--all" it will show all the runs under this instance of nutella
       if args[0]=="--all"
-        if Nutella.runlist.empty?
-          console.info "You are not running any projects"
-        else
-          console.info "Currently running:"
-          Nutella.runlist.to_a.each { |run| console.info " #{run}" }   
-        end
-      else # Just show the runs associated with this project
+        displayGlobalRuns
+      else
         # Is current directory a nutella prj?
         if !Nutella.currentProject.exist?
           return
         end
-        project_name = Nutella.currentProject.config["name"]
-        runs = Nutella.runlist.to_a project_name
-        if runs.empty?
-          console.info "Currently running #{runs.length} instances of project #{project_name}"
-          return
+        displayProjectRuns     
+      end
+    end
+    
+    
+    private 
+    
+    
+    def displayGlobalRuns
+      if Nutella.runlist.empty?
+        console.info "You are not running any projects"
+      else
+        console.info "Currently running:"
+        Nutella.runlist.to_a.each { |run| console.info " #{run}" }   
+      end
+    end
+    
+    
+    def displayProjectRuns
+      project_name = Nutella.currentProject.config["name"]
+      runs = Nutella.runlist.to_a project_name
+      if runs.empty?
+        console.info "Currently running #{runs.length} instances of project #{project_name}"
+        return
+      end
+      printProjectRuns(project_name, runs)
+    end
+    
+    
+    def printProjectRuns(project_name, runs)
+      console.info "Currently running #{runs.length} instances of project #{project_name}:"
+      runs.to_a.each do |run| 
+        run.slice! "#{project_name}_"
+        if run.empty? 
+          console.info "progetto (default)"
+        else
+          console.info " #{run}" 
         end
-        console.info "Currently running #{runs.length} instances of project #{project_name}:"
-        runs.to_a.each { |run| 
-          run.slice! "#{project_name}_"
-          if run.empty? 
-            console.info "progetto (default)"
-          else
-            console.info " #{run}" 
-          end
-        }   
       end
     end
+    
+    
   end
-  
 end
 

data/lib/core/commands/start.rb

@@ -3,57 +3,47 @@ require 'core/tmux'
 
 module Nutella
   class Start < Command
-    @description = "Starts all or some of the bots in the current project"
+    @description = 'Starts all or some of the bots in the current project'
   
     def run(args=nil)
       # Is current directory a nutella prj?
-      if !Nutella.currentProject.exist?
-        return
-      end
-    
-      # Extract runid
-      runid = args[0].to_s.empty? ? Nutella.currentProject.config["name"] : Nutella.currentProject.config["name"] + "_" + args[0]
-    
-      # Add to the list of runs and check the runId is unique
-      if !Nutella.runlist.add?(runid)
-        console.error "Impossible to start project: an instance of this project with the same name is already running!"
-        console.error "You might want to kill it with 'nutella stop "+ runid + "'"
-        return;
-      end
-      
+      return unless Nutella.currentProject.exist?
+      run_id = Nutella.runlist.extractRunId args[0]
+      # Check the runId is unique and add to the list of runs
+      return unless addToRunsList run_id
       # Extract project directory
       @prj_dir = Nutella.currentProject.dir
-    
       # If running on internal broker, start it
-      if Nutella.config["broker"] == "localhost" # Are we using the internal broker
+      if Nutella.config['broker'] == 'localhost' # Are we using the internal broker
         startBroker
       end
-    
       # Create .botsconfig file
       deleteBotsConfig
       createBotsConfig
-    
-    
       # Start all the bots
-      tmux = Tmux.new(runid)
-      Dir.entries("#{@prj_dir}/bots").select {|entry| File.directory?(File.join("#{@prj_dir}/bots",entry)) and !(entry =='.' || entry == '..') }.each do |bot|
-        if !File.exist?("#{@prj_dir}/bots/#{bot}/startup")
-          console.warn "Impossible to start bot #{bot}. Couldn't locate 'startup' script."
-          next
-        end
-        tmux.newWindow(bot)
-      end
-    
+      installBotsDependencies(run_id)
+      compileBots(run_id)
+      startBots(run_id)
+      # Start all interfaces
+      ports = start_interfaces
+      # Start all "hidden bots"
+      start_hidden_bots
       # Output success message
-      if runid == Nutella.currentProject.config["name"]
-        console.success "Project " + Nutella.currentProject.config["name"] + " started"
-      else
-        console.success "Project " + Nutella.currentProject.config["name"] + ", run " + args[0] + " started"
-      end
+      outputSuccessMessage(run_id, args[0])
     end
     
     
     private
+    
+    
+    def addToRunsList(runid)
+      if !Nutella.runlist.add?(runid)
+        console.error 'Impossible to start project: an instance of this project with the same name is already running!'
+        console.error "You might want to kill it with 'nutella stop "+ runid + "'"
+        return false
+      end
+      return true
+    end
   
   
     def startBroker
@@ -94,6 +84,72 @@ module Nutella
       File.delete("#{@prj_dir}/.botsconfig.json") if File.exist?("#{@prj_dir}/.botsconfig.json")
     end
   
+    def installBotsDependencies(runid)
+      Dir.entries("#{@prj_dir}/bots").select {|entry| File.directory?(File.join("#{@prj_dir}/bots",entry)) and !(entry =='.' || entry == '..') }.each do |bot|
+        if !File.exist?("#{@prj_dir}/bots/#{bot}/dependencies")
+          next
+        end
+        console.info "Installing dependencies for bot #{bot}."
+        cur_dir = Dir.pwd
+        Dir.chdir "#{@prj_dir}/bots/#{bot}"
+        system "./dependencies"
+        Dir.chdir cur_dir
+      end
+    end
+    
+    def compileBots(runid)
+      Dir.entries("#{@prj_dir}/bots").select {|entry| File.directory?(File.join("#{@prj_dir}/bots",entry)) and !(entry =='.' || entry == '..') }.each do |bot|
+        if !File.exist?("#{@prj_dir}/bots/#{bot}/compile")
+          next
+        end
+        console.info "Compiling bot #{bot}."
+        cur_dir = Dir.pwd
+        Dir.chdir "#{@prj_dir}/bots/#{bot}"
+        system "./compile"
+        Dir.chdir cur_dir
+      end
+    end
+    
+    def startBots(runid)
+      @tmux = Tmux.new(runid)
+      Dir.entries("#{@prj_dir}/bots").select {|entry| File.directory?(File.join("#{@prj_dir}/bots",entry)) and !(entry =='.' || entry == '..') }.each do |bot|
+        if !File.exist?("#{@prj_dir}/bots/#{bot}/startup")
+          console.warn "Impossible to start bot #{bot}. Couldn't locate 'startup' script."
+          next
+        end
+        @tmux.new_bot_window(bot)
+      end
+    end
+
+    def start_interfaces
+      ports = Hash.new
+      Dir.entries("#{@prj_dir}/interfaces").select {|entry| File.directory?(File.join("#{@prj_dir}/interfaces",entry)) and !(entry =='.' || entry == '..') }.each do |iface|
+        if !File.exist?("#{@prj_dir}/interfaces/#{iface}/index.html")
+          console.warn "Impossible to start interface #{iface}. Couldn't locate 'index.html' file."
+          next
+        end
+        ports[iface] = @tmux.new_interface_window(iface)
+      end
+      ports
+    end
+
+    def start_hidden_bots
+      # p ports
+      # puts run_id
+      # Nutella.runlist.length
+      # Nutella.config['broker']
+      # Create the webpage for all interfaces
+      # Start the web_server serving the whole interfaces directory
+      # Output message that shows the port where we are connecting
+    end
+    
+    def outputSuccessMessage(runid, run)
+      if runid == Nutella.currentProject.config["name"]
+        console.success "Project " + Nutella.currentProject.config["name"] + " started. Do `tmux attach-session -t #{Nutella.currentProject.config["name"]}` to monitor your bots."
+      else
+        console.success "Project " + Nutella.currentProject.config["name"] + ", run " + run + " started"
+      end
+    end
    
   end
   

data/lib/core/commands/stop.rb

@@ -4,46 +4,41 @@ require 'core/tmux'
 module Nutella
   class Stop < Command
     @description = "Stops all or some of the bots in the current project"
-  
+    # Is current directory a nutella prj?
     def run(args=nil)
-      # Is current directory a nutella prj?
-      if !Nutella.currentProject.exist?
-        return
-      end
-    
-      # Extract runid
-      runid = args[0].to_s.empty? ? Nutella.currentProject.config["name"] : Nutella.currentProject.config["name"] + "_" + args[0]
-    
-      # Remove from the list of runs
-      if Nutella.runlist.delete?(runid).nil?
-        console.warn "Run #{runid} doesn't exist. Impossible to stop it."
+      if !Nutella.currentProject.exist? 
         return
       end
-      # Are we using the internal broker? If yes, stop it
+      runid = Nutella.runlist.extractRunId args[0]
+      # Removes the run from the list of runs if it exists
+      removeRunfromList(runid, args[0]) 
+      # Stop broker if needed
       if Nutella.runlist.empty? and Nutella.config['broker'] == "localhost" 
         stopBroker
       end
-      
-      # Extract project directory
-      @prj_dir = Nutella.currentProject.dir
-    
       # Stops all the bots
-      Tmux.killSession(runid)
-    
+      Tmux.killSession(runid) 
       # Deletes bots config file if it exists
-      File.delete("#{@prj_dir}/.botsconfig.json") if File.exist?("#{@prj_dir}/.botsconfig.json")
-    
+      deleteBotsConfigFile
       # Output success message
-      if runid == Nutella.currentProject.config["name"]
-        console.success "Project #{Nutella.currentProject.config["name"]} stopped"
-      else
-        console.success "Project #{Nutella.currentProject.config["name"]}, run #{args[0]} stopped"
-      end
+      outputSuccessMessage(runid, args[0])
     end
   
     
     private
-  
+    
+    
+    
+    def removeRunfromList(runid, run) 
+      if Nutella.runlist.delete?(runid).nil?
+        if runid == Nutella.currentProject.config["name"]
+          console.warn "Run #{runid} doesn't exist. Impossible to stop it."
+        else
+          console.warn "Run #{run} doesn't exist. Impossible to stop it."
+        end
+        return
+      end
+    end
   
     def stopBroker
       pidFile = "#{Nutella.config["broker_dir"]}/bin/.pid"
@@ -55,8 +50,21 @@ module Nutella
         File.delete(pidFile)
       end
     end
+    
+    def deleteBotsConfigFile
+      prj_dir = Nutella.currentProject.dir 
+      if File.exist?("#{prj_dir}/.botsconfig.json")
+        File.delete("#{prj_dir}/.botsconfig.json") 
+      end
+    end
+    
+    def outputSuccessMessage(runid, run)
+      if runid == Nutella.currentProject.config["name"]
+        console.success "Project #{Nutella.currentProject.config["name"]} stopped"
+      else
+        console.success "Project #{Nutella.currentProject.config["name"]}, run #{run} stopped"
+      end
+    end
   
   end
-
-  
 end

data/lib/core/tmux.rb

@@ -6,13 +6,13 @@ module Nutella
       @runId = runId
     end
   
-    def newWindow(bot)
+    def new_bot_window(bot)
       if !defined?(@sessions)
-        # If I have no sessions I'm gonna create one and, at the same time, create a new window for the bot
+        # If there is no sessions, let's create one and, at the same time, create a new window for the bot
         `tmux new-session -d -s #{@runId} -n #{bot} &> /dev/null`
         @sessions = [bot]
       else
-        # Create new window `bot`
+        # Create new window for `bot`
         # -k destroys it if it can't be created
         # Pring info about creation of window
       	`tmux new-window -kP -n #{bot} &> /dev/null` 
@@ -21,9 +21,23 @@ module Nutella
       # Select window
     	`tmux select-window -t #{@runId}:#{@sessions.length-1} &> /dev/null`
       # Start bot
-      `tmux send-keys "cd bots/#{bot};./startup #{@runId}" C-m`
+      `tmux send-keys "cd bots/#{bot};./startup #{@runId} #{Nutella.config["broker"]}" C-m`
     end
-  
+
+    def new_interface_window( iface )
+      # Create new window for `iface`
+      # note: -k option destroys it if it can't be created
+      # hide window creation info
+      `tmux new-window -kP -n #{iface} &> /dev/null`
+      @sessions.push(iface)
+      # Select window
+      `tmux select-window -t #{@runId}:#{@sessions.length-1} &> /dev/null`
+      port = 57880+@sessions.length
+      # Start serving interface
+      `tmux send-keys "cd interfaces/#{iface};thin -R #{Nutella.config['nutella_home']}/lib/extra/config.ru -p #{port.to_s} start" C-m`
+      port
+    end
+
     def self.killSession(runId)
       `tmux kill-session -t #{runId} &> /dev/null`
     end

data/lib/extra/config.ru

@@ -0,0 +1,2 @@
+# Rack config file used by thin when serving interfaces
+run Rack::Directory.new('.')

data/lib/extra/interfaces_list.erubis

@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title> Welcome to RUNID</title>
+</head>
+
+<body>
+	<p>We need a list of frontends</p>
+
+</body>
+
+</html>

data/lib/extra/main_interface.rb

@@ -0,0 +1,9 @@
+require 'sinatra'
+require 'erubis'
+
+#settings.root = "/Users/tebemis/Code/"
+# set :views, settings.root + '/templates'
+
+get '/' do
+  erb :list
+end

data/nutella_framework.gemspec

@@ -0,0 +1,114 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: nutella_framework 0.1.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "nutella_framework"
+  s.version = "0.1.2"
+
+  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 = "2014-11-14"
+  s.description = "Nutella is a framework to build and run \"Internet of Things\"-like learning applications"
+  s.email = "tebemis@gmail.com"
+  s.executables = ["nutella"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".travis.yml",
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/nutella",
+    "lib/cli/nutella_cli.rb",
+    "lib/config/config.rb",
+    "lib/config/project.rb",
+    "lib/config/runlist.rb",
+    "lib/core/command.rb",
+    "lib/core/commands/broker.rb",
+    "lib/core/commands/checkup.rb",
+    "lib/core/commands/help.rb",
+    "lib/core/commands/install.rb",
+    "lib/core/commands/new.rb",
+    "lib/core/commands/runs.rb",
+    "lib/core/commands/start.rb",
+    "lib/core/commands/stop.rb",
+    "lib/core/nutella_core.rb",
+    "lib/core/tmux.rb",
+    "lib/extra/config.ru",
+    "lib/extra/interfaces_list.erubis",
+    "lib/extra/main_interface.rb",
+    "lib/logging/nutella_logger-remote.rb",
+    "lib/logging/nutella_logger.rb",
+    "lib/logging/nutella_logging.rb",
+    "lib/nutella_framework.rb",
+    "nutella_framework.gemspec",
+    "test/config/test_config.rb",
+    "test/config/test_project.rb",
+    "test/config/test_runlist.rb",
+    "test/helper.rb",
+    "test/logging/test_logging.rb",
+    "test/test_nutella_framework.rb"
+  ]
+  s.homepage = "https://github.com/nutella-framework/nutella_framework"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "IoT-like learning applications framework"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ansi>, [">= 1.4.3", "~> 1.4"])
+      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<thin>, [">= 1.6.3", "~> 1.6.3"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
+      s.add_runtime_dependency(%q<erubis>, [">= 2.7.0", "~> 2.7.0"])
+      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"])
+    else
+      s.add_dependency(%q<ansi>, [">= 1.4.3", "~> 1.4"])
+      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<thin>, [">= 1.6.3", "~> 1.6.3"])
+      s.add_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
+      s.add_dependency(%q<erubis>, [">= 2.7.0", "~> 2.7.0"])
+      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"])
+    end
+  else
+    s.add_dependency(%q<ansi>, [">= 1.4.3", "~> 1.4"])
+    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<thin>, [">= 1.6.3", "~> 1.6.3"])
+    s.add_dependency(%q<sinatra>, [">= 1.4.5", "~> 1.4.5"])
+    s.add_dependency(%q<erubis>, [">= 2.7.0", "~> 2.7.0"])
+    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"])
+  end
+end
+

data/test/config/test_project.rb

@@ -5,6 +5,7 @@ module Nutella
   class TestProject < MiniTest::Test
     
     def setup
+      Dir.chdir NUTELLA_HOME
       Nutella.executeCommand "new", ["test_project"]
       Dir.chdir NUTELLA_HOME + "test_project"
     end

data/test/test_nutella_framework.rb

@@ -3,27 +3,28 @@ require 'helper'
 module Nutella
   class TestNutellaFramework < MiniTest::Test
     
-    # should "run help correctly" do
-#       Nutella.init
-#       Nutella.executeCommand "help"
-#     end
-
+    def setup
+      Nutella.init
+    end
+    
+    # The test works but it takes to long to run it all the time
+    # should "install remote interface template correctly" do
+#       Dir.chdir NUTELLA_HOME
+#       prj_dir = "#{Dir.pwd}/test_prj"
+#       # create new project and cs into it
+#       Nutella.executeCommand "new", ["test_prj"]
+#       Dir.chdir prj_dir
+#       Nutella.executeCommand "install", ["basic-web-interface"]
+#       # Cleanup
+#       Dir.chdir NUTELLA_HOME
+#       FileUtils.rm_rf prj_dir
+#     end    
     
-    # should "Verify the installation" do
-#       Nutella.init
-#       Nutella.executeCommand "checkup"
-#       # e = assert_raises HelpOutException do
-# #         Nutella.executeCommand "checkup"
-# #       end
-#     end
     
+    def teardown
+      Nutella.config.send(:removeConfigFile)
+    end
     
-    # should "read the broker parameter correctly" do
-#       Nutella.store_constants
-#       $stdout = StringIO.new
-#       NutellaCLI.executeCommand("broker")
-#       assert_equal "Currently using broker: localhost\n", $stdout.string
-#     end
   end
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -70,6 +70,86 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +170,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +280,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".document"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -202,17 +303,21 @@ files:
 - lib/core/commands/stop.rb
 - lib/core/nutella_core.rb
 - lib/core/tmux.rb
+- lib/extra/config.ru
+- lib/extra/interfaces_list.erubis
+- lib/extra/main_interface.rb
 - lib/logging/nutella_logger-remote.rb
 - lib/logging/nutella_logger.rb
 - lib/logging/nutella_logging.rb
 - lib/nutella_framework.rb
+- nutella_framework.gemspec
 - test/config/test_config.rb
 - test/config/test_project.rb
 - test/config/test_runlist.rb
 - test/helper.rb
 - test/logging/test_logging.rb
 - test/test_nutella_framework.rb
-homepage: https://github.com/ltg-uic/nutella_framework
+homepage: https://github.com/nutella-framework/nutella_framework
 licenses:
 - MIT
 metadata: {}