nutella_lib 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a97fa54cf895d9a462fa41e9359e09956c7187f
-  data.tar.gz: 860c5ee47f0dd0204fd8f7d231398c600be38053
+  metadata.gz: c203e2ff5acf5006c468393e19b96b03ba216e9f
+  data.tar.gz: bf51aea50d65157cb8c1159fde7737a756ce7295
 SHA512:
-  metadata.gz: ee9c68c86d822abff7772fd226c18cb927291a41dade3a658efb86f226d6f2c6e1fb31600f9c7e00467800430ff194fd2ba071650e0766e2c327a51e88a62b21
-  data.tar.gz: 8e4b5f099ccd0f0c17020402880b256785e8ed0ccb5e6e3483136caa5139595275573a15ff66a111f906bd6dc4f1291e9a4e1e57aa260e7006029cc5222d126b
+  metadata.gz: 03379fc72d47b4189cfbcbeb136873a2217f24b9be1877f4a9e5de16613309909d9714a50b5b21ed93864557718eb126ee18abd8eca2e427341f9797c7bc6129
+  data.tar.gz: 9529f13cb612c3eb71ada78fccbc36b80e8d00a32eb9c6156e8a4ff02e5e2a7b417e221409ee78c74847077803add5360d65ee4c2756d264142a12128f55bdac

data/Gemfile

@@ -1,11 +1,11 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem 'simple_ruby_mqtt_client', '~> 0.2.0', '>= 0.2.0'
+gem 'simple_ruby_mqtt_client', '~> 0.3.0', '>= 0.3.0'
 
 group :development do
   gem 'shoulda', '~> 3', '>= 3'
   gem 'minitest', '~> 5.4', '>= 5'
-  gem "yard", '~> 0.8', '>= 0.8.7'
+  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'
@@ -13,5 +13,5 @@ group :development do
 end
 
 group :test do
-  gem "rake"
+  gem 'rake'
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/nutella_lib/core.rb

@@ -8,13 +8,8 @@ module Nutella
       return
     end
     @run_id = args[0]
-    begin
-      @actor_name = Nutella.config_actor_name(@run_id)
-    rescue
-      STDERR.puts "Couldn't find nutella.json file, impossible to initialize library!"
-      return
-    end
-      @mqtt = SimpleMQTTClient.new(args[1], @actor_name)
+    @actor_name = Nutella.config_actor_name
+    @mqtt = SimpleMQTTClient.new(args[1])
   end
 
 
@@ -31,11 +26,10 @@ module Nutella
 
   private
 
-  # Extracts the actor name from nutella.json file and appends it to the run_id
-  def Nutella.config_actor_name (run_id)
-    h = JSON.parse( IO.read( "nutella.json" ) )
-    full_actor_name = run_id + '_' + h["name"]
-    full_actor_name[0, 23]
+  # Extracts the actor name based on the the folder where we are executing
+  def Nutella.config_actor_name
+    path = Dir.pwd
+    path[path.rindex('/')+1..path.length-1]
   end
 
 end

data/lib/nutella_lib/persist.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'pstore'
+require 'fileutils'
 
 module Nutella
 
@@ -7,7 +8,11 @@ module Nutella
 
     # This module exposes a single method to retrieve a JSONStore
     def Persist.getJsonStore(file_name)
-      JSONStore.new(file_name)
+      dir = file_name[0..file_name.rindex('/')]
+      file = file_name[file_name.rindex('/')..file_name.length-1]
+      new_dir = dir + Nutella.run_id
+      FileUtils.mkdir_p new_dir
+      JSONStore.new(new_dir + file)
     end
 
   end
@@ -43,6 +48,11 @@ module Nutella
       @table
     end
 
+    def merge!( hash )
+      @table.merge!(hash)
+    end
+
+
     def marshal_dump_supports_canonical_option?
       false
     end

data/nutella_lib.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_lib 0.2.0 ruby lib
+# stub: nutella_lib 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_lib"
-  s.version = "0.2.0"
+  s.version = "0.2.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 = "2014-11-12"
+  s.date = "2014-11-14"
   s.description = "Implements the nutella protocol and exposes it natively to ruby developers"
   s.email = "tebemis@gmail.com"
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<simple_ruby_mqtt_client>, [">= 0.2.0", "~> 0.2.0"])
+      s.add_runtime_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
       s.add_development_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_development_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_development_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
       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<simple_ruby_mqtt_client>, [">= 0.2.0", "~> 0.2.0"])
+      s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
       s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0", "~> 0"])
     end
   else
-    s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.2.0", "~> 0.2.0"])
+    s.add_dependency(%q<simple_ruby_mqtt_client>, [">= 0.3.0", "~> 0.3.0"])
     s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
     s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
     s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_lib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_ruby_mqtt_client
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement