nutella_framework 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ef8c583dc652a1bba99dddd436a49fd56073fe
-  data.tar.gz: c622511fa7132362a60442c3d41c9ade82e6f215
+  metadata.gz: 9172faccd58a12b7b71e6b98b23bdabae149cba2
+  data.tar.gz: 41ddccdf48c2216534ca3ac1fc6b8a8e69c6217b
 SHA512:
-  metadata.gz: 3e99c1a182712c8f8440741c19e098ca4928a09dfea595645dc6669da4801197b94d6d5691451c73972cd0e617c283bea1c026d191e08ac37c0c528386bfcbf5
-  data.tar.gz: 526168dbc44d62bb1ae64b5bfd4c3739f401bb7f579e59d094cb63bf8a9c9970e5848e861822efacb0ec199e456b948508c95c79cfb694648592e7b29ddbc39f
+  metadata.gz: 8b6091ed6ab787a2dedcf3ea31c124dcda6ba528d2d23a9e2a1f42b18ae28d3bf54ae309a64ea64a8442a6bdf1d21980292aa080a50759ebab27b1d16fac36f0
+  data.tar.gz: 49da081ac45ecd83adb657cc5f7abe35ed99a75a9a35bdc6cd7fa5e12e1c7d2dd5d1e95bdf4f740a74196aa772a1a55992c9c6d58f36e2a17344651fe9822016

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem 'semantic', '~> 1.4'
 gem 'logging', '~> 1.8'
@@ -7,7 +7,7 @@ gem 'sinatra', '~>1.4'
 gem 'thin', '~>1.6'
 gem 'nokogiri', '~>1.6'
 gem 'slop', '~>4.0'
-gem 'nutella_lib','~>0.4.10'
+gem 'nutella_lib','~>0.4', '>=0.4.11'
 
 
 group :development do

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/lib/commands/dependencies.rb

@@ -1,4 +1,4 @@
-require 'commands/meta/command'
+require 'commands/meta/run_command'
 require 'tmux/tmux'
 
 module Nutella

data/lib/commands/start.rb

@@ -22,7 +22,7 @@ module Nutella
 
       app_id, app_path = fetch_app_details
 
-      if no_bot_to_start(app_id, app_path, params)
+      if no_app_bot_to_start app_id, app_path, params
         console.warn "Run #{run} not created: your application bots are already started and you specified no regular bots exclusively for this run"
         return
       end
@@ -65,7 +65,7 @@ module Nutella
 
     # Returns true if both the list of run level bots is empty and the app bots
     # have been started already
-    def no_bot_to_start(app_id, app_path, params)
+    def no_app_bot_to_start(app_id, app_path, params)
       ComponentsList.run_level_bots_list(app_path, params).empty? && app_bots_started?(app_id)
     end
 
@@ -106,7 +106,7 @@ module Nutella
 
     def print_confirmation( run_id, params, app_id, app_path )
       # If there are no run-level bots to start, do not create the run and error out
-      if ComponentsList.run_level_bots_list(app_path, params).empty?
+      if ComponentsList.run_level_bots_list(app_path, params).empty? && !Nutella.runlist.app_has_no_bots(app_id)
         console.warn 'This run doesn\'t seem to have any components. No run was created.'
         return
       end
@@ -123,11 +123,16 @@ module Nutella
       unless app_bots_list.nil? || app_bots_list.empty?
         console.success "Do `tmux attach-session -t #{Tmux.app_bot_session_name(app_id)}` to monitor your app bots."
       end
-      # Output rest of monitoring info
-      console.success "Do `tmux attach-session -t #{Tmux.session_name(app_id,run_id)}` to monitor your bots."
+      # Only print bots monitoring info if there bots in the run
+      unless Nutella.runlist.app_has_no_bots app_id
+        console.success "Do `tmux attach-session -t #{Tmux.session_name(app_id,run_id)}` to monitor your bots."
+      end
+      # Main interface is always available
       console.success "Go to http://localhost:#{Nutella.config['main_interface_port']}/#{app_id}/#{run_id} to access your interfaces"
     end
 
+
+
   end
 
 end

data/lib/config/runlist.rb

@@ -143,13 +143,19 @@ module Nutella
     def clean_list
       all_runs.each do |app, _|
         runs_for_app(app).each do |run|
-          unless Tmux.session_exist? Tmux.session_name(app, run)
+          unless Tmux.session_exist?(Tmux.session_name(app, run)) || app_has_no_bots(app)
             delete? app, run
           end
         end
       end
     end
 
+
+    # Returns true if the app has no bots
+    def app_has_no_bots( app_id )
+      Dir.entries("#{app_path(app_id)}/bots").select{|entry| File.directory?(entry) && !(entry =='.' || entry == '..') }.empty?
+    end
+
   end
 
 

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.4.10 ruby lib
+# stub: nutella_framework 0.4.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   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-04-08"
+  s.date = "2015-04-22"
   s.description = "utella is a framework to create and run RoomApps"
   s.email = "tebemis@gmail.com"
   s.executables = ["nutella"]
@@ -161,7 +161,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thin>, ["~> 1.6"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_runtime_dependency(%q<slop>, ["~> 4.0"])
-      s.add_runtime_dependency(%q<nutella_lib>, ["~> 0.4.10"])
+      s.add_runtime_dependency(%q<nutella_lib>, [">= 0.4.11", "~> 0.4"])
       s.add_development_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
@@ -176,7 +176,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thin>, ["~> 1.6"])
       s.add_dependency(%q<nokogiri>, ["~> 1.6"])
       s.add_dependency(%q<slop>, ["~> 4.0"])
-      s.add_dependency(%q<nutella_lib>, ["~> 0.4.10"])
+      s.add_dependency(%q<nutella_lib>, [">= 0.4.11", "~> 0.4"])
       s.add_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
@@ -192,7 +192,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thin>, ["~> 1.6"])
     s.add_dependency(%q<nokogiri>, ["~> 1.6"])
     s.add_dependency(%q<slop>, ["~> 4.0"])
-    s.add_dependency(%q<nutella_lib>, ["~> 0.4.10"])
+    s.add_dependency(%q<nutella_lib>, [">= 0.4.11", "~> 0.4"])
     s.add_dependency(%q<shoulda>, ["~> 3.0"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -112,16 +112,22 @@ dependencies:
   name: nutella_lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.11
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.11
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement