RubyGems - nutella_framework - Versions diffs - 0.3.1 → 0.4.0 - Mend

nutella_framework 0.3.1 → 0.4.0

Files changed (61) hide show

checksums.yaml +4 -4
data/Gemfile +3 -0
data/README.md +3 -4
data/VERSION +1 -1
data/data/startup +3 -3
data/framework_components/example_framework_interface/dandelion-flowers-card.jpg +0 -0
data/framework_components/example_framework_interface/index.html +18 -0
data/framework_components/main_interface/main_interface_bot.rb +183 -0
data/framework_components/main_interface/public/index.html +54 -0
data/framework_components/main_interface/views/index.erb +63 -0
data/framework_components/order.json.example +6 -0
data/framework_components/runs_list_bot/app_runs_list_bot.rb +15 -0
data/lib/{core/commands → commands}/broker.rb +2 -2
data/lib/{core/commands → commands}/checkup.rb +2 -2
data/lib/commands/compile.rb +13 -0
data/lib/commands/dependencies.rb +13 -0
data/lib/commands/help.rb +35 -0
data/lib/{core/commands → commands}/install.rb +19 -15
data/lib/commands/meta/command.rb +19 -0
data/lib/commands/meta/run_command.rb +114 -0
data/lib/{core → commands/meta}/template_command.rb +1 -1
data/lib/commands/new.rb +60 -0
data/lib/commands/runs.rb +54 -0
data/lib/commands/start.rb +321 -0
data/lib/commands/stop.rb +101 -0
data/lib/{core/commands → commands}/template.rb +59 -39
data/lib/config/current_app_utils.rb +51 -0
data/lib/config/persisted_hash.rb +14 -12
data/lib/config/runlist.rb +116 -16
data/lib/{cli → core}/nutella_cli.rb +1 -1
data/lib/core/nutella_core.rb +2 -6
data/lib/nutella_framework.rb +5 -3
data/lib/nutella_lib_framework/api.rb +333 -0
data/lib/tmux/tmux.rb +76 -0
data/nutella_framework.gemspec +42 -29
data/test/commands/test_cmd_cli_params_parsing.rb +56 -0
data/test/commands/test_command_template.rb +31 -0
data/test/config/test_current_app_utils.rb +34 -0
data/test/config/test_persisted_hash.rb +48 -0
data/test/config/test_runlist.rb +15 -23
data/test/framework_apis/test_framework_api.rb +74 -0
metadata +74 -27
data/actors/main_interface/main_interface_bot.rb +0 -163
data/actors/main_interface/public/index.html +0 -51
data/actors/main_interface/views/index.erb +0 -45
data/lib/config/current_project.rb +0 -58
data/lib/core/command.rb +0 -12
data/lib/core/commands/compile.rb +0 -21
data/lib/core/commands/dependencies.rb +0 -21
data/lib/core/commands/help.rb +0 -28
data/lib/core/commands/new.rb +0 -60
data/lib/core/commands/runs.rb +0 -52
data/lib/core/commands/start.rb +0 -271
data/lib/core/commands/stop.rb +0 -100
data/lib/core/run_command.rb +0 -106
data/lib/core/tmux.rb +0 -38
data/test/config/test_config.rb +0 -48
data/test/config/test_project.rb +0 -34
data/test/test_run_command.rb +0 -54
/data/{actors → framework_components}/main_interface/startup +0 -0
/data/{actors → framework_components}/main_interface/views/not_found_404.erb +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e4ed28b0dc3798dd7c0d2316d4cc1b7b4b00dc
-  data.tar.gz: 8b1bd9b75e807c5e061720bdf21a2a367c969d6b
+  metadata.gz: 98a1d74bc599d78623959deb2d80d7ef4b5527b0
+  data.tar.gz: 229db1d35c9f3000f6510fa44e075878e21b7f07
 SHA512:
-  metadata.gz: b7416f84abc2fcde32f84d728d41c9f229e194aadf07be54f77e54231b33f3359f932d1742259064a3e29987072836811cdd485b921fd59f4bff3cf22b34e7bd
-  data.tar.gz: 9e03507f6f0a018ad06c64ac5b29b02d6989b5fbebb323ff1edc588e464ddb51aa3351c21bf26fa0c7d5407edef08a77df1529ea2b9a59d3533f8aa919b60bae
+  metadata.gz: 0673b2e12cd08dd77e2359b3aa05f7d0d9d6b36e415de55f0df13ef201887fd5c1e0303e695bef502cc2b877df6b72a4aa405d358375ff0498635a4178337322
+  data.tar.gz: 274b0ea11c7671bb8cb42f1d1179026f5a6cfb04d3af52a60d91b3e3a8d97d804457b248203733b821cc2b75bd7ff390c2e1089822627a5525bbea7a8640ae74

data/Gemfile CHANGED Viewed

@@ -5,8 +5,10 @@ gem 'semantic', '~> 1.3', '>=1.3'
 gem 'logging', '~> 1.8', '>=1.8.2'
 gem 'git', '~> 1.2', '>=1.2.8'
 gem 'sinatra', '~>1.4.5', '>=1.4.5'
+gem 'thin', '~>1.6.3', '>=1.6.3'
 gem 'nokogiri', '~>1.6.3', '>=1.6.3'
 gem 'slop', '~>4.0.0', '>=4.0.0'
+gem 'nutella_lib','~>0.4.0', '>=0.4.0'
 group :development do
@@ -20,4 +22,5 @@ end
 group :test do
   gem 'rake'
+  gem 'fakefs', '~> 0.6.7', '>= 0.6'
 end

data/README.md CHANGED Viewed

