nestene 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 938ed2d1190db863d92c9aa35032fd61a8fd44ef
-  data.tar.gz: 8248966bf22453f5f52354db1b690bb060ff395f
+  metadata.gz: e479ea793383b23ce3bf9de77bf12ebd31feab21
+  data.tar.gz: 6a8ba3f519fd58266ebebf33f134a1a5399ebb42
 SHA512:
-  metadata.gz: 314b99703e79c4d56ecbca6e1fee5edd7fd2577d0c0c94160b000580e8c778224915330c8fb81d4b85982da5ba111dbffd6fe94ff7df8a3ecf8a9ded9e69b048
-  data.tar.gz: b9083b23f130cf11ce905101561e5ba52c0b3532fe1da4f7e9dc21fe4ea50f5eb28d994b785563c2e56b7aba073ea14002ae46a23201047dece9c92411c9860b
+  metadata.gz: 8fd66164e61c692eabc430c7d7e3cf1cb7a0a89e9a3ec2ff5f9dcac2de720de88a349f3ea14c09f77dc52e25b9e534efabc7b938acd539731e79c3730ae26be6
+  data.tar.gz: 8573732417285586aefc07059efb2a9ceb6d7b186abf9bf324fea0a093c276d64b48db75ecc49b63dfd426cd104fe58a4c9e2956f7e9183b6d963490795e6d4f

data/TODO.txt

@@ -1,9 +1,17 @@
 todo:
-- BUG - scheduled methods not executing when nestene starts after methods scheduled
+- Show parameters of scheduled methods
+- Show duration of scheduled methods
+- Show Exception of failed states
+- Don't load jsons from the disk all the time (DiskStorage)
 - Create Auton with specific ID using UI
 - Create Auton with wrong type -> error message
+- Store results of execution in the history
 
 done:
 - Render parameters field for parameters to the method, use parameters when scheduling
 - Sort methods for the dropdown
 - List/Registry of available auton types
+- BUG - scheduled methods not executing when nestene starts after methods scheduled
+- Limit size of auton execution history
+- Pretty Print JSON for the nestene's state
+- Add module for autons -> automatic registry

data/autons.rb

@@ -1,5 +1,4 @@
-class DummyAuton
-  include StructureMapper::Hash
+class DummyAuton < Nestene::Auton
 
   def start
     sleep 6

data/features/aunton_creates_auton.feature

@@ -0,0 +1,6 @@
+Feature: Auton creates auton
+
+  Scenario: Auton creates a named auton
+    Given I have an auton that has a step that creates a named auton
+    When I start my auton and execute the step
+    Then the new Auton should be created

data/features/schedule_steps.feature

@@ -5,3 +5,8 @@ Feature: schedule steps
     When I schedule the first step that returns the uuid of the second scheduled step
     And I wait for the second step to finish
     Then the Auton should be in the READY state
+
+  Scenario: schedule step on other auton
+    Given I have two autons where first auton schedules step on the other auton
+    When I schedule the step on the first auton and wait for it's execution
+    Then second auton should either have scheduled or executed step

data/features/step_definitions/api/api_create_auton_steps.rb

@@ -1,6 +1,5 @@
 When(/^request creation of an auton with an existing type$/) do
-  class EmptyAuton
-    include StructureMapper::Hash
+  class EmptyAuton < Nestene::Auton
 
     attribute foo: String
   end

data/features/step_definitions/api/api_list_of_auton_types_steps.rb

@@ -1,11 +1,9 @@
 Given(/^I have one auton$/) do
 
-  class EmptyAuton
-    include StructureMapper::Hash
+  class EmptyAuton < ::Nestene::Auton
 
     attribute foo: String
   end
-  Nestene::Registry.register_auton(EmptyAuton)
 end
 
 When(/^I get the API list of auton types$/) do

data/features/step_definitions/auton_creates_auton_steps.rb

