pho 0.7.7 → 0.7.8

data/CHANGES

@@ -1,5 +1,26 @@
 Brief notes on significant changes and additions in each release
 
+== Version 0.7.8
+
+* Added --updates to allow for store/upload of only changed files
+
+* Recursive resets of collection directories
+
+* Fixed command-line code and RDF collection so that it supports all of the --retry, 
+  --force, and --traverse parameters
+  
+* Added --retry parameter for file uploads to allow retrying of failed uploads
+
+* Added --force parameter for file uploads to reset tracking files, allowing complete 
+  resends
+  
+* Fixed bug with directory uploads mangling file names
+
+* Fixed bug with tracking files with same root file name, e.g. foo.rdf and foo.css
+
+* Changed FileManager code so that all .ok and .fail fails are put into a shadow 
+  ".pho" directory, this avoids polluting directories with tracking files
+
 == Version 0.7.7
 
 * Included bug fixes from @kiyanwang into OAI support. Now properly handles resumption 

data/README

@@ -21,8 +21,7 @@ http://pho.rubyforge.net
 
 == Installation
 
-From the 0.5 release onwards, Pho is dependent on the Ruby bindings for the Redland RDF library.
-Ensure you have the librdf0 and librdf-ruby packages installed.
+From the 0.7.7 release onwards, Pho is dependent on the RDF.rb library and plugins for RDF parsing. 
 
 All other dependencies are for specific Ruby gems which should get automatically installed, 
 along with the Pho gem itself, by running:

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/clean'
 
 NAME = "pho"
-VER = "0.7.7"
+VER = "0.7.8"
 
 RDOC_OPTS = ['--quiet', '--title', 'Pho (Talis Platform Client) Reference', '--main', 'README']
 

data/bin/talis_store

@@ -133,6 +133,9 @@ MODE
       #{ PROGRAM } upload -u user -p pass -s my-dev1 -d ~/files
       #{ PROGRAM } upload -u user -p pass -s my-dev1 --traverse -d ~/files
       #{ PROGRAM } upload -u user -p pass -s my-dev1 --traverse -d ~/files --base assets
+      #{ PROGRAM } upload -u user -p pass -s my-dev1 --force -d ~/files
+      #{ PROGRAM } upload -u user -p pass -s my-dev1 --updates -d ~/files
+      #{ PROGRAM } upload -u user -p pass -s my-dev1 --retry -d ~/files
                
 OPTIONS
 
@@ -154,6 +157,10 @@ OPTIONS
     recursively store files or RDF
   --base
     base path for uploading files to content box
+  --force
+  	for directory uploads, force resending of files, removing previous tracking files    
+  --retry
+  	for directory uploads, triggers retry of previously failed requests only    
   --raw
     output raw API response, e.g. for fpmap and queryprofile
   --field
@@ -163,7 +170,9 @@ OPTIONS
   --weight
     weighting for a field in query profile
   --analyzer
-    name or uri of analyzer                
+    name or uri of analyzer
+  --updates
+  	for directory uploads, look for changed files and store/upload those only                
 EOL
 
 mode = ARGV.shift
