[ARVADOS] updated: a6e1c4ee0d72d0b3f5443dcf309135a4d609c0c2

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/views/pipeline_templates/_show_recent.html.erb | 2 +-
 sdk/cli/bin/arv-run-pipeline-instance                            | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

       via  a6e1c4ee0d72d0b3f5443dcf309135a4d609c0c2 (commit)
       via  0119bfdc48c03588e91a9fdbafe77bfd62d89c20 (commit)
       via  fcf7b0770eb45beb57f32f7855aa76e9bf28690c (commit)
      from  ff9f9c7e1a664a36bcffd54c7269c08d5bf1d436 (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 a6e1c4ee0d72d0b3f5443dcf309135a4d609c0c2
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 15 08:18:37 2014 -0400

    2875: render template description as textile attribte in show recent page

diff --git a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
index 4c92643..65da910 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
@@ -49,7 +49,7 @@
         <%= render_editable_attribute ob, 'name' %>
       </td><td>
         <% if ob.respond_to?(:description) and ob.description %>
-          <%= ob.description %>
+          <%= render_attribute_as_textile(ob, "description", ob.description, false) %>
           <br />
         <% end %>
         <% ob.components.collect { |k,v| k.to_s }.each do |k| %>

commit 0119bfdc48c03588e91a9fdbafe77bfd62d89c20
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 15 08:10:29 2014 -0400

    2875: add description option

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index f8c612e..35b2cd5 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -42,6 +42,8 @@
 # [--status-json path] Print JSON status report to a file or
 #                      fifo. Default: /dev/null
 #
+# [--description] Description for the pipeline instance.
+#
 # == Parameters
 #
 # [param_name=param_value]
@@ -175,6 +177,10 @@ p = Trollop::Parser.new do
       "Manage the pipeline in process.",
       :short => :none,
       :type => :boolean)
+  opt(:description,
+      "Description for the pipeline instance.",
+      :short => :none,
+      :type => :string)
   stop_on [:'--']
 end
 $options = Trollop::with_standard_exception_handling p do
@@ -478,6 +484,8 @@ class WhRunPipelineInstance
         end
       end
     else
+      description = $options[:description]
+      description = ("Created at #{Time.now.localtime}" + (@template[:name].andand.size>0 ? " using the pipeline template *#{@template[:name]}*" : "")) if !description
       @instance = PipelineInstance.
         create(components: @components,
                properties: {
@@ -486,7 +494,7 @@ class WhRunPipelineInstance
                  }
                },
                pipeline_template_uuid: @template[:uuid],
-               description: "Created at #{Time.now.localtime}" + (@template[:name].andand.size>0 ? " using the pipeline template *#{@template[:name]}*" : ""),
+               description: description,
                state: ($options[:submit] ? 'RunningOnServer' : 'RunningOnClient'))
     end
     self

commit fcf7b0770eb45beb57f32f7855aa76e9bf28690c
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 12 18:15:21 2014 -0400

    2875: add initial description to pipeline instance when created using arv-run-pipeline-instance script

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index b19bf04..f8c612e 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -486,6 +486,7 @@ class WhRunPipelineInstance
                  }
                },
                pipeline_template_uuid: @template[:uuid],
+               description: "Created at #{Time.now.localtime}" + (@template[:name].andand.size>0 ? " using the pipeline template *#{@template[:name]}*" : ""),
                state: ($options[:submit] ? 'RunningOnServer' : 'RunningOnClient'))
     end
     self

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


hooks/post-receive
--