@@ -0,0 +1,33 @@
+Given(/^I have an auton that has a step that creates a named auton$/) do
+  class AutonCreatingAuton < Nestene::Auton
+
+    attr_accessor :context
+
+    def initialize
+      self.counter = 0
+    end
+
+    def create_auton
+      context.create_auton "EmptyAuton", 'empty_auton'
+    end
+
+    attribute counter: Fixnum
+  end
+
+  class EmptyAuton <  Nestene::Auton
+    attribute foo: String
+  end
+
+
+  @auton_type="AutonCreatingAuton"
+end
+
+When(/^I start my auton and execute the step$/) do
+  auton_id = Celluloid::Actor[:nestene_core].create_auton(@auton_type)
+  step_id=Celluloid::Actor[:nestene_core].schedule_step(auton_id, :create_auton)
+  Celluloid::Actor[:nestene_core].wait_for_execution_result(auton_id, step_id)
+end
+
+Then(/^the new Auton should be created$/) do
+  expect(Celluloid::Actor[:nestene_core].auton_names).to include('empty_auton')
+end

data/features/step_definitions/callback_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have an Auton that holds counter state$/) do
-  class CounterAuton
-    include StructureMapper::Hash
+  class CounterAuton < Nestene::Auton
 
     def initialize
       self.counter = 0
@@ -17,8 +16,7 @@ Given(/^I have an Auton that holds counter state$/) do
 end
 
 Given(/^I have an Auton that schedules a callback step on the counter Auton$/) do
-  class CallbackAuton
-    include StructureMapper::Hash
+  class CallbackAuton < Nestene::Auton
 
     def start
       self.context.schedule_callback('counter', :next, [], :set_state)
@@ -52,8 +50,7 @@ end
 
 
 Given(/^I have an Auton that hold counter state and raises exception on execution$/) do
-  class FailingCounterAuton
-    include StructureMapper::Hash
+  class FailingCounterAuton < Nestene::Auton
 
     def initialize
       self.counter = 0

data/features/step_definitions/create_auton_steps.rb

@@ -1,5 +1,5 @@
 Given(/^an empty auton$/) do
-  class EmptyAuton
+  class EmptyAuton < Nestene::Auton
     include StructureMapper::Hash
 
     attribute foo: String

data/features/step_definitions/credentials_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have an Auton that access credentials in the first step$/) do
-  class CredentialsAuton
-    include StructureMapper::Hash
+  class CredentialsAuton < Nestene::Auton
 
     attribute credentials: String
 

data/features/step_definitions/execute_step_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have a running auton with one defined step without any parameters$/) do
-  class SimpleAuton
-    include StructureMapper::Hash
+  class SimpleAuton < Nestene::Auton
 
     def start
       'ok'
@@ -31,8 +30,7 @@ end
 
 
 Given(/^I have a running auton with one defined step with parameters$/) do
-  class SimpleParamsAuton
-    include StructureMapper::Hash
+  class SimpleParamsAuton < Nestene::Auton
 
     def start(p1)
       'param: %s' % p1
@@ -51,8 +49,7 @@ end
 
 
 Given(/^I have a running auton with one defined step that fails$/) do
-  class SimpleFailingAuton
-    include StructureMapper::Hash
+  class SimpleFailingAuton < Nestene::Auton
 
     def start
       raise "failed!"
@@ -74,8 +71,7 @@ end
 
 
 Given(/^I have a running auton with one defined step that fails and one that does not fail$/) do
-  class SimpleTwoStepsFirstFailingAuton
-    include StructureMapper::Hash
+  class SimpleTwoStepsFirstFailingAuton < Nestene::Auton
 
     def start
       raise "failed!"
@@ -111,9 +107,7 @@ end
 
 
 Given(/^I have a running auton with one defined step that fails on the first invocation but succeeds on the second$/) do
-  class FirstExecutionFailingAuton
-    include StructureMapper::Hash
-
+  class FirstExecutionFailingAuton < Nestene::Auton
     def initalize
       self.first = true
     end
@@ -151,8 +145,7 @@ end
 
 
 Given(/^I have a running auton with one defined step that fails and one that does not fail and an exception handling method for the whole Auton$/) do
-  class TwoStepsFirstFailingWithExceptionHandlerAuton
-    include StructureMapper::Hash
+  class TwoStepsFirstFailingWithExceptionHandlerAuton < Nestene::Auton
 
     def start
       raise "failed!"

