dynflow 0.8.15 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5888e45403439f7db59f31b1cd22b345cfc1670
-  data.tar.gz: 93c741456f30a692f1b9a2b9ba0e75d311b2eb66
+  metadata.gz: b6082a4e18537f19b13eaf0409be81baaf334a5c
+  data.tar.gz: 5c9d56842579de336c97b7f00d4284ef254ba196
 SHA512:
-  metadata.gz: 2382def5079b7fb102b66e8fedc78ecec4a67ff727e3ecdb37e6c7452678ef002fb74defaed23c0bfd9a5e10b2b736f4775ac3ad532c26d9de832df3f4ff29c2
-  data.tar.gz: 2a1ceda8cc98ddfa53bce347a17e0b11a2199d402b53b956f117672d9d44e1b8ac66783d6566adaf5a5d3c15a37153a5254330370c50da8c9650e69e1704a09a
+  metadata.gz: 6d24e6111ffac1b44316a31784afbe1ace05fd130e9c087bff718adfb33335fe2a7c747f176557b15999fd0b7900af1367128606452a7ce94c345894f5707f02
+  data.tar.gz: d7d3655784db8d993018d5c5e00c3dbebaf4679ae2bacf971eb129ea3e306854b97a803fa6098694ad5d79102aea2f70b456e481ec1af4a90469da71efe0f0a4

data/Gemfile

@@ -11,7 +11,11 @@ group :pry do
 end
 
 group :postgresql do
-  gem "pg"
+  if RUBY_VERSION <= '2'
+    gem 'pg', '< 0.19'
+  else
+    gem "pg"
+  end
 end
 
 group :mysql do

data/doc/pages/source/documentation/index.md

@@ -143,8 +143,8 @@ end
 In example above, it seems that `plan_self` is just shortcut to
 `plan_action MyActions::File::Destroy, filename` but it's not entirely true.
 Note that `plan_action` always triggers `plan` of a given action while `plan_self`
-plans only the `run` of Action, so by using `plan_action` we'd end up in
-endless loop.
+plans only the `run` and `finalize` of Action, so by using `plan_action`
+we'd end up in endless loop.
 
 Also note, that run method does not take any input. In fact, it can use
 `input` method that refers to arguments, that were used in `plan_self`.
@@ -154,8 +154,9 @@ After that some finalizing steps can be taken. Actions can use outputs of other
 as parts of their inputs establishing dependency. Action's state is serialized between each phase
 and survives machine/executor restarts.
 
-As lightly touched in the previous paragraph there are 3 phases: `plan`, `run`, `finalize`.
-Plan phase starts by triggering an action.
+As lightly touched in the previous paragraphs there are 3 phases: `plan`, `run` and `finalize`.
+Plan phase starts by triggering an action. `run` and `finalize` are only ran if you use
+`plan_self` in `plan` phase.
 
 #### Input and Output
 
@@ -315,7 +316,8 @@ an_action.plan(*args) # an_action is AnAction
 ```
 
 `plan` method is inherited from Dynflow::Action and by default it plans itself if
-`run` method is present using first argument as input.
+`run` method is present using first argument as input. It also calls `finalize`
+method if it is present.
 
 ```ruby
 class AnAction < Dynflow::Action

data/lib/dynflow/execution_plan.rb

@@ -409,9 +409,15 @@ module Dynflow
     end
 
     def self.steps_from_hash(step_ids, execution_plan_id, world)
+      steps = world.persistence.load_steps(execution_plan_id, world)
+      ids_to_steps = steps.inject({}) do |hash, step|
+        hash[step.id.to_i] = step
+        hash
+      end
+      # to make sure to we preserve the order of the steps
       step_ids.inject({}) do |hash, step_id|
-        step = world.persistence.load_step(execution_plan_id, step_id, world)
-        hash.update(step_id.to_i => step)
+        hash[step_id.to_i] = ids_to_steps[step_id.to_i]
+        hash
       end
     end
 

data/lib/dynflow/execution_plan/steps/abstract.rb

@@ -113,7 +113,7 @@ module Dynflow
       # @return [Action] in presentation mode, intended for retrieving: progress information,
       # details, human outputs, etc.
       def action(execution_plan)
