rocketjob_mission_control 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c47815b195983663c44887317137d965b99c5a9e30d40f3b8969585dc7465a
-  data.tar.gz: 789ee3b6b5d9e006f8fa20d310fed0c30ed23dc89353a507cb7a544cfdaf46e8
+  metadata.gz: 32e9ce8c771b79d9d3f72743515e704b8a176187718b55e3cb09a39dd18a271f
+  data.tar.gz: 026bf948a56d9f8786fe3399f245029381b1252b089ba2c9570ba5781bae2078
 SHA512:
-  metadata.gz: 39413801aeb5be085f2f6ef7f7b9e44641efa786322126f34b9d05e5299ea149e92f5d6ef2d988521717d035d1a76bb300c5479ebf59a58441bb67212efd2621
-  data.tar.gz: 3f9e7b8308596809f4eeb73ed67da1f2fc0e65d879d7199f6f9d506acc2e33bfd7277a24cff3fb9b3a0706c940cfa7a0222acf4a22ecc13f8690c5ea3dea3672
+  metadata.gz: f6d1a31e2860ec330ab6d90554c971b45253ab2d12e40bf0af12e2e7ce6d97bc0c5f77db2d756844dc763fd0f1ae750b4e11908f9041864037a60fe4348da37c
+  data.tar.gz: 9840b6592baa5f9b3be8200e165a72bc804735e7bca3b414f49071212f83276ae2af26d4a4c41f9fee5af44f5e829f28869e48df4138ee69eb857335f52ab300

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -159,7 +159,7 @@ module RocketJobMissionControl
       if job.scheduled? && view.can?(:run_now, job)
         buttons += "#{ job_action_link('Run', run_now_job_path(job), :patch) }"
       end
-      if events.include?(:pause) && view.can?(:pause, job)
+      if events.include?(:pause) && job.pausable? && view.can?(:pause, job)
         buttons += "#{ job_action_link('Pause', pause_job_path(job), :patch) }"
       end
       if events.include?(:resume) && view.can?(:resume, job)

data/app/views/rocket_job_mission_control/dirmon_entries/show.html.erb

@@ -9,7 +9,7 @@
 
     <div class='btn-toolbar job-actions pull-right'>
       <div class='btn-group'>
-        <% if @dirmon_entry.disabled? || @dirmon_entry.pending? && can?(:enable, @dirmon_entry) %>
+        <% if (@dirmon_entry.disabled? || @dirmon_entry.pending?) && can?(:enable, @dirmon_entry) %>
           <%= link_to 'Enable', enable_dirmon_entry_path(@dirmon_entry.id), method: :put, class: 'btn btn-default' %>
         <% end %>
 

data/app/views/rocket_job_mission_control/jobs/show.html.erb

@@ -22,7 +22,7 @@
           </div>
         <% end %>
 
-        <% if @job.scheduled? %>
+        <% if @job.scheduled? && can?(:run_now, @job)%>
           <div class='btn-group'>
             <%= job_action_link('Run', rocket_job_mission_control.run_now_job_path(@job), :patch) %>
           </div>
@@ -31,7 +31,7 @@
         <div class='btn-group'>
           <% valid_events = @job.aasm.events.collect { |e| e.name } %>
 
-          <% if valid_events.include?(:pause) && can?(:pause, @job)%>
+          <% if valid_events.include?(:pause) && @job.pausable? && can?(:pause, @job)%>
             <%= job_action_link('Pause', rocket_job_mission_control.pause_job_path(@job), :patch) %>
           <% end %>
 

data/lib/rocket_job_mission_control/engine.rb

@@ -15,7 +15,7 @@ module RocketJobMissionControl
     require 'jquery-datatables-rails'
     require 'access-granted'
     begin
-      require 'rocketjob_pro'
+      require 'rocketjob_enterprise'
     rescue LoadError
     end
 

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '3.2.0'
+  VERSION = '4.0.0'
 end

data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb

@@ -27,26 +27,22 @@ module RocketJobMissionControl
       end
 
       let :failed_job do
-        if defined?(RocketJobPro)
-          job = KaboomBatchJob.new(slice_size: 1)
-          job.upload do |stream|
-            stream << 'first record'
-            stream << 'second record'
-            stream << 'third record'
-          end
-          job.save!
+        job = KaboomBatchJob.new(slice_size: 1)
+        job.upload do |stream|
+          stream << 'first record'
+          stream << 'second record'
+          stream << 'third record'
+        end
+        job.save!
 
-          # Run all 3 slices now to get exceptions for each.
-          3.times do
-            begin
-              job.perform_now
-            rescue ArgumentError, RuntimeError
-            end
+        # Run all 3 slices now to get exceptions for each.
+        3.times do
+          begin
+            job.perform_now
+          rescue ArgumentError, RuntimeError
           end
-          job
-        else
-          RocketJob::Job::SimpleJob.new.fail!('Oh no', 'bad_worker')
         end
+        job
       end
 
       job_states = RocketJob::Job.aasm.states.collect(&:name)
@@ -213,10 +209,6 @@ module RocketJobMissionControl
         end
 
         describe 'with a valid job id' do
-          before do
-            skip('Only tested with Rocket Job Pro') unless defined?(RocketJob::Plugins::Batch)
-          end
-
           describe 'without an exception' do
             before do
               params = {id: failed_job.id, error_type: 'Blah'}
@@ -407,12 +399,12 @@ module RocketJobMissionControl
           describe "#{method}" do
             before do
               case method
-                when :pause, :fail, :abort
-                  pausable_job.start!
-                when :resume
-                  pausable_job.pause!
-                when :retry, :exception
-                  pausable_job.fail!
+              when :pause, :fail, :abort
+                pausable_job.start!
+              when :resume
+                pausable_job.pause!
+              when :retry, :exception
+                pausable_job.fail!
               end
 
               @params = {id: pausable_job.id, job: {id: pausable_job.id, priority: pausable_job.priority}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Michael Cloutier
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,20 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 description: Rocket Job Mission Control is the Web user interface to manage Rocket
   Job.
 email:
@@ -250,7 +244,7 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Enterprise Batch Processing System for Ruby.
+summary: Ruby's missing batch system.
 test_files:
 - test/models/rocket_job_mission_control/job_sanitizer_test.rb
 - test/models/rocket_job_mission_control/query_test.rb