data/features/step_definitions/schedule_steps_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have an Auton that has two steps, first step scheduling the next step$/) do
-  class ScheduleSecondStepAuton
-    include StructureMapper::Hash
+  class ScheduleSecondStepAuton < Nestene::Auton
 
     def first
       context.schedule_step(:second)
@@ -27,3 +26,40 @@ When(/^I wait for the second step to finish$/) do
   @execution_result = Celluloid::Actor[:nestene_core].wait_for_execution_result(@auton_id, @step_execution_id)
 end
 
+
+Given(/^I have two autons where first auton schedules step on the other auton$/) do
+  class StepSchedulingAuton < Nestene::Auton
+
+    def schedule_step
+      self.step_id = context.schedule_step_on_auton('step_executor', :step)
+    end
+
+    attr_accessor :context
+
+    attribute step_id: Fixnum
+  end
+
+  class StepExecutorAuton < Nestene::Auton
+
+    def step
+      context.schedule_step(:second)
+    end
+
+    attr_accessor :context
+
+    attribute foo: Fixnum
+  end
+
+  @first_auton_id = Celluloid::Actor[:nestene_core].create_auton('StepSchedulingAuton')
+  @second_auton_id = Celluloid::Actor[:nestene_core].create_auton('StepExecutorAuton','step_executor')
+end
+
+When(/^I schedule the step on the first auton and wait for it's execution$/) do
+  step_id = Celluloid::Actor[:nestene_core].schedule_step @first_auton_id, :schedule_step
+  @second_auton_step_id = Celluloid::Actor[:nestene_core].wait_for_execution_result @first_auton_id, step_id
+
+end
+
+Then(/^second auton should either have scheduled or executed step$/) do
+  Celluloid::Actor[:nestene_core].wait_for_execution_result @second_auton_id, @second_auton_step_id
+end

data/features/step_definitions/time_delayed_steps_steps.rb

@@ -1,6 +1,5 @@
 Given(/^an Auton that schedules an one off delayed step in (\d+)\.(\d+) second$/) do |arg1, arg2|
-  class TimeDelayedStepSchedulingAuton
-    include StructureMapper::Hash
+  class TimeDelayedStepSchedulingAuton < Nestene::Auton
 
     def first
       context.schedule_delayed_step(0.1, :second)
@@ -44,8 +43,7 @@ end
 
 
 Given(/^an Auton that schedules an repeating every (\d+\.\d+) seconds delayed step in (\d+\.\d+) second$/) do |every, delay|
-  class RepeatingTimeDelayedStepdSchedulingAuton
-    include StructureMapper::Hash
+  class RepeatingTimeDelayedStepdSchedulingAuton < Nestene::Auton
 
     def first
       context.schedule_repeating_delayed_step(0.1, 0.1, :second)
@@ -69,8 +67,7 @@ end
 
 
 Given(/^an Auton that schedules an one off delayed step in (\d+\.\d+) seconds and has a failing step$/) do |delay|
-    class TimeDelayedAndFailingStepSchedulingAuton
-    include StructureMapper::Hash
+    class TimeDelayedAndFailingStepSchedulingAuton < Nestene::Auton
 
     def first
       context.schedule_delayed_step(0.1, :second)

data/features/step_definitions/ui/create_auton_steps.rb

@@ -1,6 +1,5 @@
 Given(/^there is a simple Auton implementation$/) do
-  class EmptyAuton
-    include StructureMapper::Hash
+  class EmptyAuton < Nestene::Auton
 
     attribute foo: String
   end

data/features/step_definitions/ui/list_of_autons_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have one started auton$/) do
-  class EmptyAuton
-    include StructureMapper::Hash
+  class EmptyAuton < Nestene::Auton
 
     attribute foo: String
   end

data/features/step_definitions/ui/schedule_auton_step_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have a running auton with one defined step without parameters$/) do
-  class EmptyAuton
-    include StructureMapper::Hash
+  class EmptyAuton < Nestene::Auton
 
     def initialize
     end
@@ -27,8 +26,7 @@ end
 
 
 Given(/^I have a running auton with one defined step with two parameters$/) do
-  class EmptyAutonWithParams
-    include StructureMapper::Hash
+  class EmptyAutonWithParams < Nestene::Auton
 
     def initialize
     end

