nutella_framework 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25372f33a5d356902733e9c5c56e632cf7d03f00
-  data.tar.gz: 615a93c90ef6cba3206ee4f10e819bd3179c58fe
+  metadata.gz: 74e4ed28b0dc3798dd7c0d2316d4cc1b7b4b00dc
+  data.tar.gz: 8b1bd9b75e807c5e061720bdf21a2a367c969d6b
 SHA512:
-  metadata.gz: 12dd8ec3456123428114c3c9b1c32eb611ff51c46346a7e1d2cb834ce76bc9fcbcd0efa3b65423c73fe2ba9f4359a2e58df056cd0454a1254a6368771e210495
-  data.tar.gz: 605229b6c2f71386d74b7930d23b80ab89e55e52d0eb35293348029c036923d71f196cf4c4bb60166d272607bed4cfa9c96a22d8d0fb5a3bb819603836e5a2a7
+  metadata.gz: b7416f84abc2fcde32f84d728d41c9f229e194aadf07be54f77e54231b33f3359f932d1742259064a3e29987072836811cdd485b921fd59f4bff3cf22b34e7bd
+  data.tar.gz: 9e03507f6f0a018ad06c64ac5b29b02d6989b5fbebb323ff1edc588e464ddb51aa3351c21bf26fa0c7d5407edef08a77df1529ea2b9a59d3533f8aa919b60bae

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "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}
+  gem.summary = %Q{A framework to create and run classroom narratives}
+  gem.description = %Q{Nutella is a framework to create and run classroom narratives}
   gem.email = "tebemis@gmail.com"
   gem.authors = ["Alessandro Gnoli"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/config/config.rb

@@ -5,7 +5,7 @@ module Nutella
   # Calling this method (Nutella.config) simply returns and instance of
   # PersistedHash linked to file config.json in nutella home directory
   def Nutella.config
-    PersistedHash.new("#{File.dirname(__FILE__)}/../../config.json")
+    PersistedHash.new( "#{ENV['HOME']}/.nutella/config.json" )
   end
   
 end

data/lib/config/persisted_hash.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'fileutils'
 
 module Nutella
 
@@ -90,6 +91,8 @@ module Nutella
     private
 
     def store_hash(hash)
+      dirname = File.dirname(@config_file)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
       File.open(@config_file, 'w+') do |f|
         f.write(JSON.pretty_generate(hash))
       end

data/lib/config/runlist.rb

@@ -26,7 +26,7 @@ module Nutella
   # Calling this method (Nutella.runlist) simply returns and instance of
   # RunListHash linked to file runlist.json in the nutella home directory
   def Nutella.runlist
-    RunListHash.new( "#{File.dirname(__FILE__)}/../../runlist.json" )
+    RunListHash.new( "#{ENV['HOME']}/.nutella/runlist.json" )
   end
   
 end

data/lib/core/commands/checkup.rb

@@ -35,12 +35,13 @@ module Nutella
   
     def install_local_broker
       # Clone, cd and npm install
-      out1 = system "git clone git://github.com/mcollina/mosca.git #{Nutella.config['broker_dir']} > /dev/null 2>&1"
+      broker_version = 'v0.28.1'
+      out1 = system "git clone -b #{broker_version} --depth 1 git://github.com/mcollina/mosca.git #{Nutella.config['broker_dir']} > /dev/null 2>&1"
       Dir.chdir(Nutella.config['broker_dir'])
       out2 = system 'npm install > /dev/null 2>&1'
     
       # Add startup script and make it executable
-      File.open('startup', 'w') { |file| file.write("#!/bin/sh\n\nBASEDIR=$(dirname $0)\n$BASEDIR/bin/mosca --http-port 1884 &\necho $! > $BASEDIR/bin/.pid\n") }
+      File.open('startup', 'w') { |file| file.write("#!/bin/sh\n\nBASEDIR=$(dirname $0)\n$BASEDIR/bin/mosca --http-port 1884 > /dev/null 2>&1 &\necho $! > $BASEDIR/bin/.pid\n") }
       File.chmod( 0755, 'startup' )
     
       # Write configuration into config.json

data/lib/core/commands/install.rb

@@ -47,8 +47,13 @@ module Nutella
   
   
     def is_template_a_git_repo?( template_git_url )
+      return false unless template_git_url =~ /\A#{URI::regexp(['http', 'https'])}\z/
       begin
-        tmp_dest_dir = template_git_url[template_git_url.rindex('/')+1 .. template_git_url.length-5]
+        if template_git_url.end_with? '.git'
+          tmp_dest_dir = template_git_url[template_git_url.rindex('/')+1 .. template_git_url.length-5]
+        else
+          tmp_dest_dir = template_git_url[template_git_url.rindex('/')+1 .. template_git_url.length]
+        end
         clone_template_from_repo_to( template_git_url, tmp_dest_dir )
         return validate_template "#{Nutella.config['tmp_dir']}/#{tmp_dest_dir}"
       rescue

data/lib/core/commands/new.rb

@@ -46,7 +46,7 @@ module Nutella
       config_file_hash = {
         :name => cur_prj_dir,
         :version => '0.1.0',
-        :nutella_version => File.open("#{NUTELLA_HOME}VERSION", 'rb').read,
+        :nutella_version => File.open("#{Nutella.config['nutella_home']}VERSION", 'rb').read,
         :type => 'project',
         :description => 'A quick description of your project'
       }

data/lib/core/commands/start.rb

@@ -38,7 +38,7 @@ module Nutella
 
       # Check that there is at least a regular bot that will be started,
       # otherwise it makes no sense to create a run
-      if run_bots_list_minus_project_bots(cur_prj_dir, params).empty? && project_bots_started?
+      if bots_list_wo_project(cur_prj_dir, params).empty? && project_bots_started?
         console.warn "Run #{run} not created: your project bots are already started and you specified no regular bots exclusively for this run"
         return
       end
@@ -48,7 +48,7 @@ module Nutella
       return unless add_to_run_list( run_id, cur_prj_dir )
 
       # If running on the internal broker, start it if needed
-      if Nutella.config['broker'] == 'localhost'
+      if running_on_internal_broker?
         return unless start_internal_broker
       end
 
@@ -70,7 +70,7 @@ module Nutella
     private
 
 
-    def run_bots_list_minus_project_bots( cur_prj_dir, params )
+    def bots_list_wo_project( cur_prj_dir, params )
       # Fetch the list of project bots
       project_bots_list = Nutella.current_project.config['project_bots']
       run_bots_list = run_actors_list("#{cur_prj_dir}/bots/")
@@ -90,7 +90,7 @@ module Nutella
     def project_bots_started?
       project_name = Nutella.current_project.config['name']
       tmux_session_name = "#{project_name}-project-bots"
-      return Tmux.session_exist? tmux_session_name
+      Tmux.session_exist? tmux_session_name
     end
 
 
@@ -186,8 +186,8 @@ module Nutella
       # Actor is not running and there is no pid file so we try to start
       # the actor and create a new pid file. Note that the pid file is created by
       # the startup script!
-      nutella_config_file = "#{Nutella.config['nutella_home']}config.json"
-      runs_list_file = "#{Nutella.config['nutella_home']}runlist.json"
+      nutella_config_file = "#{Nutella.config['config_dir']}config.json"
+      runs_list_file = "#{Nutella.config['config_dir']}runlist.json"
       if nutella_config_file==nil || runs_list_file==nil
         return false
       end
@@ -231,7 +231,7 @@ module Nutella
       # Fetch bots dir
       bots_dir = "#{cur_prj_dir}/bots/"
       # Start the appropriate bots
-      run_bots_list_minus_project_bots( cur_prj_dir, params ).each { |bot| start_bot(bots_dir, bot, tmux) }
+      bots_list_wo_project( cur_prj_dir, params ).each { |bot| start_bot(bots_dir, bot, tmux) }
       true
     end
 
@@ -255,7 +255,7 @@ module Nutella
       unless project_bots_list.nil? || project_bots_list.empty?
         console.success "Do `tmux attach-session -t #{tmux_session_name}` to monitor your project bots."
       end
-      if run_bots_list_minus_project_bots(cur_prj_dir, params).empty?
+      if bots_list_wo_project(cur_prj_dir, params).empty?
         console.success 'No tmux session was created for this run because you specified no regular bots exclusively for this run'
       else
         console.success "Do `tmux attach-session -t #{run_id}` to monitor your bots."

data/lib/core/commands/stop.rb

@@ -29,7 +29,7 @@ module Nutella
       end
 
       # If running on the internal broker, stop it if needed
-      if Nutella.runlist.empty? and Nutella.config['broker'] == 'localhost'
+      if Nutella.runlist.empty? and running_on_internal_broker?
         stop_broker
       end
 

data/lib/core/nutella_core.rb

@@ -29,14 +29,16 @@ module Nutella
     end
     
     # This method initializes the nutella configuration file (config.json) with:
-    # - NUTELLA_HOME: the directory nutella is installed in
+    # - nutella_home: the directory nutella is installed in
     # - tmp_dir: temporary directory used when installing remote templates
+    # - config_dir: directory where the configuration files are stored in
     # - broker_dir: directory where the local broker is installed in
     # - main_interface_port: the port used to serve interfaces
     def Nutella.init
       Nutella.config['nutella_home'] = NUTELLA_HOME
       Nutella.config['tmp_dir'] = "#{NUTELLA_HOME}.tmp/"
-      Nutella.config['broker_dir'] = "#{NUTELLA_HOME}broker/"
+      Nutella.config['config_dir'] = "#{ENV['HOME']}/.nutella/"
+      Nutella.config['broker_dir'] = "#{Nutella.config['config_dir']}broker/"
       Nutella.config['main_interface_port'] = 57880
     end
 

data/lib/core/run_command.rb

@@ -93,6 +93,14 @@ module Nutella
     end
 
 
+    # If the broker is set to one of the current ip addresses,
+    # localhost or 127.0.0.1 return true.
+    def running_on_internal_broker?
+      broker = Nutella.config['broker']
+      Socket.ip_address_list.find_all{|a| a.ipv4? }.map{|a| a.ip_address}.include?(broker) || broker == 'localhost' || broker == '127.0.0.1'
+    end
+
+
   end
 
 end

data/lib/nutella_framework.rb

@@ -7,6 +7,7 @@ require 'config/current_project'
 require 'cli/nutella_cli'
 
 module Nutella
+  # Initialize nutella home
   home_dir = File.dirname(__FILE__)
   NUTELLA_HOME = home_dir[0..-4]
 

data/nutella_framework.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nutella_framework 0.3.0 ruby lib
+# stub: nutella_framework 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.3.0"
+  s.version = "0.3.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-01-29"
-  s.description = "Nutella is a framework to build and run \"Internet of Things\"-like learning applications"
+  s.date = "2015-02-26"
+  s.description = "Nutella is a framework to create and run classroom narratives"
   s.email = "tebemis@gmail.com"
   s.executables = ["nutella"]
   s.extra_rdoc_files = [
@@ -70,8 +70,8 @@ Gem::Specification.new do |s|
   ]
   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"
+  s.rubygems_version = "2.4.3"
+  s.summary = "A framework to create and run classroom narratives"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -270,8 +270,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Nutella is a framework to build and run "Internet of Things"-like learning
-  applications
+description: Nutella is a framework to create and run classroom narratives
 email: tebemis@gmail.com
 executables:
 - nutella
@@ -347,8 +346,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: IoT-like learning applications framework
+summary: A framework to create and run classroom narratives
 test_files: []