rename pipeline invocation to pipeline instance. refs #1416

diff --git a/app/assets/javascripts/pipeline_invocations.js.coffee b/app/assets/javascripts/pipeline_instances.js.coffee
similarity index 100%
rename from app/assets/javascripts/pipeline_invocations.js.coffee
rename to app/assets/javascripts/pipeline_instances.js.coffee

diff --git a/app/assets/stylesheets/pipeline_invocations.css.scss b/app/assets/stylesheets/pipeline_instances.css.scss
similarity index 60%
rename from app/assets/stylesheets/pipeline_invocations.css.scss
rename to app/assets/stylesheets/pipeline_instances.css.scss
index cc3b7af0d8567266a2ac72ecab070eb6ede4eb5f..aa58dccfbf89ec50ad84466b48649a68c5f8fa3d 100644 (file)
--- a/app/assets/stylesheets/pipeline_invocations.css.scss
+++ b/app/assets/stylesheets/pipeline_instances.css.scss
@@ -1,3 +1,3 @@
-// Place all the styles related to the PipelineInvocations controller here.
+// Place all the styles related to the PipelineInstances controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/

diff --git a/app/controllers/pipeline_instances_controller.rb b/app/controllers/pipeline_instances_controller.rb
new file mode 100644 (file)
index 0000000..46c8883
--- /dev/null
+++ b/app/controllers/pipeline_instances_controller.rb
@@ -0,0 +1,3 @@
+class PipelineInstancesController < ApplicationController
+  before_filter :ensure_current_user_is_admin
+end

diff --git a/app/controllers/pipeline_invocations_controller.rb b/app/controllers/pipeline_invocations_controller.rb
deleted file mode 100644 (file)
index 2f1dc79..0000000
--- a/app/controllers/pipeline_invocations_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class PipelineInvocationsController < ApplicationController
-  before_filter :ensure_current_user_is_admin
-end

diff --git a/app/helpers/pipeline_invocations_helper.rb b/app/helpers/pipeline_instances_helper.rb
similarity index 98%
rename from app/helpers/pipeline_invocations_helper.rb
rename to app/helpers/pipeline_instances_helper.rb
index d64acf779d5622e3b96d78cb0fa5be7df24a0a6e..013a89390153264f1441b299ba9f523157d2be31 100644 (file)
--- a/app/helpers/pipeline_invocations_helper.rb
+++ b/app/helpers/pipeline_instances_helper.rb
@@ -1,4 +1,4 @@
-module PipelineInvocationsHelper
+module PipelineInstancesHelper
   def pipeline_jobs
     ret = []
     @object.components[:steps].each_with_index do |step, i|

diff --git a/app/helpers/vcf_pipeline_helper.rb b/app/helpers/vcf_pipeline_helper.rb
index 9a27a4be1bb46ef8afbe885958e37d379c8bbb33..255c6524acc90b3d687243605b59f8d861d63964 100644 (file)
--- a/app/helpers/vcf_pipeline_helper.rb
+++ b/app/helpers/vcf_pipeline_helper.rb
@@ -1,7 +1,7 @@
 module VcfPipelineHelper
   require 'csv'
 
-  def reset_vcf_pipeline_invocation(pi, input_manifest)
+  def reset_vcf_pipeline_instance(pi, input_manifest)
     params = {
       'PICARD_ZIP' => '7a4073e29bfa87154b7102e75668c454+83+K@van',
       'GATK_BUNDLE' => '0a37aaf212464efa2a77ff9ba51c0148+10524+K@van',

diff --git a/app/models/orvos_base.rb b/app/models/orvos_base.rb
index 08c99c1e77d1e6989ab15e82a7b68251eac15eb9..4478e60a17166f99625765f6c6bf52fc1402d018 100644 (file)
--- a/app/models/orvos_base.rb
+++ b/app/models/orvos_base.rb
@@ -11,7 +11,8 @@ class OrvosBase < ActiveRecord::Base
       '57u5n' => 'orvos#log',
       'j58dm' => 'orvos#specimen',
       'mxsvm' => 'orvos#pipeline',
-      'uo14g' => 'orvos#pipeline_invocation',
+      'd1hrv' => 'orvos#pipeline_instance',
+      'uo14g' => 'orvos#pipeline_instance', # legacy PipelineInstance objects
       'j7d0g' => 'orvos#group',
       'ldvyl' => 'orvos#group' # only needed for legacy Project objects
     }