@@ -179,6 +188,9 @@ opts = GetoptLong::new(
          [ "--traverse"        , "-t" , GetoptLong::NO_ARGUMENT ],
          [ "--base"            , "-b" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--raw"             , GetoptLong::NO_ARGUMENT ],
+         [ "--force"           , GetoptLong::NO_ARGUMENT ],
+         [ "--retry"           , GetoptLong::NO_ARGUMENT ],
+         [ "--updates"         , GetoptLong::NO_ARGUMENT ],         
          [ "--field"           , GetoptLong::REQUIRED_ARGUMENT ],                             
          [ "--predicate"       , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--weight"          , GetoptLong::REQUIRED_ARGUMENT ],
@@ -190,27 +202,6 @@ mode = "help" if opts["--help"]
 if mode == "help"
   USAGE.display  
 else
-
-  
-#  if !opts["username"]
-#    puts "no <username>"
-#    abort USAGE
-#  end
-#  if !opts["password"]
-#    puts "no <password>"
-#    abort USAGE
-#  end  
-#  if !opts["store"]
-#    puts "no <store>"
-#    abort USAGE
-#  end  
-#  
-#  storename = opts["store"]
-#  if !storename.start_with?("http")
-#      storename = "http://api.talis.com/stores/#{storename}"  
-#  end
-#  
-#  store = Pho::Store.new(storename, opts["username"], opts["password"])
   
   cmds = nil
   begin

data/doc/rdoc/classes/Pho/CommandLine.html

@@ -92,24 +92,25 @@ Class that implements the command-line behaviour
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000125">add_mapping</a>&nbsp;&nbsp;
-      <a href="#M000126">add_weight</a>&nbsp;&nbsp;
-      <a href="#M000114">backup</a>&nbsp;&nbsp;
-      <a href="#M000119">describe</a>&nbsp;&nbsp;
-      <a href="#M000123">fpmap</a>&nbsp;&nbsp;
-      <a href="#M000109">new</a>&nbsp;&nbsp;
-      <a href="#M000111">password</a>&nbsp;&nbsp;
-      <a href="#M000124">queryprofile</a>&nbsp;&nbsp;
-      <a href="#M000116">reindex</a>&nbsp;&nbsp;
-      <a href="#M000117">reset</a>&nbsp;&nbsp;
-      <a href="#M000118">restore</a>&nbsp;&nbsp;
-      <a href="#M000115">snapshot</a>&nbsp;&nbsp;
-      <a href="#M000120">sparql</a>&nbsp;&nbsp;
-      <a href="#M000113">status</a>&nbsp;&nbsp;
-      <a href="#M000121">store</a>&nbsp;&nbsp;
-      <a href="#M000112">storename</a>&nbsp;&nbsp;
-      <a href="#M000122">upload</a>&nbsp;&nbsp;
-      <a href="#M000110">username</a>&nbsp;&nbsp;
+      <a href="#M000132">add_mapping</a>&nbsp;&nbsp;
+      <a href="#M000133">add_weight</a>&nbsp;&nbsp;
+      <a href="#M000120">backup</a>&nbsp;&nbsp;
+      <a href="#M000125">describe</a>&nbsp;&nbsp;
+      <a href="#M000130">fpmap</a>&nbsp;&nbsp;
+      <a href="#M000115">new</a>&nbsp;&nbsp;
+      <a href="#M000117">password</a>&nbsp;&nbsp;
+      <a href="#M000131">queryprofile</a>&nbsp;&nbsp;
+      <a href="#M000122">reindex</a>&nbsp;&nbsp;
+      <a href="#M000123">reset</a>&nbsp;&nbsp;
+      <a href="#M000124">restore</a>&nbsp;&nbsp;
+      <a href="#M000121">snapshot</a>&nbsp;&nbsp;
+      <a href="#M000126">sparql</a>&nbsp;&nbsp;
+      <a href="#M000119">status</a>&nbsp;&nbsp;
+      <a href="#M000127">store</a>&nbsp;&nbsp;
+      <a href="#M000129">store_collection</a>&nbsp;&nbsp;
+      <a href="#M000118">storename</a>&nbsp;&nbsp;
+      <a href="#M000128">upload</a>&nbsp;&nbsp;
+      <a href="#M000116">username</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -131,19 +132,19 @@ Class that implements the command-line behaviour
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000109" class="method-detail">
-        <a name="M000109"></a>
+      <div id="method-M000115" class="method-detail">
+        <a name="M000115"></a>
 
         <div class="method-heading">
-          <a href="#M000109" class="method-signature">
+          <a href="#M000115" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(opts, env, store=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000109-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000109-source">
+            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000115-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 6</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opts</span>, <span class="ruby-identifier">env</span>, <span class="ruby-identifier">store</span>=<span class="ruby-keyword kw">nil</span>)
@@ -171,21 +172,21 @@ Class that implements the command-line behaviour
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000125" class="method-detail">
-        <a name="M000125"></a>
+      <div id="method-M000132" class="method-detail">
+        <a name="M000132"></a>
 
         <div class="method-heading">
-          <a href="#M000125" class="method-signature">
+          <a href="#M000132" class="method-signature">
           <span class="method-name">add_mapping</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000125-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000125-source">
+            onclick="toggleCode('M000132-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000132-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 252</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 270</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_mapping</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
       <span class="ruby-identifier">fpmap</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FieldPredicateMap</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
       <span class="ruby-identifier">mapping</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FieldPredicateMap</span>.<span class="ruby-identifier">create_mapping</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;predicate&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;analyzer&quot;</span>])
@@ -207,21 +208,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000126" class="method-detail">
-        <a name="M000126"></a>
+      <div id="method-M000133" class="method-detail">
+        <a name="M000133"></a>
 
         <div class="method-heading">
-          <a href="#M000126" class="method-signature">
+          <a href="#M000133" class="method-signature">
           <span class="method-name">add_weight</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000126-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000126-source">
+            onclick="toggleCode('M000133-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000133-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 269</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 287</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_weight</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
       <span class="ruby-identifier">qp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">QueryProfile</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
       <span class="ruby-identifier">weight</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">QueryProfile</span>.<span class="ruby-identifier">create_weighting</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;weight&quot;</span>])
@@ -243,19 +244,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000114" class="method-detail">
-        <a name="M000114"></a>
+      <div id="method-M000120" class="method-detail">
+        <a name="M000120"></a>
 
         <div class="method-heading">
-          <a href="#M000114" class="method-signature">
+          <a href="#M000120" class="method-signature">
           <span class="method-name">backup</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000114-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000114-source">
+            onclick="toggleCode('M000120-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000120-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 52</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">backup</span>()
@@ -277,19 +278,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000119" class="method-detail">
-        <a name="M000119"></a>
+      <div id="method-M000125" class="method-detail">
+        <a name="M000125"></a>
 
         <div class="method-heading">
-          <a href="#M000119" class="method-signature">
+          <a href="#M000125" class="method-signature">
           <span class="method-name">describe</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000119-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000119-source">
+            onclick="toggleCode('M000125-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000125-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 115</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">describe</span>()
@@ -306,21 +307,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000123" class="method-detail">
-        <a name="M000123"></a>
+      <div id="method-M000130" class="method-detail">
+        <a name="M000130"></a>
 
         <div class="method-heading">
-          <a href="#M000123" class="method-signature">
+          <a href="#M000130" class="method-signature">
           <span class="method-name">fpmap</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000123-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000123-source">
+            onclick="toggleCode('M000130-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000130-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 203</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 221</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fpmap</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
       
       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;raw&quot;</span>]
