caramelize 0.1.1 → 0.1.2

data/caramelize.gemspec

@@ -10,13 +10,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Daniel Senff"]
   s.email       = ["mail@danielsenff.de"]
   s.homepage    = "http://github.com/Dahie/caramelize"
-  s.summary     = %q{Abstract wiki convert to migrate your data from one wiki software to another}
-  s.description = %q{By defining the access from the input to the output wiki you can migrate any wiki.}
+  s.summary     = %q{Flexible and modular wiki conversion tool}
+  s.description = %q{By defining the connectors from the input wiki you can migrate any wiki to git-based Gollum wiki repositories.}
   
   s.bindir = 'bin'
   
   s.add_dependency('mysql2')
   s.add_dependency('cmdparse')
+  s.add_dependency('ruby-progressbar')
   s.add_dependency('gollum', '>= 1.3.0') # grit dependency implicit through gollum
 
   s.rubyforge_project = "caramelize"

data/lib/caramelize/content_transferer.rb

@@ -2,6 +2,7 @@
 
 require 'gollum'
 require 'grit'
+require 'ruby-progressbar'
 
 module Caramelize
   autoload :Wiki, 'caramelize/wiki/wiki'
@@ -19,30 +20,41 @@ module Caramelize
       
       options[:markup] = :markdown            if !options[:markup]
       options[:default_author] = "Caramelize" if !options[:default_author]
-      
+
       # read page revisions from wiki
       # store page revisions
-      
       original_wiki.read_authors
       @revisions = original_wiki.read_pages
-      
       # initiate new wiki
       output_wiki = GollumOutput.new('wiki.git') # TODO make wiki_path an option
       
+      # setup progressbar
+      progress_revisions = ProgressBar.create(:title => "Revisions", :total => @revisions.count, :format => '%a %B %p%% %t')
+
       # TODO ask if we should replace existing paths
 
       # commit page revisions to new wiki
-      output_wiki.commit_history @revisions, options
-      
+      output_wiki.commit_history(@revisions, options) do |page, index|
+        if options[:verbosity] == :verbose
+          puts "(#{index+1}/#{@revisions.count}) #{page.time} #{page.title}"
+        else
+          progress_revisions.increment
+        end
+      end
+
       # if wiki needs to convert syntax, do so
       puts "From markup: " + original_wiki.markup.to_s if options[:verbosity] == :verbose
       puts "To markup: " + options[:markup].to_s if options[:verbosity] == :verbose
       if original_wiki.convert_markup? options[:markup] # is wiki in target markup
         
+        #setup progress for markup conversion
+        progress_markup = ProgressBar.create(:title => "Markup", :total => original_wiki.latest_revisions.count, :format => '%a %B %p%% %t')
+
         puts "Latest revisions:" if options[:verbosity] == :verbose
         # take each latest revision
         for rev in original_wiki.latest_revisions
           puts "Updated syntax: #{rev.title} #{rev.time}"  if options[:verbosity] == :verbose
+          progress_markup.increment
           
           # parse markup & convert to new syntax
           if options[:markup] == :markdown
@@ -60,7 +72,7 @@ module Caramelize
             # commit as latest page revision
             output_wiki.commit_revision rev, options[:markup]
           end
-        end  
+        end
       end
     end # end execute
   end

data/lib/caramelize/gollum_output.rb

@@ -43,13 +43,11 @@ module Caramelize
     end
     
     # Commit all revisions of the given history into this gollum-wiki-repository.
-    def commit_history(revisions, options={})
+    def commit_history(revisions, options={}, &block)
       options[:markup] = :markdown if options[:markup].nil? # target markup
       revisions.each_with_index do |page, index|
-        if options[:verbosity] == :normal || options[:verbosity] == :verbose
-          puts "(#{index+1}/#{revisions.count}) #{page.time}  #{page.title}" 
-        end
-        
+        # call debug output from outside
+        block.call(page, index) if block_given?
         commit_revision(page, options[:markup])
       end
     end

data/lib/caramelize/version.rb

@@ -1,3 +1,3 @@
 module Caramelize
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caramelize
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gollum
   requirement: !ruby/object:Gem::Requirement
@@ -59,8 +75,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
-description: By defining the access from the input to the output wiki you can migrate
-  any wiki.
+description: By defining the connectors from the input wiki you can migrate any wiki
+  to git-based Gollum wiki repositories.
 email:
 - mail@danielsenff.de
 executables:
@@ -118,7 +134,7 @@ rubyforge_project: caramelize
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Abstract wiki convert to migrate your data from one wiki software to another
+summary: Flexible and modular wiki conversion tool
 test_files:
 - test/helper.rb
 - test/test_caramelize.rb