diff --git a/app/models/pipeline_invocation.rb b/app/models/pipeline_instance.rb
similarity index 94%
rename from app/models/pipeline_invocation.rb
rename to app/models/pipeline_instance.rb
index a30a4a08cb97c26d393deb9f3faa437464ad0517..6ba897d18dc0184bc3018cf7a766cd1ef4d3e34a 100644 (file)
--- a/app/models/pipeline_invocation.rb
+++ b/app/models/pipeline_instance.rb
@@ -1,4 +1,4 @@
-class PipelineInvocation < OrvosBase
+class PipelineInstance < OrvosBase
   attr_accessor :pipeline
 
   def update_job_parameters(new_params)

diff --git a/app/views/pipeline_invocations/show.html.erb b/app/views/pipeline_instances/show.html.erb
similarity index 100%
rename from app/views/pipeline_invocations/show.html.erb
rename to app/views/pipeline_instances/show.html.erb

diff --git a/config/routes.rb b/config/routes.rb
index 21df9e6a391c0149fc42d2d5698b4d08be2c7109..bb5e60414fd3ec7e6e6a4f31e6e693fd7ec17e51 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,7 +16,7 @@ Vcffarm::Application.routes.draw do
 
 
   resources :factory_jobs
-  match '/factory_jobs/reset_pipeline_invocation/:uuid' => 'factory_jobs#reset_pipeline_invocation', :as => 'reset_pipeline_invocation', :via => 'POST'
+  match '/factory_jobs/reset_pipeline_instance/:uuid' => 'factory_jobs#reset_pipeline_instance', :as => 'reset_pipeline_instance', :via => 'POST'
 
 
   resources :uploaded_datasets
@@ -31,7 +31,7 @@ Vcffarm::Application.routes.draw do
   resources :pipelines
 
 
-  resources :pipeline_invocations
+  resources :pipeline_instances
 
 
   resources :links

diff --git a/test/fixtures/pipeline_invocations.yml b/test/fixtures/pipeline_instances.yml
similarity index 100%
rename from test/fixtures/pipeline_invocations.yml
rename to test/fixtures/pipeline_instances.yml

diff --git a/test/functional/pipeline_invocations_controller_test.rb b/test/functional/pipeline_instances_controller_test.rb
similarity index 52%
rename from test/functional/pipeline_invocations_controller_test.rb
rename to test/functional/pipeline_instances_controller_test.rb
index 3d22b75b9468ef300c2abb5c2bc456b8b14001b9..00d832b05d56b4904661c3572151788e05abb4d1 100644 (file)
--- a/test/functional/pipeline_invocations_controller_test.rb
+++ b/test/functional/pipeline_instances_controller_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PipelineInvocationsControllerTest < ActionController::TestCase
+class PipelineInstancesControllerTest < ActionController::TestCase
   # test "the truth" do
   #   assert true
   # end

diff --git a/test/unit/helpers/pipeline_instances_helper_test.rb b/test/unit/helpers/pipeline_instances_helper_test.rb
new file mode 100644 (file)
index 0000000..45749cb
--- /dev/null
+++ b/test/unit/helpers/pipeline_instances_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PipelineInstancesHelperTest < ActionView::TestCase
+end

diff --git a/test/unit/helpers/pipeline_invocations_helper_test.rb b/test/unit/helpers/pipeline_invocations_helper_test.rb
deleted file mode 100644 (file)
index bf0fca9..0000000
--- a/test/unit/helpers/pipeline_invocations_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PipelineInvocationsHelperTest < ActionView::TestCase
-end

diff --git a/test/unit/pipeline_invocation_test.rb b/test/unit/pipeline_instance_test.rb
similarity index 58%
rename from test/unit/pipeline_invocation_test.rb
rename to test/unit/pipeline_instance_test.rb
index df4bed2095d7af57919154edd312efd12b9741f1..9b4c7c3787b26aa11545e402b6bc2c847fd86cc4 100644 (file)
--- a/test/unit/pipeline_invocation_test.rb
+++ b/test/unit/pipeline_instance_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PipelineInvocationTest < ActiveSupport::TestCase
+class PipelineInstanceTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end