[ARVADOS] updated: cce25fdb29b36ffa3348546da36cbd4d8bbfe4fc

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/show.html.erb |   4 +-
 .../app/views/collections/show_file_links.html.erb |   2 +-
 sdk/python/arvados/commands/put.py                 |  20 ++--
 sdk/python/test_cmdline.py                         |  81 ----------------
 .../tests/{test_arv-put.py => test_arv_put.py}     | 103 ++++++++++++++++++++-
 services/api/app/models/pipeline_instance.rb       |  10 +-
 .../20140601022548_remove_name_from_collections.rb |   9 ++
 ..._active_and_success_from_pipeline_instances.rb} |   2 +-
 services/api/db/schema.rb                          |   3 +-
 9 files changed, 130 insertions(+), 104 deletions(-)
 delete mode 100644 sdk/python/test_cmdline.py
 rename sdk/python/tests/{test_arv-put.py => test_arv_put.py} (78%)
 create mode 100644 services/api/db/migrate/20140601022548_remove_name_from_collections.rb
 rename services/api/db/migrate/{20140528143351_pipeline_instance_attributes.rb => 20140602143352_remove_active_and_success_from_pipeline_instances.rb} (93%)

       via  cce25fdb29b36ffa3348546da36cbd4d8bbfe4fc (commit)
       via  16263c93ec077d2d54b012b9916cc9a421888317 (commit)
       via  c950192e08bcfc6e84432359a7128b73b52e8a58 (commit)
       via  8997d50ab1d335120af5965957c4cca9fb2a3b16 (commit)
       via  6029fb64fd6372c577f9f143e6f3dcaded127ac3 (commit)
       via  c88315d6435332f5dababac62ff4d72dadde7c67 (commit)
       via  e1ae50d3e62499eaa0938f27cea3e4ff8ba116a3 (commit)
       via  cff73e6feea770c80d9a63168de2be7cb6663a4d (commit)
      from  95709eedf2452d3ceddeeb02d24b823a552300cf (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 cce25fdb29b36ffa3348546da36cbd4d8bbfe4fc
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 2 13:56:50 2014 -0400

    2903: rename db migrate script with clear description

diff --git a/services/api/db/migrate/20140528143351_pipeline_instance_attributes.rb b/services/api/db/migrate/20140602143352_remove_active_and_success_from_pipeline_instances.rb
similarity index 93%
rename from services/api/db/migrate/20140528143351_pipeline_instance_attributes.rb
rename to services/api/db/migrate/20140602143352_remove_active_and_success_from_pipeline_instances.rb
index ed09fd4..6d4014c 100644
--- a/services/api/db/migrate/20140528143351_pipeline_instance_attributes.rb
+++ b/services/api/db/migrate/20140602143352_remove_active_and_success_from_pipeline_instances.rb
@@ -1,4 +1,4 @@
-class PipelineInstanceAttributes < ActiveRecord::Migration
+class RemoveActiveAndSuccessFromPipelineInstances < ActiveRecord::Migration
   include CurrentApiClient
 
   def up
diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 70879e5..b026dff 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 => 20140601022548) do
+ActiveRecord::Schema.define(:version => 20140602143352) do
 
 
 

commit 16263c93ec077d2d54b012b9916cc9a421888317
Merge: 95709ee c950192
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 2 13:51:03 2014 -0400

    Merge branch 'master' into 2903-remove-pi-active-and-success
    
    Conflicts:
    	services/api/db/schema.rb

diff --cc services/api/app/models/pipeline_instance.rb
index f83d436,7bb814c..354c892
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@@ -8,7 -8,7 +8,7 @@@ class PipelineInstance < ArvadosMode
    belongs_to :pipeline_template, :foreign_key => :pipeline_template_uuid, :primary_key => :uuid
  
    before_validation :bootstrap_components
-   before_validation :update_status
 -  before_validation :update_success
++  before_validation :update_state
    before_validation :verify_status
    before_create :set_state_before_save
    before_save :set_state_before_save
@@@ -109,9 -111,9 +109,9 @@@
      end
    end
  
-   def update_status
 -  def update_success
++  def update_state
      if components and progress_ratio == 1.0
 -      self.success = true
 +      self.state = Complete
      end
    end
  
@@@ -158,9 -211,13 +158,9 @@@
    end
  
    def set_state_before_save
-       if self.components_look_ready? && (!self.state || self.state == New)
 -    if !self.state || self.state == New || self.state == Ready || self.state == Paused
 -      if self.active
 -        self.state = RunningOnServer
 -      elsif self.components_look_ready? && (!self.state || self.state == New)
--        self.state = Ready
--      end
++    if self.components_look_ready? && (!self.state || self.state == New)
++      self.state = Ready
+     end
    end
  
  end

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


hooks/post-receive
--