changeset 2:fb591fc7241c draft

Improved some datatype handling
author galaxyp
date Thu, 20 Jun 2013 11:02:36 -0400
parents 7a74818e0eeb
children 679a4b0041a4
files datatypes_conf.xml dbtoolkit-4.2/LICENSE-2.0.txt dbtoolkit-4.2/dbtoolkit-4.2.jar dbtoolkit-4.2/lib/jargs-1.0.jar dbtoolkit-4.2/lib/log4j-1.2.12.jar dbtoolkit-4.2/lib/utilities-3.8.7.jar galaxyp-toolshed-peptideshaker peptide_shaker.xml peptideshaker.py reverse.py reverse.xml
diffstat 11 files changed, 309 insertions(+), 1491 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/datatypes_conf.xml	Thu Jun 20 11:02:36 2013 -0400
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<datatypes>
+  <datatype_files>
+    <datatype_file name="peptideshaker.py"/>
+  </datatype_files>
+  <registration>
+    <datatype extension="cps" type="galaxy.datatypes.peptideshaker:Cps" display_in_upload="true" />
+  </registration>
+</datatypes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dbtoolkit-4.2/LICENSE-2.0.txt	Thu Jun 20 11:02:36 2013 -0400
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
Binary file dbtoolkit-4.2/dbtoolkit-4.2.jar has changed
Binary file dbtoolkit-4.2/lib/jargs-1.0.jar has changed
Binary file dbtoolkit-4.2/lib/log4j-1.2.12.jar has changed
Binary file dbtoolkit-4.2/lib/utilities-3.8.7.jar has changed
--- a/galaxyp-toolshed-peptideshaker	Thu Jun 20 10:53:16 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1488 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <meta charset="utf-8">
-  <title>
-  galaxyp / galaxyp-toolshed-peptideshaker   &mdash; Bitbucket
-</title>
-  <link rel="icon" type="image/png" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/img/favicon.png">
-  <meta id="bb-canon-url" name="bb-canon-url" content="https://bitbucket.org">
-  
-  
-<link rel="stylesheet" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/compressed/css/4c9fb96cff70.css" type="text/css" />
-<link rel="stylesheet" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/compressed/css/8cc3605411c7.css" type="text/css" />
-
-  <!--[if lt IE 9]><link rel="stylesheet" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/css/aui/aui-ie.css" media="all"><![endif]-->
-  <!--[if IE 9]><link rel="stylesheet" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/css/aui/aui-ie9.css" media="all"><![endif]-->
-  <!--[if IE]><link rel="stylesheet" href="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/css/aui-overrides-ie.css" media="all"><![endif]-->
-  <meta name="description" content="
-  
-    This repository contains Galaxy tools for running PeptideShaker (http://code.google.com/p/peptide-shaker/), an application for integrating proteomics identification data from multiple search engines.
-  
-"/>
-  <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
-  
-  
-  <link href="/galaxyp/galaxyp-toolshed-peptideshaker/rss" rel="alternate nofollow" type="application/rss+xml" title="RSS feed for galaxyp-toolshed-peptideshaker" />
-
-  <meta name="twitter:card" content="summary"/>
-  <meta name="twitter:site" content="@bitbucket"/>
-  <meta name="og:type" content="bitbucket:hgrepository"/>
-  <meta name="og:title" content="galaxyp / galaxyp-toolshed-peptideshaker"/>
-  <meta name="og:url" content="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"/>
-  
-    <meta name="og:description" content="This repository contains Galaxy tools for running PeptideShaker (http://code.google.com/p/peptide-shaker/), an application for integrating proteomics identification data from multiple search engines."/>
-  
-  
-    <meta name="og:image" content="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/img/language-avatars/default_128.png"/>
-  
-
-  
-    <script src="//cdn.optimizely.com/js/4079040.js"></script>
-  
-<script type="text/javascript">var NREUMQ=NREUMQ||[];NREUMQ.push(["mark","firstbyte",new Date().getTime()]);</script></head>
-<body class="production "
-      data-base-url="https://bitbucket.org"
-      data-no-avatar-image="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/img/default_avatar/16/user_blue.png"
-      data-current-user="{&quot;isKbdShortcutsEnabled&quot;: true, &quot;isSshEnabled&quot;: false, &quot;isAuthenticated&quot;: false}"
-       data-current-repo="{&quot;scm&quot;: &quot;hg&quot;, &quot;language&quot;: &quot;&quot;, &quot;creator&quot;: {&quot;username&quot;: &quot;jmchilton&quot;}, &quot;id&quot;: 2238689, &quot;readOnly&quot;: false, &quot;owner&quot;: {&quot;username&quot;: &quot;galaxyp&quot;, &quot;isTeam&quot;: true}, &quot;pygmentsLanguage&quot;: null, &quot;slug&quot;: &quot;galaxyp-toolshed-peptideshaker&quot;}"
-      
-      
-      
-      
-      >
-<script type="text/javascript" src="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/compressed/js/e98deabf8a2e.js"></script>
-<div id="page">
-  <div id="wrapper">
-    
-    <header id="header" role="banner">
-      
-        
-      
-      <nav class="aui-header aui-dropdown2-trigger-group" role="navigation">
-        <div class="aui-header-inner">
-          <div class="aui-header-primary">
-            <h1 class="aui-header-logo aui-header-logo-bitbucket logged-out">
-              <a href="/" class="aui-nav-imagelink" id="logo-link">
-                <span class="aui-header-logo-device">Bitbucket</span>
-              </a>
-            </h1>
-            
-            <script id="repo-dropdown-template" type="text/html">
-  
-
-[[#hasViewed]]
-  <div class="aui-dropdown2-section">
-    <strong class="viewed">Recently viewed</strong>
-    <ul class="aui-list-truncate">
-      [[#viewed]]
-        <li class="[[#is_private]]private[[/is_private]][[^is_private]]public[[/is_private]] repository">
-          <a href="[[url]]" title="[[owner]]/[[name]]" class=" aui-icon-container">
-            <img class="repo-avatar size16" src="[[{avatar}]]" alt="[[owner]]/[[name]] avatar"/>
-            [[owner]] / [[name]]
-          </a>
-        </li>
-      [[/viewed]]
-    </ul>
-  </div>
-[[/hasViewed]]
-[[#hasUpdated]]
-<div class="aui-dropdown2-section">
-  <strong class="updated">Recently updated</strong>
-  <ul class="aui-list-truncate">
-    [[#updated]]
-    <li class="[[#is_private]]private[[/is_private]][[^is_private]]public[[/is_private]] repository">
-      <a href="[[url]]" title="[[owner]]/[[name]]" class=" aui-icon-container">
-        <img class="repo-avatar size16" src="[[{avatar}]]" alt="[[owner]]/[[name]] avatar"/>
-        [[owner]] / [[name]]
-      </a>
-    </li>
-    [[/updated]]
-  </ul>
-</div>
-[[/hasUpdated]]
-
-</script>
-            <ul role="menu" class="aui-nav">
-              
-                <li>
-                  <a href="/plans">
-                      Pricing &amp; signup
-                  </a>
-                </li>
-                <li>
-                  <a href="/whats-new">
-                    What's new
-                  </a>
-                </li>
-              
-            </ul>
-            
-          </div>
-          <div class="aui-header-secondary">
-            
-            <ul role="menu" class="aui-nav">
-              <li>
-                <form action="/repo/all" method="get" class="aui-quicksearch">
-                  <label for="search-query" class="assistive">owner/repository</label>
-                  <input id="search-query" class="search" type="text" placeholder="owner/repository" name="name">
-                </form>
-              </li>
-              <li>
-                <a class="aui-dropdown2-trigger"aria-controls="header-help-dropdown" aria-owns="header-help-dropdown"
-                   aria-haspopup="true" data-container="#header .aui-header-inner" href="#header-help-dropdown">
-                  <span class="aui-icon aui-icon-small aui-iconfont-help">Help</span><span class="aui-icon-dropdown"></span>
-                </a>
-                <nav id="header-help-dropdown" class="aui-dropdown2 aui-style-default aui-dropdown2-in-header" aria-hidden="true">
-                  <div class="aui-dropdown2-section">
-                    <ul>
-                      <li>
-                        <a href="/whats-new" id="features-link">
-                          What's new
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                  <div class="aui-dropdown2-section">
-                    <ul>
-                      <li>
-                        <a class="support-ga"
-                           data-support-gaq-page="DocumentationHome"
-                           href="https://confluence.atlassian.com/x/bgozDQ"
-                           target="_blank">
-                          Documentation
-                        </a>
-                      </li>
-                      <li>
-                        <a class="support-ga"
-                           data-support-gaq-page="Documentation101"
-                           href="https://confluence.atlassian.com/x/cgozDQ"
-                           target="_blank">
-                          Bitbucket 101
-                        </a>
-                      </li>
-                      <li>
-                        <a class="support-ga"
-                           data-support-gaq-page="DocumentationKB"
-                           href="https://confluence.atlassian.com/x/2w4zDQ"
-                           target="_blank">
-                          Knowledge base
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                  <div class="aui-dropdown2-section">
-                    <ul>
-                      <li>
-                        <a class="support-ga"
-                           data-support-gaq-page="Answers"
-                           href="https://answers.atlassian.com/tags/bitbucket/"
-                           target="_blank">
-                          Bitbucket on Atlassian Answers
-                        </a>
-                      </li>
-                      <li>
-                        <a class="support-ga"
-                           data-support-gaq-page="Home"
-                           href="/support">
-                        Support
-                      </a>
-                      </li>
-                    </ul>
-                  </div>
-                </nav>
-              </li>
-                
-                  
-                
-              
-                  <li>
-                    <a class="aui-button aui-button-primary aui-style" href="/account/signup/">
-                      Sign up
-                    </a>
-                  </li>
-                <li id="user-options">
-                  <a href="/account/signin/?next=/galaxyp/galaxyp-toolshed-peptideshaker" class="aui-nav-link login-link">Log in</a>
-                </li>
-              
-            </ul>
-            
-          </div>
-        </div>
-      </nav>
-    </header>
-      <header id="account-warning" role="banner"
-              class="aui-message-banner warning ">
-        <div class="center-content">
-          <span class="aui-icon aui-icon-warning"></span>
-          <span class="message">
-            
-          </span>
-        </div>
-      </header>
-    
-      <header id="aui-message-bar">
-        
-      </header>
-    
-    
-  <header id="repo-warning" role="banner" class="aui-message-banner warning">
-    <div class="center-content">
-      <span class="aui-icon aui-icon-warning"></span>
-      <span class="message">
-      </span>
-    </div>
-  </header>
-  <script id="repo-warning-template" type="text/html">
-  
-
-
-
-
-  This repository's ownership is pending transfer to <a href="/[[username]]">[[username]]</a>.
-  Visit the <a href="/galaxyp/galaxyp-toolshed-peptideshaker/admin/transfer">transfer repository page</a> to view more details.
-
-
-</script>
-  <header id="repo-header" class="subhead row">
-    <div class="center-content">
-      <div class="repo-summary with-repo-watch">
-        <a class="repo-avatar-link" href="/galaxyp/galaxyp-toolshed-peptideshaker">
-          <span class="repo-avatar-container size64" title="galaxyp/galaxyp-toolshed-peptideshaker">
-  <img alt="galaxyp/galaxyp-toolshed-peptideshaker" src="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/img/language-avatars/default_64.png">
-</span>
-
-          
-        </a>
-        <h1><a class="repo-link" href="/galaxyp/galaxyp-toolshed-peptideshaker">galaxyp-toolshed-peptideshaker</a></h1>
-        <ul class="repo-metadata clearfix">
-          <li>
-            <a class="user" href="/galaxyp">
-              <span class="aui-icon aui-icon-small aui-iconfont-user">User icon</span>
-              <span>galaxyp</span>
-            </a>
-          </li>
-          
-          
-          
-        </ul>
-      </div>
-      <div id="repo-toolbar" class="bb-toolbar">
-        
-        <div class="aui-buttons">
-          <a id="repo-clone-button" class="aui-button aui-style" href="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker">
-            <span class="aui-icon aui-icon-small aui-iconfont-devtools-clone"></span>
-            <span>Clone</span>
-            <span class="aui-icon-dropdown"></span>
-          </a>
-          <a id="fork-button" class="aui-button aui-style"
-             href="/galaxyp/galaxyp-toolshed-peptideshaker/fork">
-            <span class="aui-icon aui-icon-small aui-iconfont-devtools-fork"></span>
-            <span>Fork</span>
-          </a>
-        </div>
-        <div class="aui-buttons">
-          <a id="compare-button" class="aui-button aui-style"
-             href="/galaxyp/galaxyp-toolshed-peptideshaker/compare">
-            <span class="icon compare"></span>
-            <span>Compare</span>
-          </a>
-          <a id="pull-request-button" class="aui-button aui-style"
-             href="/galaxyp/galaxyp-toolshed-peptideshaker/pull-request/new">
-            <span class="aui-icon aui-icon-small aui-iconfont-devtools-pull-request">Pull request icon</span>
-            <span>Pull request</span>
-          </a>
-        </div>
-        
-        
-        
-
-<div id="repo-clone-dialog" class="clone-dialog hidden">
-  
-<div class="clone-url">
-  <div class="aui-buttons">
-    <a href="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-       class="aui-button aui-style aui-dropdown2-trigger" aria-haspopup="true"
-       aria-owns="clone-url-dropdown-header">
-      <span class="dropdown-text">HTTPS</span>
-    </a>
-    <div id="clone-url-dropdown-header" class="aui-dropdown2 aui-style-default">
-      <ul class="aui-list-truncate">
-        <li>
-          <a href="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-              data-command="hg clone https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-            class="item-link https">HTTPS
-          </a>
-        </li>
-        <li>
-          <a href="ssh://hg@bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-              data-command="hg clone ssh://hg@bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-            class="item-link ssh">SSH
-          </a>
-        </li>
-      </ul>
-    </div>
-    <input type="text" readonly="readonly" value="hg clone https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker">
-  </div>
-  
-  <p>Need help cloning? Visit
-     <a href="https://confluence.atlassian.com/x/cgozDQ" target="_blank">Bitbucket 101</a>.</p>
-  
-</div>
-
-
-  
-  
-  
-
-<div class="clone-in-sourcetree"
-  data-https-url="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-  data-ssh-url="ssh://hg@bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker">
-  <p><button class="aui-button aui-style aui-button-primary">Clone in SourceTree</button></p>
-
-
-  <p class="windows-text">
-      
-        <a href="http://www.sourcetreeapp.com/?utm_source=internal&amp;utm_medium=link&amp;utm_campaign=clone_repo_win" target="_blank">SourceTree</a>
-        is a free Windows client by Atlassian for Git and Subversion.
-      
-  </p>
-  <p class="mac-text">
-      
-        <a href="http://www.sourcetreeapp.com/?utm_source=internal&amp;utm_medium=link&amp;utm_campaign=clone_repo_mac" target="_blank">SourceTree</a>
-        is a free Mac client by Atlassian for Git, Mercurial, and Subversion.
-      
-  </p>
-</div>
-
-  
-</div>
-
-      </div>
-    </div>
-    <div class="clearfix"></div>
-  </header>
-  <nav id="repo-tabs" class="aui-navgroup aui-navgroup-horizontal aui-navgroup-horizontal-roomy">
-    <div class="aui-navgroup-inner">
-      <div class="aui-navgroup-primary">
-        <ul class="aui-nav">
-          
-            <li class="aui-nav-selected">
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/overview" id="repo-overview-link">Overview</a>
-            </li>
-          
-          
-            <li>
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/src" id="repo-source-link">Source</a>
-            </li>
-          
-          
-            <li>
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits" id="repo-commits-link">
-                Commits
-              </a>
-            </li>
-          
-          
-            <li>
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/pull-requests" id="repo-pullrequests-link">
-                Pull requests
-                
-                  
-                
-              </a>
-            </li>
-          
-          
-            
-          
-            <li id="issues-tab" class="
-              
-                
-              
-            ">
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/issues?status=new&amp;status=open" id="repo-issues-link">
-                Issues
-                
-                  
-                
-              </a>
-            </li>
-            <li id="wiki-tab" class="
-                
-                  
-                
-              ">
-              <a href="/galaxyp/galaxyp-toolshed-peptideshaker/wiki" id="repo-wiki-link">Wiki</a>
-            </li>
-          
-            <li>
-            <a href="/galaxyp/galaxyp-toolshed-peptideshaker/downloads" id="repo-downloads-link">
-              Downloads
-              
-                
-              
-            </a>
-            </li>
-          
-        </ul>
-      </div>
-      <div class="aui-navgroup-secondary">
-        <ul class="aui-nav">
-          
-        </ul>
-      </div>
-    </div>
-  </nav>
-
-    <div id="content" role="main">
-      
-  <div id="repo-content">
-    
-  <div id="repo-overview">
-  
-    
-    
-      <div class="column">
-        
-          
-<section class="bb-banner" id="signup-banner">
-  <div>
-    <p>
-      
-        Bitbucket is a code hosting site with unlimited public and private
-        repositories.  We're also free for small teams!
-      
-    </p>
-    <a class="aui-button aui-button-primary aui-style signup-button" href="/account/signup/">Sign up for free</a>
-    <span class="close aui-icon aui-icon-small aui-iconfont-close-dialog" title="Dismiss this banner">Close</span>
-  </div>
-</section>
-
-        
-        
-          
-            
-              <section id="readme">
-                
-                  <article class="readme file">
-                    <p>Tool wrapper for SearchGUI + PeptideShaker. This tool takes any number
-of mgf files and performs X! Tandem and OMSSA searches on these via
-SearchGUI and merges the results using PeptideShaker.</p>
-<p>For Galaxy-P we are installing this tool via CloudBioLinux
-(https://github.com/jmchilton/cloudbiolinux/blob/proteomics/cloudbio/custom/bio_proteomics.py). While
-this fabric script may not be exactly appropriate for your environment
-it may serve as a template for how to install this software. In
-particular these tools require CLI wrappers to be placed for
-PeptideShaker and SearchGUI that can be installed as demostrated in
-these fabric functions.</p>
-<p>Note: Also SearchGUI requires a version greater than 1.12.2 which
-contained several bugs preventing this from working on the
-command-line and via Linux.</p>
-<p>Also, PeptideShaker may require xvfb to simulate an X environment if
-this is installed on a headless server.</p>
-<h1 id="markdown-header-obtaining-tools">Obtaining Tools</h1>
-<p>Repositories for all Galaxy-P tools can be found at
-https:/bitbucket.org/galaxyp/.</p>
-<h1 id="markdown-header-contact">Contact</h1>
-<p>Please send suggestions for improvements and bug reports to
-jmchilton@gmail.com.</p>
-<h1 id="markdown-header-license">License</h1>
-<p>All Galaxy-P tools are licensed under the Apache License Version 2.0
-unless otherwise documented.</p>
-<h1 id="markdown-header-tool-versioning">Tool Versioning</h1>
-<p>Galaxy-P tools will have versions of the form X.Y.Z. Versions
-differing only after the second decimal should be completely
-compatible with each other. Breaking changes should result in an
-increment of the number before and/or after the first decimal. All
-tools of version less than 1.0.0 should be considered beta.</p>
-                  </article>
-                
-              </section>
-            
-          
-        
-        <section id="repo-activity">
-          <h1>
-            Recent activity
-            <a href="/galaxyp/galaxyp-toolshed-peptideshaker/rss" class="icon rss">RSS feed fo galaxyp-toolshed-peptideshaker</a>
-          </h1>
-          
-            
-              
-                
-
-
-   
-
-
-<div class="newsfeed">
-  
-    
-      
-        
-          
-            
-            
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/galaxyp"><img alt="galaxyp" src="https://secure.gravatar.com/avatar/655358b258b3fbd64aa5c6f42adade4e?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_team_avatar%2F32%2Fteam_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/galaxyp">galaxyp</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-06-19T22:19:56+00:00">16 hours ago</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/80ef7cf0d97a14a59b39f2d7eb683531cc02056a" class="changeset-hash">80ef7cf</a>
-                  -
-                  
-                    
-                      improved some datatypes
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              </article>
-            
-            
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-06-07T03:03:07+00:00">2013-06-07</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/113acce8b7eea4ed179411f6704ab5a5d8245da8" class="changeset-hash">113acce</a>
-                  -
-                  
-                    
-                      Ensure unique Experiment/Sample names. Peptideshaker seems to potentially have clean up problem on errors otherwise.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-05-20T15:26:48+00:00">2013-05-20</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/6fa4a7ad242f1ce78db6eaec19099bd1b7f86b2f" class="changeset-hash">6fa4a7a</a>
-                  -
-                  
-                    
-                      Add script to create a target-decoy database for PeptideShaker - seems very picky about the format of the database.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 2 commits to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-05-13T18:51:02+00:00">2013-05-13</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/bf3730228118ac8adee5e5fc16f08ad5f9aaaf0e" class="changeset-hash">bf37302</a>
-                  -
-                  
-                    
-                      Add CPS datatype.
-                    
-                  
-                  </div>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/d63d2ed28d002156d5330d29afbf8afc54adfc3b" class="changeset-hash">d63d2ed</a>
-                  -
-                  
-                    
-                      Improve documentation.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-05-10T21:39:19+00:00">2013-05-10</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/a76da3b08725332a9dc746b3f4e886d047af2e40" class="changeset-hash">a76da3b</a>
-                  -
-                  
-                    
-                      Add license and documentation.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-05-10T21:33:27+00:00">2013-05-10</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/29ee7c62dfdc24848cc1111500d544c700ca9008" class="changeset-hash">29ee7c6</a>
-                  -
-                  
-                    
-                      Add sample loc file for toolshed.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-04-12T18:58:24+00:00">2013-04-12</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/8384b7acd805161da0b61203688c61ed0b11b72b" class="changeset-hash">8384b7a</a>
-                  -
-                  
-                    
-                      Fix modification handling.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-04-11T18:38:44+00:00">2013-04-11</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/735b677030185833e6dee7a38e37a0b8ef49a2fb" class="changeset-hash">735b677</a>
-                  -
-                  
-                    
-                      PeptideShaker modifications need to be all lower case.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 2 commits to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-04-08T19:54:06+00:00">2013-04-08</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/1f4e30851033eb83986c2d793ba894604f9fe1b0" class="changeset-hash">1f4e308</a>
-                  -
-                  
-                    
-                      Implement modifications for peptide_shaker wrapper.
-                    
-                  
-                  </div>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/90c86636c57d28ba6f369e0e0d1aa097c46f5d4b" class="changeset-hash">90c8663</a>
-                  -
-                  
-                    
-                      Initial work on building modification list for searchGUI.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-        
-      
-    
-  
-    
-      
-        
-          
-            
-              
-                
-            
-              <article class="news-item commit">
-                <span class="icon commit"></span>
-                
-
-
-  <a href="/jmchilton"><img alt="John Chilton" src="https://secure.gravatar.com/avatar/86cbb595c758989c14ae715c44588998?d=https%3A%2F%2Fd3oaxc4q5k2d6q.cloudfront.net%2Fm%2F968d9745b7be%2Fimg%2Fdefault_avatar%2F32%2Fuser_blue.png&amp;s=32" class="avatar avatar32" /></a>
-
-
-                <p>
-                  
-
-  <a href="/jmchilton">John Chilton</a>
-
-                  pushed 1 commit to 
-
-
-<a href="/galaxyp/galaxyp-toolshed-peptideshaker" title="galaxyp/galaxyp-toolshed-peptideshaker">galaxyp/galaxyp-toolshed-peptideshaker</a>
-
-
-                </p>
-                <time datetime="2013-03-19T19:23:06+00:00">2013-03-19</time>
-                
-                  <div class="changeset">
-                  <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/21b540795f0663a4633a53c78d733746a463167d" class="changeset-hash">21b5407</a>
-                  -
-                  
-                    
-                      Fix label on protein report.
-                    
-                  
-                  </div>
-                
-                
-              </article>
-            
-
-              
-            
-          
-          
-            </article>
-          
-        
-      
-    
-  
-</div>
-
-
-
-              
-            
-          
-        </section>
-      </div>
-
-      <div class="column">
-        
-
-
-
-        <section id="repo-stats">
-          
-<div class="clone-url">
-  <div class="aui-buttons">
-    <a href="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-       class="aui-button aui-style aui-dropdown2-trigger" aria-haspopup="true"
-       aria-owns="clone-url-dropdown-overview">
-      <span class="dropdown-text">HTTPS</span>
-    </a>
-    <div id="clone-url-dropdown-overview" class="aui-dropdown2 aui-style-default">
-      <ul class="aui-list-truncate">
-        <li>
-          <a href="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-              data-command="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-            class="item-link https">HTTPS
-          </a>
-        </li>
-        <li>
-          <a href="ssh://hg@bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-              data-command="ssh://hg@bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker"
-            
-            class="item-link ssh">SSH
-          </a>
-        </li>
-      </ul>
-    </div>
-    <input type="text" readonly="readonly" value="https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker">
-  </div>
-  
-</div>
-
-
-          <ul class="stats">
-            
-              <li class="branches">
-                <a href="#branches" id="branches-dialog-trigger"
-                   data-url="/api/1.0/repositories/galaxyp/galaxyp-toolshed-peptideshaker/branches-tags"
-                   data-template="branches-overview-template">
-                  <span class="aui-icon aui-icon-large aui-iconfont-devtools-branch"></span>
-                  
-                    <span class="value">1</span> Branch
-                  
-                </a>
-              </li>
-              <li class="tags">
-                <a href="#tags" id="tags-dialog-trigger"
-                   data-url="/api/1.0/repositories/galaxyp/galaxyp-toolshed-peptideshaker/branches-tags"
-                   data-template="tags-overview-template">
-                  <span class="aui-icon aui-icon-large aui-iconfont-devtools-tag"></span>
-                  
-                    <span class="value">1</span> Tag
-                  
-                </a>
-              </li>
-              <li class="forks">
-                <a href="#forks" id="forks-dialog-trigger"
-                   data-url="/api/1.0/repositories/galaxyp/galaxyp-toolshed-peptideshaker/forks"
-                   data-template="forks-overview-template">
-                  <span class="aui-icon aui-icon-large aui-iconfont-devtools-fork"></span>
-                  
-                    <span class="value">0</span> Forks
-                  
-                </a>
-              </li>
-            
-            <li class="followers">
-              <a href="#followers" id="followers-dialog-trigger"
-                  data-url="/api/1.0/repositories/galaxyp/galaxyp-toolshed-peptideshaker/followers"
-                  data-template="watchers-overview-template">
-                <span class="aui-icon aui-icon-large aui-iconfont-star"></span>
-                
-                  <span class="value">2</span> Watchers
-                
-              </a>
-            </li>
-          </ul>
-
-          <script id="branches-overview-template" type="text/html">
-  
-
-<div class="tabbed-filter-widget repo-stats-dialog branches" id="branches-dialog">
-  <div class="tabbed-filter">
-    <input placeholder="Filter branches" class="filter-box" autosave="branch-dropdown-2238689" type="text">
-  </div>
-  <div class="tab-pane active-pane branches" id="branch-list">
-    <ol class="filter-list[[^branches]] empty[[/branches]]">
-      <li class="empty-msg">No matching branches</li>
-      [[#branches]]
-        <li class="comprev filter-item">
-          <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/branch/[[encodedName]]" title="Browse source of [[name]]">[[name]]</a>
-          [[^mainbranch]]
-            <a rel="nofollow" class="compare"
-               href="/galaxyp/galaxyp-toolshed-peptideshaker/compare/[[encodedName]].."
-               title="Show changes between [[name]] and the main branch.">Compare</a>
-          [[/mainbranch]]
-        </li>
-      [[/branches]]
-    </ol>
-  </div>
-</div>
-
-</script>
-          <script id="tags-overview-template" type="text/html">
-  
-
-<div class="tabbed-filter-widget repo-stats-dialog tags" id="tags-dialog">
-    <div class="tabbed-filter">
-      <input placeholder="Filter tags" class="filter-box" autosave="tag-dropdown-2238689" type="text">
-    </div>
-    <div class="tab-pane active-pane tags" id="tag-list">
-    <ol class="filter-list[[^tags]] empty[[/tags]]">
-      <li class="empty-msg">No matching tags</li>
-      [[#tags]]
-        <li class="comprev filter-item">
-          <a href="/galaxyp/galaxyp-toolshed-peptideshaker/commits/tag/[[encodedName]]" title="Browse source of [[name]]">[[name]]</a>
-            <a rel="nofollow" class="compare"
-               href="/galaxyp/galaxyp-toolshed-peptideshaker/compare/[[encodedName]].."
-               title="Show changes between [[name]] and the main branch.">Compare</a>
-        </li>
-      [[/tags]]
-    </ol>
-  </div>
-</div>
-
-</script>
-          <script id="forks-overview-template" type="text/html">
-  
-
-<div class="tabbed-filter-widget repo-stats-dialog forks" id="forks-dialog">
-    <div class="tabbed-filter">
-      <input placeholder="Filter forks" class="filter-box" autosave="fork-dropdown-2238689" type="text">
-    </div>
-    <div class="tab-pane active-pane forks" id="fork-list">
-    <ol class="filter-list[[^forks]] empty[[/forks]]">
-      <li class="empty-msg">No matching forks</li>
-      [[#forks]]
-        <li class="comprev filter-item">
-          <a href="/[[owner.username]]/[[slug]]" title="[[owner.username]]/[[slug]]">[[owner.username]]/[[slug]]</a>
-            <a rel="nofollow" class="compare"
-               href="/galaxyp/galaxyp-toolshed-peptideshaker/compare/[[owner.username]]/[[slug]].."
-               title="Show changes between [[owner.username]]/[[slug]] and this repository.">Compare</a>
-        </li>
-      [[/forks]]
-    </ol>
-  </div>
-</div>
-
-</script>
-          <script id="watchers-overview-template" type="text/html">
-  
-
-<div class="followers-dialog repo-stats-dialog" id="followers-dialog">
-  <div id="followers-list" class="followers-list">
-    <ol[[^followers]] class="empty"[[/followers]]>
-      <li class="empty-msg">No watchers yet</li>
-      [[#followers]]
-        <li>
-          <a href="/[[username]]" title="[[display_name]]">
-            <img alt="[[username]]" src="[[avatar]]" class="avatar avatar32" />
-          </a>
-        </li>
-      [[/followers]]
-    </ol>
-  </div>
-</div>
-</script>
-
-          <dl class="metadata">
-            <dt>Owner</dt>
-            <dd><a href="/galaxyp">galaxyp</a></dd>
-
-            
-
-            <dt>Access level</dt>
-            <dd>Public</dd>
-
-            <dt>Type</dt>
-            <dd>Mercurial</dd>
-
-            
-
-            <dt>Last updated</dt>
-            <dd><time datetime="2013-06-20T00:19:56.024767">16 hours ago</time></dd>
-
-            <dt>Created</dt>
-            <dd><time datetime="2013-02-25T17:50:29.792158">2013-02-25</time></dd>
-
-            <dt>Size</dt>
-            <dd>
-              1.4 MB
-              <a rel="nofollow"
-              
-                  href="/galaxyp/galaxyp-toolshed-peptideshaker/get/80ef7cf0d97a.zip"
-                
-              >(download)</a>
-            </dd>
-            
-              
-            
-          </dl>
-        </section>
-        
-          
-            
-          
-        
-      </div>
-      <div class="clearfix"></div>
-    
-    
-    
-  </div>
-
-  
-
-  </div>
-  
-
-<form id="file-search-form" action="#"
-  
-  
-  >
-  <input type="text" id="file-search-query" class="loading">
-  <div id="filtered-files"></div>
-  <div class="tip"><em>Tip:</em> Filter by directory path e.g. <strong>/media app.js</strong> to search for public<strong>/media/app.js</strong>.</div>
-  <div class="tip"><em>Tip:</em> Use camelCasing e.g. <strong>ProjME</strong> to search for <strong>ProjectModifiedE</strong>vent.java.</div>
-  <div class="tip"><em>Tip:</em> Filter by extension type e.g. <strong>/repo .js</strong> to search for all <strong>.js</strong> files in the <strong>/repo</strong> directory.</div>
-  <div class="tip"><em>Tip:</em> Separate your search with spaces e.g. <strong>/ssh pom.xml</strong> to search for src<strong>/ssh/pom.xml</strong>.</div>
-  <div class="tip"><em>Tip:</em> Use ↑ and ↓ arrow keys to navigate and <strong>return</strong> to view the file.</div>
-  <div class="tip mod-osx"><em>Tip:</em> You can also navigate files with <strong>Ctrl+j</strong> <em>(next)</em> and <strong>Ctrl+k</strong> <em>(previous)</em> and view the file with <strong>Ctrl+o</strong>.</div>
-  <div class="tip mod-win"><em>Tip:</em> You can also navigate files with <strong>Alt+j</strong> <em>(next)</em> and <strong>Alt+k</strong> <em>(previous)</em> and view the file with <strong>Alt+o</strong>.</div>
-  <script id="filtered-files-template" type="text/html">
-  
-
-<table class="aui bb-list">
-  <thead>
-    <tr class="assistive">
-      <th class="name">Filename</th>
-    </tr>
-  </thead>
-  <tbody>
-    [[#files]]
-    <tr class="iterable-item">
-      <td class="name [[#isDirectory]]directory[[/isDirectory]]">
-        <span class="aui-icon aui-icon-small[[#isDirectory]] aui-iconfont-devtools-folder-closed[[/isDirectory]][[^isDirectory]] aui-iconfont-devtools-file[[/isDirectory]]"></span>
-        <a href="/galaxyp/galaxyp-toolshed-peptideshaker/src/[[node]]/[[name]][[#branch]]?at=[[branch]][[/branch]]"
-           title="[[name]]" class="execute" tabindex="-1">
-          [[&highlightedName]]
-        </a>
-      </td>
-    </tr>
-    [[/files]]
-  </tbody>
-</table>
-
-</script>
-</form>
-
-
-    </div>
-  </div>
-  <footer id="footer" role="contentinfo">
-    <section class="footer-body">
-      <ul>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="Blog"
-               href="http://blog.bitbucket.org">Blog</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="Home"
-               href="/support">Support</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="DocumentationHome"
-               href="//confluence.atlassian.com/display/BITBUCKET">Documentation</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="DocumentationAPI"
-               href="//confluence.atlassian.com/x/IYBGDQ">API</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="SiteStatus"
-               href="http://status.bitbucket.org/">Server status</a>
-        </li>
-        <li>
-          <a class="support-ga" id="meta-info"
-               data-support-gaq-page="MetaInfo"
-               href="#">Version info</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="EndUserAgreement"
-               href="//www.atlassian.com/end-user-agreement?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=footer">Terms of service</a>
-        </li>
-        <li>
-          <a class="support-ga" target="_blank"
-               data-support-gaq-page="PrivacyPolicy"
-               href="//www.atlassian.com/company/privacy?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=footer">Privacy policy</a>
-        </li>
-      </ul>
-      <div id="meta-info-content" style="display: none;">
-        <ul>
-          
-            
-              <li>English</li>
-            
-          
-          <li>
-            <a class="support-ga" target="_blank"
-               data-support-gaq-page="GitDocumentation"
-               href="http://git-scm.com/">Git 1.8.2.3</a>
-          </li>
-          <li>
-            <a class="support-ga" target="_blank"
-               data-support-gaq-page="HgDocumentation"
-               href="http://mercurial.selenic.com/">Mercurial 2.2.2</a>
-          </li>
-          <li>
-            <a class="support-ga" target="_blank"
-               data-support-gaq-page="DjangoDocumentation"
-               href="https://www.djangoproject.com/">Django 1.3.7</a>
-          </li>
-          <li>
-            <a class="support-ga" target="_blank"
-               data-support-gaq-page="PythonDocumentation"
-               href="http://www.python.org/">Python 2.7.3</a>
-          </li>
-          <li>
-            <a class="support-ga" target="_blank"
-               data-support-gaq-page="DeployedVersion"
-               href="#">8ebcbfbebde3 / 968d9745b7be @ bitbucket01</a>
-          </li>
-        </ul>
-      </div>
-      <ul class="atlassian-links">
-        <li>
-          <a id="atlassian-jira-link" target="_blank" title="Track everything – bugs, tasks, deadlines, code – and pull reports to stay informed."
-             href="http://www.atlassian.com/software/jira?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=bitbucket_footer">JIRA</a>
-        </li>
-        <li>
-          <a id="atlassian-confluence-link" target="_blank" title="Content Creation, Collaboration & Knowledge Sharing for Teams."
-             href="http://www.atlassian.com/software/confluence/overview/team-collaboration-software?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=bitbucket_footer">Confluence</a>
-        </li>
-        <li>
-          <a id="atlassian-bamboo-link" target="_blank" title="Continuous integration and deployment, release management."
-             href="http://www.atlassian.com/software/bamboo/overview?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=bitbucket_footer">Bamboo</a>
-        </li>
-        <li>
-          <a id="atlassian-stash-link" target="_blank" title="Git repo management, behind your firewall and Enterprise-ready."
-             href="http://www.atlassian.com/software/stash/overview?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=bitbucket_footer">Stash</a>
-        </li>
-        <li>
-          <a id="atlassian-sourcetree-link" target="_blank" title="A free Git and Mercurial desktop client for Mac or Windows."
-             href="http://www.sourcetreeapp.com/?utm_source=bitbucket&amp;utm_medium=link&amp;utm_campaign=bitbucket_footer">SourceTree</a>
-        </li>
-      </ul>
-      <div id="footer-logo">
-        <a target="_blank" title="Bitbucket is developed by Atlassian in San Francisco."
-           href="http://www.atlassian.com?utm_source=bitbucket&amp;utm_medium=logo&amp;utm_campaign=bitbucket_footer">Atlassian</a>
-      </div>
-    </section>
-  </footer>
-  
-</div>
-
-  
-<script type="text/javascript" src="https://d3oaxc4q5k2d6q.cloudfront.net/m/968d9745b7be/compressed/js/61c7a95e7328.js"></script>
-
-<!-- This script exists purely for the benefit of our selenium tests -->
-<script>
-  setTimeout(function () {
-    BB.JsLoaded = true;
-  }, 3000);
-</script>
-
-
-
-<script>
-  (function () {
-    var ga = document.createElement('script');
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    ga.setAttribute('async', 'true');
-    document.documentElement.firstChild.appendChild(ga);
-  }());
-</script>
-
-
-
-  
-
-<script type="text/javascript">if(!NREUMQ.f){NREUMQ.f=function(){NREUMQ.push(["load",new Date().getTime()]);var e=document.createElement("script");e.type="text/javascript";e.src=(("http:"===document.location.protocol)?"http:":"https:")+"//"+"rpm-images.newrelic.com/42/eum/rum.js";document.body.appendChild(e);if(NREUMQ.a)NREUMQ.a();};NREUMQ.a=window.onload;window.onload=NREUMQ.f;};NREUMQ.push(["nrfj","beacon-1.newrelic.com","7d4a9813d0","295788","MgMDYhcHDUJVVEIKWAtJJ0MLBRdYW1kZAV4RBBRVDgMXH1VHRhAZFwMRWVdIFVhRQEVZWwQIBV8LAQ==",0,196,new Date().getTime(),"","","","",""]);</script></body>
-</html>
--- a/peptide_shaker.xml	Thu Jun 20 10:53:16 2013 -0400
+++ b/peptide_shaker.xml	Thu Jun 20 11:02:36 2013 -0400
@@ -4,6 +4,9 @@
     Peform protein identification combining X! Tandem and OMSSA (using SearchGUI) and PeptideShaker pipeline.
   </description>
   <command>
+    #from datetime import datetime
+    #set $exp_str = "Galaxy Experiment %s" % datetime.now().strftime("%Y%m%d%H%M%s")              
+    #set $samp_str = "Sample %s" % datetime.now().strftime("%Y%m%d%H%M%s")
     mkdir spectra;
     mkdir output;
     mkdir output_reports;
@@ -45,8 +48,8 @@
     #end if
     -db $input_database;
     PeptideShakerCLI \
-    -experiment 'Galaxy Experiment' \
-    -sample 'Sample' \ 
+    -experiment '$exp_str' \
+    -sample '$samp_str' \ 
     -replicate 1 \
     -spectrum_files \$cwd/spectra \
     -identification_files \$cwd/output \ 
@@ -210,12 +213,14 @@
   <help>
 **What it does**
 
+Runs multiple search engines (X! Tandem and OMSSA) on any number of MGF peak lists using the SearchGUI application and combines the result via PeptideShaker.
+
 ------
 
 **Citation**
 
 For the underlying tool, please cite `TODO`
 
-If you use this tool in Galaxy, please cite TODO
+If you use this tool in Galaxy, please cite Chilton J, et al. https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker
   </help>
 </tool>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/peptideshaker.py	Thu Jun 20 11:02:36 2013 -0400
@@ -0,0 +1,8 @@
+from galaxy.datatypes.binary import Binary
+
+
+class Cps(Binary):
+    """Class describing a PeptideShaker CPS files"""
+    file_ext = "cps"
+
+Binary.register_unsniffable_binary_ext('cps')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/reverse.py	Thu Jun 20 11:02:36 2013 -0400
@@ -0,0 +1,50 @@
+from os.path import dirname, join, abspath
+import sys
+from optparse import OptionParser
+from ConfigParser import SafeConfigParser
+import subprocess
+
+DEBUG = False
+
+
+def main():
+    (options, args) = _parse_args()
+    format_args = (options.input, options.output)
+    _run_shell("cat '%s' > '%s'" % format_args)
+    _run_dbtoolkit("com.compomics.dbtoolkit.toolkit.ReverseFASTADB", "'%s' | head --lines -4 >> '%s'" % \
+                       format_args)
+
+
+def _run_shell(command):
+    if DEBUG:
+        print "Running shell command %s" % command
+    _exec(command)
+
+
+def _run_dbtoolkit(java_class, args):
+    command_prefix = "java -cp %s" % _dbtoolkit_jar_path()
+    _exec("%s %s %s" % (command_prefix, java_class, args))
+
+
+def _dbtoolkit_jar_path():
+    py_path = __file__
+    jar_path = join(dirname(py_path), "dbtoolkit-4.2", "dbtoolkit-4.2.jar")
+    return jar_path
+
+def _exec(command):
+    proc = subprocess.Popen(args=command, shell=True)
+    return_code = proc.wait()
+    if return_code != 0:
+        print "Error executing command [%s], return code is %d" % (command, return_code)
+        sys.exit(return_code)
+
+
+def _parse_args():
+    parser = OptionParser()
+    parser.add_option("-i", "--input")
+    parser.add_option("-o", "--output")
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    main()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/reverse.xml	Thu Jun 20 11:02:36 2013 -0400
@@ -0,0 +1,32 @@
+<tool id="compomics_reverse" name="Create Target-Decoy Database" version="0.1.0">
+  <description>Creates a target-decoy database for use with Peptide Shaker</description>
+
+  <requirements>
+  </requirements>
+
+  <command interpreter="python">reverse.py --input='$input' --output='$output'</command>
+
+  <inputs>
+    <param format="fasta" name="input" type="data" label="FASTA Input" />
+  </inputs>
+
+  <outputs>
+    <data format="fasta" name="output" />
+  </outputs>
+
+  <help>
+**What it does**
+
+Given an input database, this tool will produce a target-decoy
+database in the format required by PeptideShaker using dbtoolkit.
+
+------
+
+**Citation**
+
+For the underlying tool, please cite `Martens et al. DBToolkit: processing protein databases for peptide-centric proteomics. Bioinformatics (2005) vol. 21 (17) pp. 3584-5`.
+
+If you use this tool in Galaxy, please cite Chilton J, et al. https://bitbucket.org/galaxyp/galaxyp-toolshed-peptideshaker .
+
+  </help>
+</tool>