@@ -1,7 +1,6 @@
 [![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)
+[![Build Status](https://travis-ci.org/nutella-framework/nutella_framework.svg?branch=master)](https://travis-ci.org/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
@@ -34,9 +33,9 @@ Congratulations! Nutella is ready to use!
 # Where next?
-If you already have a projects you want to tinker with (like [RoomQuake](https://github.com/ltg-uic/roomquake)) simply checkout the project to a local folder, `cd /to/my/local/folder` and start tinkering away. Not sure what to do? Check out our [nutella Command Line Tool man page](https://github.com/nutella-framework/nutella_framework/wiki/Nutella-Command-Line-Interface).
+If you already have an application you want to tinker with (like [RoomQuake](https://github.com/ltg-uic/roomquake)) simply checkout the application to a local folder, `cd /to/my/local/folder` and start tinkering away. Not sure what to do? Check out our [nutella Command Line Tool man page](https://github.com/nutella-framework/nutella_framework/wiki/Nutella-Command-Line-Interface).
-If you want to create your own project, check out the [new project tutorial](https://github.com/nutella-framework/nutella_framework/wiki/New-project-tutorial).
+If you want to create your own application, check out the [new app tutorial](https://github.com/nutella-framework/nutella_framework/wiki/New-application-tutorial).
 # Contributing

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.3.1
1	+ 0.4.0

data/data/startup CHANGED Viewed

@@ -6,8 +6,8 @@
 BASEDIR=$(dirname $0)
-# Remember that nutella passes the run_id and the broker name as
-# command line parameters that you can access via $1 and $2 respectively.
+# Remember: nutella passes the `broker address`, the `app_id` and the `run_id`
+# as command line parameters that you can access via $1, $2 and $3 respectively.
 # Start your bot here with something like (example in ruby):
-# ruby $BASEDIR/my_bot.rb $1 $2
+# ruby $BASEDIR/my_bot.rb $1 $2 $3

data/framework_components/example_framework_interface/dandelion-flowers-card.jpg ADDED Viewed

Binary file

data/framework_components/example_framework_interface/index.html ADDED Viewed

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title>Example framework interface</title>
+    <!-- The description of this interfaces here -->
+    <meta name="description" content="This is an example framework interface">
+</head>
+<body>
+<h1>Example framework interface</h1>
+<p>This is an example of a framework interface. It really doesn't belong here but for now this
+    is ok. Once we'll have real framework interfaces this is going to be be moved to a template.
+</p>
+<p>And just to make sure we are loading not just the index, here is a picture of dandelions</p>
+<img src="dandelion-flowers-card.jpg" width="500">
+</body>
+</html>

data/framework_components/main_interface/main_interface_bot.rb ADDED Viewed

@@ -0,0 +1,183 @@
+require 'json'
+require 'sinatra'
+require 'nokogiri'
+# Configuration file and runlist (runlist as global)
+config_file = ARGV[0]
+$runlist_file = ARGV[1]
+# Try to parse the both config file and runlist and terminate if we can't
+begin
+  config_h = JSON.parse(IO.read(config_file))
+  JSON.parse(IO.read($runlist_file))
+rescue
+  # something went wrong
+  abort 'Impossible to parse configuration and/or runlist files!'
+end
+# Set Sinatra to run in production mode
+set :environment, :production
+# Set Sinatra's port to nutella's main_interface_port
+set :port, config_h['main_interface_port']
+# Display the form to input the app_id and run_id
+get '/' do
+  send_file 'public/index.html'
+end
+# Redirect if there is no slash after the run_id
+get '/:app_id/:run_id' do
+  redirect "#{request.url}/"
+end
+# Renders the interfaces summary page for the run
+get '/:app_id/:run_id/' do
+  # Parse the app_id and run_id from URL and extract the run path from runlist.json
+  @app_id = params[:app_id]
+  @run_id = params[:run_id]
+  @app_path = get_app_path @app_id
+  # If there is no app with this name, render error page
+  return erb( :not_found_404, :locals => {:not_found_type => 'run'} ) if @app_path.nil?
+  # To generate the 'index.erb' we need to load a bunch of details
+  # (folder, title/name, description) for each interface
+  @interfaces = load_interfaces_details @app_path
+  @framework_interfaces = load_framework_interfaces
+  # Render the interfaces summary page
+  erb :index
+end
+# Redirect if there is a slash after the interface
+get '/:app_id/:run_id/:interface/' do
+  redirect "#{request.url[0..-2]}"
+end
+# Serves the index.html file for each individual interface augmented with nutella query string parameters
+get '/:app_id/:run_id/runs/:interface' do
+  # Parse the app_id and run_id from URL and extract the run path from runlist.json
+  app_id = params[:app_id]
+  run_id = params[:run_id]
+  interface = params[:interface]
+  app_path = get_app_path app_id
+  # Compose the path of interface index file passing the nutella parameters
+  index_file_path = "#{app_path}/interfaces/#{interface}/index.html"
+  # If the index file doesn't exist, render error page
+  return erb( :not_found_404, :locals => {:not_found_type => 'idx'} ) unless File.exist? index_file_path
+  # If the index file exists, compose query string and redirect
+  index_with_query_url = "#{request.path}/index.html?broker=#{config_h['broker']}&app_id=#{app_id}&run_id=#{run_id}"
+  redirect index_with_query_url
+end
+# Serves the files contained in each interface folder
+get '/:app_id/:run_id/runs/:interface/*' do
+  # Parse the run_id, the interface name and the file_path from URL
+  app_id = params[:app_id]
+  interface = params[:interface]
+  relative_file_path = params[:splat][0]
+  app_path = get_app_path app_id
+  # Compose the path of the file we are trying to serve
+  file_path = "#{app_path}/interfaces/#{interface}/#{relative_file_path}"
+  # If the file we are trying to serve doesn't exist, render error page
+  return erb( :not_found_404, :locals => {:not_found_type => 'file'} ) unless File.exist? file_path
+  # If the file exists, render it
+  send_file file_path
+end
+# Serve the index file for a framework interface passing the nutella parameters
+get '/:app_id/:run_id/framework/:interface' do
+  app_id = params[:app_id]
+  run_id = params[:run_id]
+  # Filesystem path to the index file
+  index_file_path = "#{File.dirname(__FILE__)}/../#{params[:interface]}/index.html"
+  # If the index file doesn't exist, render error page
+  return erb( :not_found_404, :locals => {:not_found_type => 'idx'} ) unless File.exist? index_file_path
+  # If the index file exists, compose query string and redirect
+  index_with_query_url = "#{request.path}/index.html?broker=#{config_h['broker']}&app_id=#{app_id}&run_id=#{run_id}"
+  redirect index_with_query_url
+end
+# Serves the files contained in each framework interface folder
+get '/:app_id/:run_id/framework/:interface/*' do
+  # Fetch the relative file path
+  relative_file_path = params[:splat][0]
+  # Compose the path of the file we are trying to serve
+  file_path = "#{File.dirname(__FILE__)}/../#{params[:interface]}/#{relative_file_path}"
+  # If the file we are trying to serve doesn't exist, render error page
+  return erb( :not_found_404, :locals => {:not_found_type => 'file'} ) unless File.exist? file_path
+  # If the file exists, render it
+  send_file file_path
+end
+# Utility functions -------------------------------------------------------------------------
+# Utility function:
+# Gets the path associated with a certain application
+def get_app_path( app_id )
+  begin
+    runs_h = JSON.parse(IO.read($runlist_file))
+    runs_h[app_id]['path']
+  rescue
+    nil
+  end
+end
+# Utility function:
+# Loads all the details for all interfaces and stores them into an array of hashes
+def load_interfaces_details( app_path )
+  interfaces = Array.new
+  interfaces_path = "#{app_path}/interfaces/"
+  Dir.entries(interfaces_path).select {|entry| File.directory?(File.join(interfaces_path, entry)) && !(entry =='.' || entry == '..') }.each do |iface_dir|
+    interfaces.push extract_interface_info( interfaces_path, iface_dir )
+  end
+  interfaces
+end
+def load_framework_interfaces
+  interfaces = Array.new
+  components_directory = "#{File.dirname(__FILE__)}/../"
+  Dir.entries(components_directory).select {|entry| File.directory?(File.join(components_directory, entry)) && !(entry =='.' || entry == '..') }.each do |iface_dir|
+    interfaces.push(extract_interface_info( components_directory, iface_dir)) if File.exist?("#{components_directory}#{iface_dir}/index.html")
+  end
+  interfaces
+end
+# Utility function:
+# Extracts name, description and folder for a single interface from it's index.html
+def extract_interface_info( interfaces_path, iface_dir )
+  iface_properties = Hash.new
+  index_path = "#{interfaces_path}#{iface_dir}/index.html"
+  unless File.exist? index_path
+    iface_properties[:name] = iface_dir
+    iface_properties[:description] = 'My designer was a bit lazy and didn\'t include an index.html file in the main interface directory :('
+    return iface_properties
+  end
+  # If file exists, parse it and extract info
+  f = File.open index_path
+  doc = Nokogiri::HTML f
+  f.close
+  # Extract interface name from title
+  iface_properties[:name] = (doc.css('title').empty? || doc.css('title').text.empty? ) ? iface_dir : doc.css('title').text
+  # Extract description from meta description tag
+  if doc.css("meta[name='description']").empty?
+    iface_properties[:description] = 'My designer was a bit lazy and didn\'t include a &lt;meta name="description" content="Description of this interface"&gt; tag in the index.html file :('
+  else
+    if doc.css("meta[name='description']").attribute('content').nil?
+      iface_properties[:description] = 'There was no attribute content in &lt;meta name="description" content="Description of this interface"&gt; tag in the index.html file :('
+    else
+      iface_properties[:description] = doc.css("meta[name='description']").attribute('content').text
+    end
+  end
+  # Extract URL from interface dir
+  iface_properties[:url] = iface_dir
+  iface_properties
+end

data/framework_components/main_interface/public/index.html ADDED Viewed

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Welcome to nutella</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
+    <style type="text/css">
+        div {
+            margin-top: 4em;
+            text-align: center;
+            font-size: 3em;
+        }
+        .form-control {
+            height: 50px;
+            width: 20%;
+            text-align: center;
+            font-size: .7em;
+            display: inline-block;
+        }
+        .center form {
+            display:inline-block;
+        }
+    </style>
+</head>
+<body>
+<!-- Content -->
+<div>
+    <p>What is your app id?
+        <input id="app_id_input" type="text" value="" class="form-control" autofocus>
+    </p>
+    <br />
+    <p>What is your run id?
+        <input id="run_id_input" type="text" value="" class="form-control" >
+    </p>
+</div>
+<!-- Scripts -->
+<script>
+    app_id_el = document.getElementById('app_id_input');
+    run_id_el = document.getElementById('run_id_input');
+    run_id_el.addEventListener('change', function() {
+        var url = location.href
+        if (url.substr(url.length - 1)=="/")
+            window.location = url + app_id_el.value + '/' + this.value + '/';
+        else
+            window.location = url + '/' + app_id_el.value + '/'+ this.value + '/';
+    });
+</script>
+</body>
+</html>

data/framework_components/main_interface/views/index.erb ADDED Viewed

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title><%= @app_id %> interfaces</title>
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
+  <style type="text/css">
+      .row {
+          margin-bottom: 20px;
+      }
+  </style>
+</head>
+<body>
+<!-- Content -->
+<div class="container">
+  <!-- Title and prompt -->
+  <div class="page-header">
+    <% if @run_id == 'default' %>
+        <h1>Welcome to <em><%= @app_id %></em></h1>
+    <% else %>
+        <h1>Welcome to <em><%= @app_id %></em>, run <em><%= @run_id %></em></h1>
+    <% end %>
+    <p class="lead">Use the buttons below to launch a specific interface</p>
+  </div>
+  <!-- Run level interfaces -->
+  <% @interfaces.each do |i| %>
+      <div class="row">
+        <div class="col-xs-1 col-sm-1 col-lg-1"><a href="runs/<%= i[:url] %>" target="_blank" type="button" class="btn btn-danger">Launch!</a></div>
+        <div class="col-xs-2 col-sm-2 col-lg-2 text-center"><strong><%= i[:name] %></strong></div>
+        <div class="col-xs-9 col-sm-9 col-lg-9"><%= i[:description] %></div>
+      </div>
+  <% end %>
+  <!-- Framework level interfaces -->
+  <hr>
+  <div class="row">
+    <h2>Framework level interfaces</h2>
+  </div>
+  <% @framework_interfaces.each do |i| %>
+      <div class="row">
+        <div class="col-xs-1 col-sm-1 col-lg-1"><a href="framework/<%= i[:url] %>" target="_blank" type="button" class="btn btn-danger">Launch!</a></div>
+        <div class="col-xs-2 col-sm-2 col-lg-2 text-center"><strong><%= i[:name] %></strong></div>
+        <div class="col-xs-9 col-sm-9 col-lg-9"><%= i[:description] %></div>
+      </div>
+  <% end %>
+</div>
+<!-- Scripts -->
+<script>
+</script>
+</body>
+</html>

data/framework_components/order.json.example ADDED Viewed

@@ -0,0 +1,6 @@
+// The file order.json contains an array of components name.
+// If this file exists, nutella will start the framework components in that order
+[
+  "runs_list_bot",
+  "main_interface"
+]

data/framework_components/runs_list_bot/app_runs_list_bot.rb ADDED Viewed

@@ -0,0 +1,15 @@
+require 'nutella_lib'
+# This needs to be initialized as framework component like so:
+# nutella.init_as_app_component('localhost', 'app_runs_list_bot')
+nutella.init('localhost', 'my_app_id', 'no_run_id', 'app_runs_list_bot')
+# Listen for runs_list requests (done by app components when they connect)
+nutella.net.app.handle_requests('app_runs_list', lambda do |req, from|
+  from['app_id'] # Use this info to fetch the appropriate runs
+  ['run_1', 'run_2', 'run_3'] # Return an array of names!
+end)
+# Whenever the list is updated, fire an update to the right app
+nutella.net.listen

data/lib/{core/commands → commands}/broker.rb RENAMED Viewed

@@ -1,4 +1,4 @@
-require 'core/command'
+require 'commands/meta/command'
 require 'socket'
 module Nutella
@@ -36,7 +36,7 @@ module Nutella
     def change_broker( new_broker )
       # Check that there are no runs hinging on this broker
       unless Nutella.runlist.empty?
-        console.warn 'You are currently running some projects on this broker. You can\'t change the broker while running.'
+        console.warn 'You are currently running some nutella applications on this broker. You can\'t change the broker while running.'
         return
       end
       # Try to parse the hostname and switch to the new broker

data/lib/{core/commands → commands}/checkup.rb RENAMED Viewed

@@ -1,9 +1,9 @@
-require 'core/command'
+require 'commands/meta/command'
 require 'semantic'
 module Nutella
   class Checkup < Command
-    @description = 'Checks that all the dependencies are installed and prepares nutella to run'
+    @description = 'Checks that all the framework dependencies are installed'
     def run( args=nil )

data/lib/commands/compile.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'commands/meta/run_command'
+require 'tmux/tmux'
+module Nutella
+  class Compile < RunCommand
+    @description = 'Compiles all the components that need compilation in the application'
+    def run(args=nil)
+      compile_and_dependencies 'compile', 'Compiling', 'components compiled'
+    end
+  end
+end

data/lib/commands/dependencies.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'commands/meta/command'
+require 'tmux/tmux'
+module Nutella
+  class Dependencies < RunCommand
+    @description = 'Installs the dependencies for all components in the application'
+    def run(args=nil)
+      compile_and_dependencies 'dependencies', 'Installing dependencies for', 'dependencies installed'
+    end
+  end
+end

data/lib/commands/help.rb ADDED Viewed

@@ -0,0 +1,35 @@
+require 'commands/meta/command'
+module Nutella
+  class Help < Command
+    @description = 'Displays what every command does and how to use it'
+    def run(args=nil)
+      message=''
+      Dir["#{File.dirname(__FILE__)}/*.rb"].each do |file|
+        message += add_cmd_help(file)
+      end
+      console.info message
+      console.success 'For more details on individual commands, see https://github.com/nutella-framework/nutella_framework/wiki/Nutella-Command-Line-Interface'
+    end
+    private
+    def add_cmd_help(file)
+      command = File.basename(file, File.extname(file))
+      if command.length > 7
+        message = "#{command}\t"
+      else
+        message = "#{command}\t\t"
+      end
+      message += Object::const_get("Nutella::#{command.capitalize}").description
+      message += "\n"
+      message
+    end
+  end
+end

data/lib/{core/commands → commands}/install.rb RENAMED Viewed

@@ -1,15 +1,19 @@
-require 'core/template_command'
+require 'commands/meta/template_command'
 require 'git'
 require 'net/http'
 module Nutella
   class Install < TemplateCommand
-    @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 application'
     def run(args=nil)
-      # Is current directory a nutella prj?
-      return unless Nutella.current_project.exist?
+      # If the current directory is not a nutella application, return
+      unless Nutella.current_app.exist?
+        console.warn 'The current directory is not a nutella application'
+        return
+      end
       # Check args
       if args.empty?
@@ -19,16 +23,16 @@ module Nutella
       template = args[0]
       destination_dir = args.length==2 ? args[1] : nil
-      # Extract project directory
-      prj_dir = Nutella.current_project.dir
+      # Extract application directory
+      app_path =Dir.pwd
       # What kind of template are we handling?
       if is_template_a_local_dir? template
-        add_local_template( template, template, prj_dir, destination_dir )
+        add_local_template( template, template, app_path, destination_dir )
       elsif is_template_a_git_repo? template
-        add_remote_template( template, prj_dir, destination_dir)
+        add_remote_template( template, app_path, destination_dir)
       elsif is_template_in_db? template
-        add_central_template( template, prj_dir, destination_dir)
+        add_central_template( template, app_path, destination_dir)
       else
         console.warn 'The specified template is not a valid nutella template'
       end
@@ -55,7 +59,7 @@ module Nutella
           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}"
+        return validate_template "#{Nutella::NUTELLA_TMP}/#{tmp_dest_dir}"
       rescue
         return false
       end
@@ -106,21 +110,21 @@ module Nutella
     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}"
+      template_dir = "#{Nutella::NUTELLA_TMP}/#{template_name}"
       add_local_template( template, template_dir, prj_dir, dest_dir )
     end
     def add_central_template( template_name, prj_dir, dest_dir)
-      template_dir = "#{Nutella.config['tmp_dir']}/#{template_name}"
+      template_dir = "#{Nutella::NUTELLA_TMP}/#{template_name}"
       add_local_template( template_name, template_dir, prj_dir, dest_dir )
     end
     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'])
+      Dir.mkdir Nutella::NUTELLA_TMP  unless Dir.exists? Nutella::NUTELLA_TMP
+      Git.clone(template, dest_dir, :path => Nutella::NUTELLA_TMP)
     end
@@ -132,7 +136,7 @@ module Nutella
     def clean_tmp_dir
-      FileUtils.rm_rf "#{Nutella.config['tmp_dir']}"
+      FileUtils.rm_rf "#{Nutella::NUTELLA_TMP}"
     end
   end

data/lib/commands/meta/command.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module Nutella
+  # Nutella command
+  class Command
+    class << self;
+      attr_accessor :description
+    end
+    # Commands overload this method to execute
+    def run( args=nil )
+      console.error 'Running the generic command!!! WAT? https://www.destroyallsoftware.com/talks/wat'
+    end
+  end
+end