data/features/step_definitions/ui/show_auton_steps.rb

@@ -1,6 +1,5 @@
 Given(/^I have one running Auton$/) do
-  class SomeCoolAuton
-    include StructureMapper::Hash
+  class SomeCoolAuton < Nestene::Auton
 
     def start
     end

data/lib/nestene/actor/auton_queue.rb

@@ -78,7 +78,7 @@ module Nestene
               state.queue.failed = true
             end
           end
-          state.queue.executed << executed
+          state.queue.add_executed executed
         end
       end
 

data/lib/nestene/actor/auton_storage.rb

@@ -13,6 +13,9 @@ module Nestene
       def initialize(auton_id, storage)
         @auton_id = auton_id
         @storage = storage
+      end
+
+      def publish_initial_state
         state = get
         publish('state_update', @auton_id, state) if state
       end

data/lib/nestene/actor/core.rb

@@ -11,9 +11,6 @@ module Nestene
         subscribe('state_update', :notify_waiters)
         @execution_futures={}
         @storage = storage
-        storage.list.each do |auton_id|
-          Celluloid::Actor["storage:%s" % auton_id] = AutonStorage.new(auton_id, @storage)
-        end
       end
 
       def auton_names

data/lib/nestene/actor/delayed_scheduler.rb

@@ -13,6 +13,10 @@ module Nestene
         @timer = nil
       end
 
+      def schedule_struct
+        @schedule.to_structure
+      end
+
 
       def update_schedule topic, auton_id, state
 
@@ -51,7 +55,7 @@ module Nestene
                   state.queue.to_execute << method
                 end
                 if delayed.every
-                  delayed.execute_at += delayed.every
+                  delayed.execute_at = now + delayed.every
                   state.queue.add_delayed(delayed)
                 end
               end

data/lib/nestene/auton_context.rb

@@ -15,6 +15,11 @@ module Nestene
       Celluloid::Actor[:nestene_core].schedule_step @auton_id, name, parameters
     end
 
+    def schedule_step_on_auton auton_id, name, parameters=[]
+      Celluloid::Actor[:nestene_core].schedule_step auton_id, name, parameters
+    end
+
+
     def schedule_delayed_step delay, name, parameters=[]
       Celluloid::Actor[:nestene_core].schedule_delayed_step @auton_id, delay, name, parameters
     end
@@ -27,5 +32,13 @@ module Nestene
       Celluloid::Actor[:nestene_core].get_credentials
     end
 
+    def create_auton type, auton_id=SecureRandom.uuid
+      Celluloid::Actor[:nestene_core].create_auton type, auton_id
+    end
+
+    attr_reader :auton_id
+
+
+
   end
 end

data/lib/nestene/auton_execution_queue.rb

@@ -28,6 +28,11 @@ module Nestene
       delayed.sort_by! {|x| x.execute_at}
     end
 
+    def add_executed executed
+      self.executed.shift while self.executed.size >= 20
+      self.executed << executed
+    end
+
 
     def remove_delayed_method method_uuid
       delayed.delete_if{|m| m.uuid == method_uuid}

data/lib/nestene/ui/app.rb

@@ -6,6 +6,12 @@ module Nestene
   module Ui
     class App < Sinatra::Base
 
+
+      get '/schedule' do
+        content_type :json
+        Celluloid::Actor[:delayed_scheduler].schedule_struct.to_json
+      end
+
       get '/auton_types' do
         content_type :json
         Nestene::Registry.registered_autons.to_json

data/lib/nestene/ui/public/app/application.js

@@ -21,11 +21,12 @@ nestene.controller('AutonsController',  function($scope, $http, $timeout) {
     });
   }
 
+  $scope.getAutons();
   $scope.intervalFunction = function() {
     $timeout(function() {
       $scope.getAutons();
       $scope.intervalFunction();
-    }, 1000);
+    }, 60000);
   };
 
   $scope.intervalFunction();

data/lib/nestene/ui/views/auton.haml

@@ -10,8 +10,7 @@
 .panel.panel-default
   .panel-heading State
   .panel-body
