nutella_framework 0.1.2 → 0.2.0

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.1.2 ruby lib
+# stub: nutella_framework 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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.date = "2014-11-26"
   s.description = "Nutella is a framework to build and run \"Internet of Things\"-like learning applications"
   s.email = "tebemis@gmail.com"
   s.executables = ["nutella"]
@@ -27,10 +27,16 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "actors/main_interface/main_interface_bot.rb",
+    "actors/main_interface/public/index.html",
+    "actors/main_interface/startup",
+    "actors/main_interface/views/index.erb",
+    "actors/main_interface/views/not_found_404.erb",
     "bin/nutella",
     "lib/cli/nutella_cli.rb",
     "lib/config/config.rb",
-    "lib/config/project.rb",
+    "lib/config/current_project.rb",
+    "lib/config/persisted_hash.rb",
     "lib/config/runlist.rb",
     "lib/core/command.rb",
     "lib/core/commands/broker.rb",
@@ -42,10 +48,8 @@ Gem::Specification.new do |s|
     "lib/core/commands/start.rb",
     "lib/core/commands/stop.rb",
     "lib/core/nutella_core.rb",
+    "lib/core/run_command.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",
@@ -55,8 +59,7 @@ Gem::Specification.new do |s|
     "test/config/test_project.rb",
     "test/config/test_runlist.rb",
     "test/helper.rb",
-    "test/logging/test_logging.rb",
-    "test/test_nutella_framework.rb"
+    "test/logging/test_logging.rb"
   ]
   s.homepage = "https://github.com/nutella-framework/nutella_framework"
   s.licenses = ["MIT"]
@@ -73,7 +76,7 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
       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"])
@@ -87,7 +90,7 @@ Gem::Specification.new do |s|
       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<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
       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"])
@@ -102,7 +105,7 @@ Gem::Specification.new do |s|
     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<nokogiri>, [">= 1.6.3", "~> 1.6.3"])
     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"])

data/test/config/test_config.rb

@@ -3,45 +3,46 @@ require 'helper'
 module Nutella
   
   class TestNutellaConfig < MiniTest::Test
-    
+
     def setup
-      Nutella.config.send(:removeConfigFile)
+      Nutella.config.send(:remove_file)
     end
-  
-    should "set a key value" do
-      assert_equal "value1", Nutella.config["key1"]="value1"
+
+
+    should 'set a key value' do
+      assert_equal 'value1', Nutella.config['key1']='value1'
     end
   
-    should "return 'nil' if a key doesn't exist" do   
-      assert_nil Nutella.config["fakekey"]
+    should 'return \'nil\' if a key doesn\'t exist' do
+      assert_nil Nutella.config['fakekey']
     end
 
-    should "return the value associated with a key whenever that key exists" do
-      Nutella.config["key2"]="value2"
-      assert_equal "value2", Nutella.config["key2"]
+    should 'return the value associated with a key whenever that key exists' do
+      Nutella.config['key2']='value2'
+      assert_equal 'value2', Nutella.config['key2']
     end
 
-    should "retun true if a key exists" do
-      Nutella.config["key3"]="value3"
-      assert Nutella.config.has_key?("key3")
+    should 'retun true if a key exists' do
+      Nutella.config['key3']='value3'
+      assert Nutella.config.has_key?('key3')
     end
 
-    should "retun false if a key doens't exist" do
-      refute Nutella.config.has_key?("key4")
+    should 'retun false if a key doens\'t exist' do
+      refute Nutella.config.has_key?('key4')
     end
   
-    should "access nested hashes" do
-      Nutella.config["key5"]={"k55" => "v55"}
-      assert_equal "v55", Nutella.config["key5"]["k55"]
+    should 'access nested hashes' do
+      Nutella.config['key5']={'k55' => 'v55'}
+      assert_equal 'v55', Nutella.config['key5']['k55']
     end
-  
+
+
     def teardown
-      Nutella.config.send(:removeConfigFile)
+      Nutella.config.send(:remove_file)
     end
   
   end
-  
-  
+
 end
 
 

data/test/config/test_project.rb

@@ -3,31 +3,32 @@ require 'helper'
 module Nutella
   
   class TestProject < MiniTest::Test
-    
+
     def setup
       Dir.chdir NUTELLA_HOME
-      Nutella.executeCommand "new", ["test_project"]
-      Dir.chdir NUTELLA_HOME + "test_project"
+      Nutella.execute_command( 'new', ['test_project'] )
+      Dir.chdir "#{NUTELLA_HOME}test_project"
     end
-    
-    should "return true if the dir is a nutella project" do
-      assert Nutella.currentProject.exist?
+
+
+    should 'return true if the dir is a nutella project' do
+      assert Nutella.current_project.exist?
     end
     
-    should "return false if the dir is not a nutella project" do
+    should 'return false if the dir is not a nutella project' do
       Dir.chdir NUTELLA_HOME
-      refute Nutella.currentProject.exist?
+      refute Nutella.current_project.exist?
     end
     
-    should "return the correct version of nutella as read from the project configuration file" do
-      assert_equal File.open(NUTELLA_HOME+"VERSION", "rb").read, Nutella.currentProject.config["nutella_version"]
+    should 'return the correct version of nutella as read from the project configuration file' do
+      assert_equal File.open("#{NUTELLA_HOME}VERSION", "rb").read, Nutella.current_project.config['nutella_version']
     end
     
     
     def teardown
-      FileUtils.rm_rf(NUTELLA_HOME + "test_project")
+      FileUtils.rm_rf "#{NUTELLA_HOME}test_project"
       Dir.chdir NUTELLA_HOME
     end
-    
+
   end
 end

data/test/config/test_runlist.rb