-        world.persistence.load_action_for_presentation(execution_plan, action_id)
+        world.persistence.load_action_for_presentation(execution_plan, action_id, self)
       end
 
       def skippable?

data/lib/dynflow/persistence.rb

@@ -76,6 +76,12 @@ module Dynflow
       ExecutionPlan::Steps::Abstract.from_hash(step_hash, execution_plan_id, world)
     end
 
+    def load_steps(execution_plan_id, world)
+      adapter.load_steps(execution_plan_id).map do |step_hash|
+        ExecutionPlan::Steps::Abstract.from_hash(step_hash, execution_plan_id, world)
+      end
+    end
+
     def save_step(step)
       adapter.save_step(step.execution_plan_id, step.id, step.to_hash)
     end

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -113,6 +113,10 @@ module Dynflow
         load :step, execution_plan_uuid: execution_plan_id, id: step_id
       end
 
+      def load_steps(execution_plan_id)
+        load_records :step, execution_plan_uuid: execution_plan_id
+      end
+
       def save_step(execution_plan_id, step_id, value)
         save :step, { execution_plan_uuid: execution_plan_id, id: step_id }, value
       end
@@ -139,8 +143,7 @@ module Dynflow
       def pull_envelopes(receiver_id)
         connector_feature!
         db.transaction do
-          data_set = table(:envelope).where(receiver_id: receiver_id).to_a
-
+          data_set = table(:envelope).where(receiver_id: receiver_id).all
           envelopes = data_set.map { |record| load_data(record) }
 
           table(:envelope).where(id: data_set.map { |d| d[:id] }).delete
@@ -246,7 +249,7 @@ module Dynflow
         value
       end
 
-      def load(what, condition)
+      def load_record(what, condition)
         table = table(what)
         if (record = with_retry { table.first(Utils.symbolize_keys(condition)) } )
           load_data(record)
@@ -255,6 +258,15 @@ module Dynflow
         end
       end
 
+      alias_method :load, :load_record
+
+      def load_records(what, condition)
+        table = table(what)
+        records = with_retry { table.filter(Utils.symbolize_keys(condition)).all }
+        records.map { |record| load_data(record) }
+      end
+
+
       def load_data(record)
         Utils.indifferent_hash(MultiJson.load(record[:data]))
       end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.15'
+  VERSION = '0.8.16'
 end

data/lib/dynflow/world.rb

@@ -13,8 +13,8 @@ module Dynflow
       @id                     = SecureRandom.uuid
       @clock                  = spawn_and_wait(Clock, 'clock')
       config_for_world        = Config::ForWorld.new(config, self)
-      config_for_world.validate
       @logger_adapter         = config_for_world.logger_adapter
+      config_for_world.validate
       @transaction_adapter    = config_for_world.transaction_adapter
       @persistence            = Persistence.new(self, config_for_world.persistence_adapter)
       @coordinator            = Coordinator.new(config_for_world.coordinator_adapter)
@@ -360,6 +360,9 @@ module Dynflow
           end
         end.compact
       end
+    rescue Coordinator::LockError => e
+      logger.info "auto-executor lock already aquired: #{e.message}"
+      []
     end
 
     def try_spawn_delayed_executor(config_for_world)

data/test/abnormal_states_recovery_test.rb

@@ -104,6 +104,9 @@ module Dynflow
           client_world.auto_execute
           expected_locks = ["lock auto-execute", "unlock auto-execute"]
           client_world.coordinator.adapter.lock_log.must_equal(expected_locks)
+          lock = Coordinator::AutoExecuteLock.new(client_world)
+          client_world.coordinator.acquire(lock)
+          client_world.auto_execute.must_equal []
         end
 
         it "re-runs the plans that were planned but not executed" do

data/web/views/layout.erb

@@ -36,6 +36,11 @@
             <ul class="nav navbar-nav">
               <li><a href="<%= url '/' %>">Execution plans</a></li>
               <li><a href="<%= url '/status' %>">Status</a></li>
+              <% if settings.respond_to?(:custom_navigation) && settings.custom_navigation %>
+                <% settings.custom_navigation.each do |description, uri| %>
+                  <li><a href="<%= uri %>"><%= description %></a></li>
+                <% end %>
+              <% end %>
             </ul>
             <ul class="nav navbar-nav navbar-right">
             </ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.16
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json