@@ -354,19 +355,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000111" class="method-detail">
-        <a name="M000111"></a>
+      <div id="method-M000117" class="method-detail">
+        <a name="M000117"></a>
 
         <div class="method-heading">
-          <a href="#M000111" class="method-signature">
+          <a href="#M000117" class="method-signature">
           <span class="method-name">password</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000111-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000111-source">
+            onclick="toggleCode('M000117-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000117-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 31</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">password</span>()
@@ -379,21 +380,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000124" class="method-detail">
-        <a name="M000124"></a>
+      <div id="method-M000131" class="method-detail">
+        <a name="M000131"></a>
 
         <div class="method-heading">
-          <a href="#M000124" class="method-signature">
+          <a href="#M000131" class="method-signature">
           <span class="method-name">queryprofile</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000124-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000124-source">
+            onclick="toggleCode('M000131-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000131-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 232</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 250</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">queryprofile</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
 
       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;raw&quot;</span>]
@@ -418,19 +419,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000116" class="method-detail">
-        <a name="M000116"></a>
+      <div id="method-M000122" class="method-detail">
+        <a name="M000122"></a>
 
         <div class="method-heading">
-          <a href="#M000116" class="method-signature">
+          <a href="#M000122" class="method-signature">
           <span class="method-name">reindex</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000116-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000116-source">