@@ -3,44 +3,52 @@ require 'helper'
 module Nutella
   
   class TestRunList < MiniTest::Test
-    
+
     def setup
-      Nutella.runlist.send(:removeRunListFile)
+      Nutella.runlist.send(:remove_file)
     end
     
-    should "return true if the list is empty" do
+    should 'return true if the list is empty' do
       assert Nutella.runlist.empty?
     end
 
-    should "return false if the list is not empty" do
-      refute_nil Nutella.runlist.add? "run1"
+    should 'return false if the list is not empty' do
+      refute_nil Nutella.runlist.add?( 'run1', '/path/to/my/run1')
       refute Nutella.runlist.empty?
     end
 
-    should "return empty array if the list is empty" do
-      assert_empty Nutella.runlist.to_a
+    should 'return empty array if the list is empty' do
+      assert_empty Nutella.runlist.runs_by_project
     end
 
-    should "return an array of runs in the list if not empty" do
-      refute_nil Nutella.runlist.add? "run1"
-      refute_nil Nutella.runlist.add? "run2"
-      assert_equal ["run1", "run2"], Nutella.runlist.to_a
+    should 'return an array of runs in the list if not empty' do
+      refute_nil Nutella.runlist.add?( 'run1', '/path/to/my/run1' )
+      refute_nil Nutella.runlist.add?( 'run2', '/path/to/my/run2' )
+      assert_equal %w{run1 run2}, Nutella.runlist.runs_by_project
     end
-    
-    should "return nil if trying to add the same element twice" do
-      refute_nil Nutella.runlist.add? "run1"
-      assert_nil Nutella.runlist.add? "run1"
+
+    should 'return false if trying to add the same element twice' do
+      assert Nutella.runlist.add?( 'run1', '/path/to/my/run1' )
+      refute Nutella.runlist.add?( 'run1', '/path/to/my/run1' )
     end
-    
-    should "return properly when deleting an item" do
-      refute_nil Nutella.runlist.add? "run1"
-      refute_nil Nutella.runlist.delete? "run1"
-      assert_nil Nutella.runlist.delete? "run1"
+
+    should 'return properly when deleting an item' do
+      assert Nutella.runlist.add?( 'run1', '/path/to/my/run1' )
+      assert Nutella.runlist.delete? 'run1'
+      refute Nutella.runlist.delete? 'run1'
+    end
+
+    should 'properly indicate if an item is in the list' do
+      refute Nutella.runlist.include? 'run1'
+      assert Nutella.runlist.add?( 'run1', '/path/to/my/run1' )
+      assert Nutella.runlist.include? 'run1'
+      assert Nutella.runlist.delete? 'run1'
+      refute Nutella.runlist.include? 'run1'
     end
     
     def teardown
-      Nutella.runlist.send(:removeRunListFile)
+      Nutella.runlist.send(:remove_file)
     end
-    
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -131,25 +131,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.6.3
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.6.3
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -287,10 +287,16 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- actors/main_interface/main_interface_bot.rb
+- actors/main_interface/public/index.html
+- actors/main_interface/startup
+- actors/main_interface/views/index.erb
+- actors/main_interface/views/not_found_404.erb
 - bin/nutella
 - lib/cli/nutella_cli.rb
 - lib/config/config.rb
-- lib/config/project.rb
+- lib/config/current_project.rb
+- lib/config/persisted_hash.rb
 - lib/config/runlist.rb
 - lib/core/command.rb
 - lib/core/commands/broker.rb
@@ -302,10 +308,8 @@ files:
 - lib/core/commands/start.rb
 - lib/core/commands/stop.rb
 - lib/core/nutella_core.rb
+- lib/core/run_command.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
@@ -316,7 +320,6 @@ files:
 - test/config/test_runlist.rb
 - test/helper.rb
 - test/logging/test_logging.rb
-- test/test_nutella_framework.rb
 homepage: https://github.com/nutella-framework/nutella_framework
 licenses:
 - MIT

data/lib/config/project.rb

@@ -1,53 +0,0 @@
-# handles current project files
-
-require 'singleton'
-require 'json'
-
-module Nutella
-  
-  class Project
-    
-    include Singleton
-    
-    # Check that the current directory is actually a nutella project
-    def exist?
-      @prj_dir = Dir.pwd
-      if File.exist?("#{@prj_dir}/conf/project.json")
-        conf = JSON.parse( IO.read("#{@prj_dir}/conf/project.json") )
-        if conf["nutella_version"].nil?
-          console.warn "The current directory is not a Nutella project"
-          return false
-        end
-      else
-        console.warn "The current directory is not a Nutella project"
-        return false
-      end
-      return true
-    end
-  
-    # Returns the value for an entry in the project configuration file
-    def config
-      @prj_dir = Dir.pwd
-      if File.exist? "#{@prj_dir}/conf/project.json" 
-        return ConfigHash.new "#{@prj_dir}/conf/project.json"
-        else
-          console.error "The current directory is not a Nutella project! Impossible to get project configuration file"
-        end
-    end
-    
-    # Returns current project directory
-    def dir
-      Dir.pwd
-    end
-    
-  end
-  
-  
-  def Nutella.currentProject
-    Project.instance
-  end
-  
-end
-
-
-

data/lib/extra/config.ru

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

data/lib/extra/interfaces_list.erubis

@@ -1,14 +0,0 @@
-<!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

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

data/test/test_nutella_framework.rb

@@ -1,31 +0,0 @@
-require 'helper'
-
-module Nutella
-  class TestNutellaFramework < MiniTest::Test
-    
-    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    
-    
-    
-    def teardown
-      Nutella.config.send(:removeConfigFile)
-    end
-    
-  end
-end
-  
-