tendersync 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.4 2008-08-25
+
+* Fix bug in index generation
+* Add option to override index permalink
+
 == 1.0.3 2009-08-20
 
 * Fixed problem pulling individual urls

data/lib/tendersync/document.rb

@@ -134,10 +134,11 @@ class Tendersync::Document
     Dir.glob("#{section}/*").each { |f| yield Tendersync::Document.read_from_file(f) }
   end
   
-  def self.index_for(section_id, section_name)
+  def self.index_for(section_id, section_name, permalink = nil)
+    permalink ||= "#{section_id}-table-of-contents"
     new(:section => section_id,
         :title => "#{section_name} Table of Contents",
-        :permalink => "#{section_id}-table-of-contents",
+        :permalink => permalink,
         :keywords => "toc index")
   end
   
@@ -161,7 +162,7 @@ class Tendersync::Document
   private
   
   def create_toc(groups)
-    groups += groups + [Group::Default] # array of groups
+    groups << Group::Default # array of groups
     link_root = {}
     self.class.each(section) do |document|
       next if document.permalink =~ /-table-of-contents$/

data/lib/tendersync/runner.rb

@@ -22,13 +22,13 @@ class Tendersync::Runner
       op.on(      '--docurl',  '=URL',     String, "* tender site URL" ) { |dir| settings['docurl'] = dir }
       op.separator ""
       op.separator "Indexing Options:"
-      op.on('-g', '--group',   '=TITLE;regex', String, "*map of regex to group title for TOC groups") do | g |
+      op.on(       '--group',   '=TITLE;regex',  String, "*map of regex to group title for TOC groups") do | g |
         pair = g.split(';')
         settings['groups'] << [pair.first, pair.last]
       end
-      op.on('-d', '--depth',   '=DEPTH', String, "*Number of levels to descend into a document being indexed") { | g | settings['depth'] = g.to_i }
-      
-      
+      op.on(       '--name',  '=PERMALINK', String, "override the default name of the index page") { |n| @index_name = n }
+      op.on(       '--depth', '=DEPTH',     String, "*Number of levels to descend into a document being indexed") { | g | settings['depth'] = g.to_i }
+            
         %Q{
     * saved in .tendersync file for subsequent default
  
@@ -126,9 +126,11 @@ class Tendersync::Runner
       if @dry_run
         puts "would post #{document.section}/#{document.permalink} to tender."
       else
+        puts "uploading #{document.permalink}..."
         $session.post(document)
       end
     }
+    puts "...done"
   end
   alias push post
   
@@ -182,9 +184,9 @@ class Tendersync::Runner
     end
     section_details = $session.all_sections
     sections.each do |section|
-      doc = Tendersync::Document.index_for section, section_details[section]
+      doc = Tendersync::Document.index_for(section, section_details[section], @index_name)
       puts "indexing #{section}: #{doc.section}/#{doc.permalink}"
-      doc.refresh_index groups, settings['depth'] || 2
+      doc.refresh_index(groups, settings['depth'] || 1)
       doc.save
     end
   end

data/lib/tendersync/session.rb

@@ -27,7 +27,11 @@ class Tendersync::Session
   
   def get(url)
     login
-    page = @agent.get(url)
+    begin
+      page = @agent.get(url)
+    rescue WWW::Mechanize::ResponseCodeError => e
+      raise Tendersync::Runner::Error, "Unable to get #{url}"
+    end
     def page.links_like(r)
       result = []
       links.each { |l| result << l.href if l.href =~ r }

data/lib/tendersync.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Tendersync
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/tendersync.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tendersync}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2009-08-20}
+  s.date = %q{2009-08-26}
   s.default_executable = %q{tendersync}
   s.description = %q{Tendersync is a utility for syncing files from ENTP's Tender site for managing customer facing documentation.  It can be used to pull and push documents to a local repository as well as create indexes for each documentation section.
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tendersync
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency