foreman-tasks 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bbd40d07b988d8b36e5f1d55152521fafbea8b1
-  data.tar.gz: f8a5d50f3fb07ff87aa30c9ba09ec61fe6fdf310
+  metadata.gz: d050fd7d55d78ed330c5da74b31f7a340f652d85
+  data.tar.gz: 35e4c705611f00c5323dcdcca943d41a71dc988a
 SHA512:
-  metadata.gz: c96d92ad1ca7384ef68f31a33591264ab743d134faaa5c5cd65dc2781a6f9b95494b1034e9aa16eedc2dc2ebd6d56586642a8520090d6520db7adc012c69dc14
-  data.tar.gz: 48126f7110b2f2f0ce10daa31c904af9f902d0528eb0510297be896518ef88aaa26fbcdd9ef4d08082c41721bb3dd1ae60fb8c3d47049ac58d60f19a7ea2b803
+  metadata.gz: 962203d2e16abf60f2b3b491bc3e14a1c229241609ff0701b3a736058d4bcd257ec2ec0174ffabdd938e7e1da60264ae118fc399ebd1d1f550d1d28142db0265
+  data.tar.gz: 612fa5a8838f36dd8b5cb4ad2321791ecf450d6bc5c6872092ad730f94a8da36ff660b3644887377307cebe0b070e9dc267d32e2562f933651c0816a71e84d3c

data/README.md

@@ -32,7 +32,9 @@ Add the following to bundler.d/Gemfile.local.rb in your Foreman installation dir
 
     $ gem 'foreman-tasks'
 
-Then run `bundle install` and `foreman-rake db:migrate` from the same directory
+Then run `bundle install` and `foreman-rake db:migrate` from the same directory. Note that you must start the
+dynflow executor (background processor) manually. You can find example service script in 
+extra/dynflow-executor.example in this repository.
 
 --------------
 

data/app/helpers/foreman_tasks/tasks_helper.rb

@@ -1,6 +1,7 @@
 module ForemanTasks
   module TasksHelper
     def format_task_input(task, include_action = false)
+      return '-' unless task
       parts = []
       parts << task.get_humanized(:name) if include_action
       parts << Array(task.get_humanized(:input)).map do |part|

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -123,5 +123,11 @@ module ForemanTasks
                :state => data[:state].to_s,
                :result => data[:result].to_s)
     end
+
+    private
+
+    def self.model_name
+      superclass.model_name
+    end
   end
 end

data/extra/dynflow-executor.example

@@ -0,0 +1,77 @@
+# Author: Riley Shott
+# https://gist.github.com/Ginja/fb123759d48b04b5f338
+# dynflow-executor - starts or stops the Dynflow executor for Foreman tasks
+#
+# chkconfig:   345 99 20
+# description: dynflow-executor is a rake task that comes with \
+#              the foreman-tasks gem
+# processname: dynflow-executor
+# pidfile:     /usr/local/foreman/tmp/pids/dynflow_executor_monitor.pid
+# pidfile:     /usr/local/foreman/tmp/pids/dynflow_executor.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+foreman_user='foreman'
+rvm='/usr/local/.rvm/bin/rvm'
+gemset='ruby-2.1.5@foreman-1.9.1'
+foreman_app_path='/usr/local/foreman'
+dynflow_executor="$(cd $foreman_app_path && $rvm $gemset do bundle show foreman-tasks)/bin/dynflow-executor"
+rvm_do_dynflow="RAILS_ENV=production ${rvm} ${gemset} do ${dynflow_executor}"
+prog=$(basename $dynflow_executor)
+
+[ -f /etc/sysconfig/dynflow-executor ] && . /etc/sysconfig/dynflow-executor
+
+start() {
+  [ -x $dynflow_executor ] || exit 5
+  echo -n $"Starting $prog: "
+  su - $foreman_user -c "cd ${foreman_app_path} && ${rvm_do_dynflow} start"
+  RETVAL=$?
+  if [ $RETVAL -eq 0 ]
+    then success
+    else failure
+  fi
+  echo
+  return $RETVAL
+}
+
+stop() {
+  echo -n $"Stopping $prog: "
+  cd "${foreman_app_path}"
+  su - $foreman_user -c "cd ${foreman_app_path} && ${rvm_do_dynflow} stop"
+  RETVAL=$?
+  if [ $RETVAL -eq 0 ]
+    then success
+    else failure
+  fi
+  echo
+  return $RETVAL
+}
+
+status() {
+  pgrep -f -u $foreman_user dynflow_executor -l
+}
+
+restart() {
+  stop
+  sleep 2
+  start
+}
+
+case "$1" in
+  start)
+    $1
+    ;;
+  stop)
+    $1
+    ;;
+  status)
+    $1
+    ;;
+  restart)
+    $1
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|status|restart}"
+    exit 2
+esac

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -81,7 +81,7 @@ namespace :foreman_tasks do
       end
 
       def load_action(step)
-        world.persistence.load_action(step)
+        world.persistence.load_action_for_presentation(@plan, step.action_id, step)
       end
 
       def step_error(step)

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.19"
+  VERSION = "0.7.20"
 end

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -15,6 +15,9 @@ module ForemanTasks
         format_task_input(@task, true).must_equal("Create user 'Anonymous Admin'")
       end
 
+      it 'displays the dash if task is nil' do
+	format_task_input(nil, true).must_equal('-')
+      end
     end
 
     describe 'when formatting input' do
@@ -37,5 +40,7 @@ module ForemanTasks
         format_task_input(@task, true).must_equal("Create #{response}")
       end
     end
+
+   end 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -185,6 +185,7 @@ files:
 - deploy/foreman-tasks.init
 - deploy/foreman-tasks.service
 - deploy/foreman-tasks.sysconfig
+- extra/dynflow-executor.example
 - foreman-tasks.gemspec
 - lib/foreman-tasks.rb
 - lib/foreman_tasks.rb