# HG changeset patch
# User mingchen0919
# Date 1522174172 14400
# Node ID 3de03ccbf8fb9d4ebb49898b8ad10de1bea5ceb3
# Parent  8bd397b57e1cf2eae9b8835db02939f78665d3fb
planemo upload

diff -r 8bd397b57e1c -r 3de03ccbf8fb elastic_r_package.xml
--- a/elastic_r_package.xml	Tue Mar 27 14:04:48 2018 -0400
+++ b/elastic_r_package.xml	Tue Mar 27 14:09:32 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="tool_id" name="elastic R package" version="1.0.0">
+<tool id="tool_id" name="elastic R tidyverse" version="1.0.0">
     <macros>
         <import>elastic_r_package_wrappers_macros.xml</import>
     </macros>
@@ -9,8 +9,7 @@
     <expand macro="stdio" />
     <expand macro="shell_command" />
     <inputs>
-        <expand macro="function_name" />
-        <expand macro="function_arguments" />
+        <expand macro="function_components" />
     </inputs>
     <outputs>
         <expand macro="output_set" />
diff -r 8bd397b57e1c -r 3de03ccbf8fb elastic_r_package_wrappers_macros.xml
--- a/elastic_r_package_wrappers_macros.xml	Tue Mar 27 14:04:48 2018 -0400
+++ b/elastic_r_package_wrappers_macros.xml	Tue Mar 27 14:09:32 2018 -0400
@@ -13,7 +13,7 @@
         </stdio>
     </xml>
 
-    <xml name="function_component">
+    <xml name="function_components">
         <repeat name="function_component_repeat" title="call a function" min="1" default="1">
             <expand macro="function_name" />
             <expand macro="function_arguments" />
@@ -32,7 +32,7 @@
 
     <!--input values: string, float and integer-->
     <xml name="function_arguments">
-        <repeat name="regular_argument_value" title="        INPUT VALUE: from user input" min="0" default="0">
+        <repeat name="regular_argument_value" title="|        INPUT VALUE: from user input" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="argument value"  />
             <param type="select" name="argument_type"  label="argument type">
@@ -41,23 +41,23 @@
                 <option value="boolean" selected="true">boolean</option>
             </param>
         </repeat>
-        <repeat name="rdata_argument_value" title="        INPUT VALUE: from RData" min="0" default="0">
+        <repeat name="rdata_argument_value" title="|        INPUT VALUE: from RData" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="data" format="rdata" name="argument_value" optional="false" label="RData output"  />
         </repeat>
-        <repeat name="function_argument_value" title="        INPUT VALUE: from function return" min="0" default="0">
+        <repeat name="function_argument_value" title="|        INPUT VALUE: from function return" min="0" default="0">
             <param type="text" name="argument" optional="false" label="argument"  />
             <expand macro="function_name" />
             <expand macro="nested_function_arguments" />
         </repeat>
-        <param type="select" name="connect_function" label="connect function">
+        <param type="select" name="connect_to_next_function" label="connect to next function">
             <option value="%>%" selected="false">pipe (%>%)</option>
             <option value="+" selected="false">plus (+)</option>
         </param>
     </xml>
 
     <xml name="nested_function_arguments">
-        <repeat name="regular_argument_value" title="INPUT VALUE: string/numeric/boolean" min="0" default="0">
+        <repeat name="regular_argument_value" title="|        INPUT VALUE: string/numeric/boolean" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="argument value"  />
             <param type="select" name="argument_type"  label="argument type">
@@ -66,7 +66,7 @@
                 <option value="boolean" selected="true">boolean</option>
             </param>
         </repeat>
-        <repeat name="rdata_argument_value" title="INPUT VALUE: from RData" min="0" default="0">
+        <repeat name="rdata_argument_value" title="|        INPUT VALUE: from RData" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="RData output"  />
         </repeat>