+            onclick="toggleCode('M000122-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000122-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 77</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reindex</span>()
@@ -449,19 +450,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000117" class="method-detail">
-        <a name="M000117"></a>
+      <div id="method-M000123" class="method-detail">
+        <a name="M000123"></a>
 
         <div class="method-heading">
-          <a href="#M000117" class="method-signature">
+          <a href="#M000123" class="method-signature">
           <span class="method-name">reset</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000117-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000117-source">
+            onclick="toggleCode('M000123-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000123-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 89</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset</span>()
@@ -478,19 +479,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000118" class="method-detail">
-        <a name="M000118"></a>
+      <div id="method-M000124" class="method-detail">
+        <a name="M000124"></a>
 
         <div class="method-heading">
-          <a href="#M000118" class="method-signature">
+          <a href="#M000124" class="method-signature">
           <span class="method-name">restore</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000118-source">
+            onclick="toggleCode('M000124-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000124-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 99</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restore</span>()
@@ -513,19 +514,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000115" class="method-detail">
-        <a name="M000115"></a>
+      <div id="method-M000121" class="method-detail">
+        <a name="M000121"></a>
 
         <div class="method-heading">
-          <a href="#M000115" class="method-signature">
+          <a href="#M000121" class="method-signature">
           <span class="method-name">snapshot</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000115-source">
+            onclick="toggleCode('M000121-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000121-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 67</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">snapshot</span>()
@@ -542,19 +543,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000120" class="method-detail">
-        <a name="M000120"></a>
+      <div id="method-M000126" class="method-detail">
+        <a name="M000126"></a>
 
         <div class="method-heading">
-          <a href="#M000120" class="method-signature">
+          <a href="#M000126" class="method-signature">
           <span class="method-name">sparql</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000120-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000120-source">
+            onclick="toggleCode('M000126-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000126-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 125</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sparql</span>()
@@ -572,19 +573,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000113" class="method-detail">
-        <a name="M000113"></a>
+      <div id="method-M000119" class="method-detail">
+        <a name="M000119"></a>
 
         <div class="method-heading">
-          <a href="#M000113" class="method-signature">
+          <a href="#M000119" class="method-signature">
           <span class="method-name">status</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000113-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000113-source">
+            onclick="toggleCode('M000119-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000119-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 47</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>()
@@ -596,19 +597,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000121" class="method-detail">
-        <a name="M000121"></a>
+      <div id="method-M000127" class="method-detail">
+        <a name="M000127"></a>
 
         <div class="method-heading">
-          <a href="#M000121" class="method-signature">
+          <a href="#M000127" class="method-signature">
           <span class="method-name">store</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000121-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000121-source">
+            onclick="toggleCode('M000127-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000127-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 136</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>()
@@ -627,10 +628,12 @@ Class that implements the command-line behaviour
           <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_file</span>( <span class="ruby-identifier">f</span> )  
         <span class="ruby-keyword kw">end</span>          
       <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>]
+        <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>] = <span class="ruby-value str">&quot;.&quot;</span>
+          <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>] = <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-value str">&quot;.&quot;</span>)
+        <span class="ruby-keyword kw">end</span>        
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Storing contents of directory: #{@opts[&quot;dir&quot;]}&quot;</span>
-        <span class="ruby-identifier">collection</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">RDFCollection</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>])         
-        <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">store</span>()          
-        <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>()
+        <span class="ruby-identifier">collection</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">RDFCollection</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>])
+        <span class="ruby-identifier">store_collection</span>(<span class="ruby-identifier">collection</span>)         
       <span class="ruby-keyword kw">else</span>     
         <span class="ruby-comment cmt">#noop</span>
       <span class="ruby-keyword kw">end</span> 