-    %code#current_state{'data-toggle' => "tooltip", 'data-placement' => "left", title:"Tooltip on left"}
-      = JSON.pretty_generate(@auton_state.serialized)
+    %pre#current_state{'data-toggle' => "tooltip", 'data-placement' => "left", title:"Tooltip on left"}= JSON.pretty_generate(@auton_state.serialized)
 
 .panel.panel-default
   #queue.panel-heading Queue

data/lib/nestene/version.rb

@@ -1,3 +1,3 @@
 module Nestene
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/nestene.rb

@@ -33,17 +33,25 @@ module Nestene
 
   end
 
-  class FooAuton
+
+  class Auton
+
     include StructureMapper::Hash
 
+    def self.inherited(cls)
+      Registry.register_auton(cls)
+    end
+
+  end
+
+  class FooAuton < Auton
+
     def do_foo
     end
 
     attribute foo: String
   end
 
-  Registry.register_auton(FooAuton)
-
   class SelfValue
     def value
       self
@@ -57,9 +65,14 @@ module Nestene
   end
 
   def self.start_nestene(storage)
-    Celluloid::Actor[:delayed_scheduler] = Nestene::Actor::DelayedScheduler.new
     Celluloid::Actor[:nestene_core] = Nestene::Actor::Core.new(storage)
+    Celluloid::Actor[:delayed_scheduler] = Nestene::Actor::DelayedScheduler.new
     Celluloid::Actor[:auton_queue] = Nestene::Actor::AutonQueue.new
+    storage.list.each do |auton_id|
+      storage_actor=Nestene::Actor::AutonStorage.new(auton_id, storage)
+      Celluloid::Actor["storage:%s" % auton_id] = storage_actor
+      storage_actor.publish_initial_state
+    end
   end
 
 end

data/spec/nestene/auton_execution_queue_spec.rb

@@ -14,6 +14,30 @@ module Nestene
       Timecop.return
     end
 
+    describe '#add_executed' do
+      it 'should add executed method to executed' do
+        executed = double :executed
+        subject.add_executed(executed)
+
+        expect(subject.executed).to include(executed)
+      end
+
+      context 'when there are already 20 executed methods' do
+        before do
+          (1..20).each {|i| subject.add_executed(i) }
+        end
+
+        it "should remove the oldest method" do
+          executed = double :executed
+          subject.add_executed(executed)
+
+          expect(subject.executed[-1]).to eq(executed)
+          expect(subject.executed.size).to eq(20)
+
+        end
+      end
+    end
+
     describe '#remove_delayed_method' do
       context "when the delayed method has been scheduled" do
         let (:delayed_method_uuid) {subject.add_delayed_method(:some_method, ['p1','p2'], 0.3).uuid}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nestene
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Dragan Milic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -243,6 +243,7 @@ files:
 - features/api/api_credentials.feature
 - features/api/api_list_of_auton_types.feature
 - features/api/api_list_of_autons.feature
+- features/aunton_creates_auton.feature
 - features/callback.feature
 - features/create_auton.feature
 - features/credentials.feature
@@ -253,6 +254,7 @@ files:
 - features/step_definitions/api/api_credentials_steps.rb
 - features/step_definitions/api/api_list_of_auton_types_steps.rb
 - features/step_definitions/api/api_list_of_autons_steps.rb
+- features/step_definitions/auton_creates_auton_steps.rb
 - features/step_definitions/callback_steps.rb
 - features/step_definitions/create_auton_steps.rb
 - features/step_definitions/credentials_steps.rb
@@ -344,6 +346,7 @@ test_files:
 - features/api/api_credentials.feature
 - features/api/api_list_of_auton_types.feature
 - features/api/api_list_of_autons.feature
+- features/aunton_creates_auton.feature
 - features/callback.feature
 - features/create_auton.feature
 - features/credentials.feature
@@ -354,6 +357,7 @@ test_files:
 - features/step_definitions/api/api_credentials_steps.rb
 - features/step_definitions/api/api_list_of_auton_types_steps.rb
 - features/step_definitions/api/api_list_of_autons_steps.rb
+- features/step_definitions/auton_creates_auton_steps.rb
 - features/step_definitions/callback_steps.rb
 - features/step_definitions/create_auton_steps.rb
 - features/step_definitions/credentials_steps.rb