[ARVADOS] updated: ad21f6e75f89d2bc5b6547ccf84332384478f82b

[git at public.curoverse.com]

Summary of changes:
 .../20140417195429_pipeline_instance_state.rb      |   41 ---------
 .../20140417195431_pipeline_instance_state.rb      |   88 ++++++++++++++++++++
 services/api/db/schema.rb                          |    2 +-
 3 files changed, 89 insertions(+), 42 deletions(-)
 delete mode 100644 services/api/db/migrate/20140417195429_pipeline_instance_state.rb
 create mode 100644 services/api/db/migrate/20140417195431_pipeline_instance_state.rb

       via  ad21f6e75f89d2bc5b6547ccf84332384478f82b (commit)
       via  3755be4a9ddc4e40aa1b04b17dfd272e856f0d17 (commit)
      from  287378375758cdecfbaeccab5bcb99aafed68651 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ad21f6e75f89d2bc5b6547ccf84332384478f82b
Author: radhika chippada <radhika at curoverse.com>
Date:   Mon Apr 21 14:47:05 2014 -0400

    Minor updates based on Tom's script.

diff --git a/services/api/db/migrate/20140417195431_pipeline_instance_state.rb b/services/api/db/migrate/20140417195431_pipeline_instance_state.rb
index 1043d69..dc0a3c0 100644
--- a/services/api/db/migrate/20140417195431_pipeline_instance_state.rb
+++ b/services/api/db/migrate/20140417195431_pipeline_instance_state.rb
@@ -58,12 +58,19 @@ class PipelineInstanceState < ActiveRecord::Migration
           next
         end
 
-        if pi.state == 'Complete'
-          pi.success = true
-        elsif pi.state == 'Failed'
+        case pi.state
+        when PipelineInstance::Failed
+          pi.active = false
           pi.success = false
-        elsif pi.state != 'New'
+        when PipelineInstance::Complete
+          pi.active = false
+          pi.success = true
+        when PipelineInstance::New
+          pi.active = false
+          pi.success = nil
+        else
           pi.active = true
+          pi.success = nil
         end
 
         pi.save!

commit 3755be4a9ddc4e40aa1b04b17dfd272e856f0d17
Author: radhika chippada <radhika at curoverse.com>
Date:   Mon Apr 21 14:33:17 2014 -0400

    Improve down method in migration.

diff --git a/services/api/db/migrate/20140417195429_pipeline_instance_state.rb b/services/api/db/migrate/20140417195429_pipeline_instance_state.rb
deleted file mode 100644
index 50230c7..0000000
--- a/services/api/db/migrate/20140417195429_pipeline_instance_state.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class PipelineInstanceState < ActiveRecord::Migration
-  include CurrentApiClient
-
-  def up
-    add_column :pipeline_instances, :state, :string
-    add_column :pipeline_instances, :components_summary, :text
-
-    act_as_system_user do
-      PipelineInstance.all.each do |pi|
-        pi.state = PipelineInstance::New
-
-        if !pi.attribute_present? :success   # success is nil
-          if pi[:active] == true
-            pi.state = PipelineInstance::RunningOnServer
-          else
-            if PipelineInstance.is_ready pi.components
-              pi.state = PipelineInstance::Ready
-            else
-              pi.state = PipelineInstance::New
-            end
-          end
-        elsif pi[:success] == true
-          pi.state = PipelineInstance::Complete
-        else
-          pi.state = PipelineInstance::Failed
-        end
-
-        pi.save!
-      end
-    end
-
-    remove_column :pipeline_instances, :active
-    remove_column :pipeline_instances, :success
-  end
-
-  def down
-      add_column :pipeline_instances, :success, :null => true
-      add_column :pipeline_instances, :active, :default => false
-      remove_column :pipeline_instances, :state
-  end
-end
diff --git a/services/api/db/migrate/20140417195431_pipeline_instance_state.rb b/services/api/db/migrate/20140417195431_pipeline_instance_state.rb
new file mode 100644
index 0000000..1043d69
--- /dev/null
+++ b/services/api/db/migrate/20140417195431_pipeline_instance_state.rb
@@ -0,0 +1,81 @@
+class PipelineInstanceState < ActiveRecord::Migration
+  include CurrentApiClient
+
+  def up
+    if !column_exists?(:pipeline_instances, :state)
+      add_column :pipeline_instances, :state, :string
+    end
+
+    if !column_exists?(:pipeline_instances, :components_summary)
+      add_column :pipeline_instances, :components_summary, :text
+    end
+
+    act_as_system_user do
+      PipelineInstance.all.each do |pi|
+        pi.state = PipelineInstance::New
+
+        if !pi.attribute_present? :success   # success is nil
+          if pi[:active] == true
+            pi.state = PipelineInstance::RunningOnServer
+          else
+            if PipelineInstance.is_ready pi.components
+              pi.state = PipelineInstance::Ready
+            else
+              pi.state = PipelineInstance::New
+            end
+          end
+        elsif pi[:success] == true
+          pi.state = PipelineInstance::Complete
+        else
+          pi.state = PipelineInstance::Failed
+        end
+
+        pi.save!
+      end
+    end
+
+    if column_exists?(:pipeline_instances, :active)
+      remove_column :pipeline_instances, :active
+    end
+
+    if column_exists?(:pipeline_instances, :success)
+      remove_column :pipeline_instances, :success
+    end
+  end
+
+  def down
+    if !column_exists?(:pipeline_instances, :success)
+      add_column :pipeline_instances, :success, :null => true
+    end
+
+    if !column_exists?(:pipeline_instances, :active)
+      add_column :pipeline_instances, :active, :default => false
+    end
+
+    act_as_system_user do
+      PipelineInstance.all.each do |pi|
+        if !pi.state
+          next
+        end
+
+        if pi.state == 'Complete'
+          pi.success = true
+        elsif pi.state == 'Failed'
+          pi.success = false
+        elsif pi.state != 'New'
+          pi.active = true
+        end
+
+        pi.save!
+      end
+    end
+
+    if column_exists?(:pipeline_instances, :components_summary)
+      remove_column :pipeline_instances, :components_summary
+    end
+
+    if column_exists?(:pipeline_instances, :state)
+      remove_column :pipeline_instances, :state
+    end
+  end
+end
diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index cd8f00f..5a19094 100644
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140417195429) do
+ActiveRecord::Schema.define(:version => 20140417195431) do
 
   create_table "api_client_authorizations", :force => true do |t|
     t.string   "api_token",                                           :null => false

-----------------------------------------------------------------------


hooks/post-receive
--