@@ -649,19 +652,58 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000112" class="method-detail">
-        <a name="M000112"></a>
+      <div id="method-M000129" class="method-detail">
+        <a name="M000129"></a>
+
+        <div class="method-heading">
+          <a href="#M000129" class="method-signature">
+          <span class="method-name">store_collection</span><span class="method-args">(collection)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000129-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000129-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 201</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_collection</span>(<span class="ruby-identifier">collection</span>)
+      <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;force&quot;</span>]
+        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Resetting tracking files for directory #{@opts[&quot;dir&quot;]}&quot;</span>
+        <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">reset</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )
+      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;retry&quot;</span>]
+        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Retrying failures in: #{@opts[&quot;dir&quot;]}&quot;</span>     
+        <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">retry_failures</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )
+        <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )   
+      <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;updates&quot;</span>]
+        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Uploading updates in: #{@opts[&quot;dir&quot;]}&quot;</span>     
+        <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">store_updates</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )
+        <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )           
+      <span class="ruby-keyword kw">else</span>
+        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Uploading contents of directory: #{@opts[&quot;dir&quot;]}&quot;</span>
+        <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">store</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )
+        <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>] <span class="ruby-operator">?</span> <span class="ruby-keyword kw">true</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">false</span> )        
+      <span class="ruby-keyword kw">end</span>              
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000118" class="method-detail">
+        <a name="M000118"></a>
 
         <div class="method-heading">
-          <a href="#M000112" class="method-signature">
+          <a href="#M000118" class="method-signature">
           <span class="method-name">storename</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000112-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000112-source">
+            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000118-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 37</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storename</span>()      
@@ -678,21 +720,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000122" class="method-detail">
-        <a name="M000122"></a>
+      <div id="method-M000128" class="method-detail">
+        <a name="M000128"></a>
 
         <div class="method-heading">
-          <a href="#M000122" class="method-signature">
+          <a href="#M000128" class="method-signature">
           <span class="method-name">upload</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000122-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000122-source">
+            onclick="toggleCode('M000128-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000128-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 170</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 172</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">upload</span>()
       <span class="ruby-identifier">resp</span> = <span class="ruby-keyword kw">nil</span>
       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>]
@@ -703,15 +745,11 @@ Class that implements the command-line behaviour
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Uploading file: #{ @opts[&quot;file&quot;] } to /items/#{ uri } as #{mime}&quot;</span>
         <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">upload_item</span>( <span class="ruby-identifier">f</span> , <span class="ruby-identifier">mime</span> , <span class="ruby-identifier">uri</span> )
       <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>]
-        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Uploading contents of directory: #{@opts[&quot;dir&quot;]}&quot;</span>
+        <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>] = <span class="ruby-value str">&quot;.&quot;</span>
+          <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>] = <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-value str">&quot;.&quot;</span>)
+        <span class="ruby-keyword kw">end</span>
         <span class="ruby-identifier">collection</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FileManagement</span><span class="ruby-operator">::</span><span class="ruby-constant">FileManager</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;dir&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;base&quot;</span>])
-        <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;traverse&quot;</span>]
-          <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">store</span>(<span class="ruby-identifier">:traverse</span>)          
-          <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>(<span class="ruby-identifier">:traverse</span>)
-        <span class="ruby-keyword kw">else</span>
-          <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">store</span>()          
-          <span class="ruby-identifier">puts</span> <span class="ruby-identifier">collection</span>.<span class="ruby-identifier">summary</span>()            
-        <span class="ruby-keyword kw">end</span>         
+        <span class="ruby-identifier">store_collection</span>(<span class="ruby-identifier">collection</span>)
       <span class="ruby-keyword kw">else</span>     
         <span class="ruby-comment cmt">#noop</span>
       <span class="ruby-keyword kw">end</span> 
@@ -730,19 +768,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000110" class="method-detail">
-        <a name="M000110"></a>
+      <div id="method-M000116" class="method-detail">
+        <a name="M000116"></a>
 
         <div class="method-heading">
-          <a href="#M000110" class="method-signature">
+          <a href="#M000116" class="method-signature">
           <span class="method-name">username</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000110-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000110-source">
+            onclick="toggleCode('M000116-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000116-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 25</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">username</span>()