doc 0.2.6 → 0.2.7

data/doc.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'doc'
-  s.version     = '0.2.6'
+  s.version     = '0.2.7'
   s.summary     = %q{Get all ruby documentation in one place}
   s.description = %Q{Generate `Rakefile` with `docr` and get searchable documentation for ruby, rails, gems, plugins and all other ruby code in one place}
   s.homepage    = "http://github.com/toy/#{s.name}"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'sdoc', '~> 0.2.0'
   s.add_runtime_dependency 'fspath'
-  s.add_runtime_dependency 'progress'
+  s.add_runtime_dependency 'progress', '~> 2.4'
   s.add_runtime_dependency 'net-ftp-list'
   s.add_runtime_dependency 'rake'
 end

data/lib/doc/base_task.rb

@@ -1,4 +1,5 @@
 require 'digest/sha2'
+require 'shellwords'
 require 'sdoc'
 
 module Doc
@@ -57,7 +58,10 @@ module Doc
     abstract_method :build
     def run(force = false)
       if force || run?
-        doc_dir.rmtree_verbose if doc_dir.exist?
+        if doc_dir.exist?
+          in_progress_message %W[rm -r #{doc_dir}].shelljoin
+          doc_dir.rmtree
+        end
         build
         write_config_state
         @state = control_files_exist? ? :succeeded : :failed
@@ -77,5 +81,13 @@ module Doc
     def loaded_gem_version(gem)
       Gem.loaded_specs[gem].version
     end
+
+    def in_progress_message(message)
+      if Progress.running?
+        Progress.note = message
+      else
+        $stderr.puts message
+      end
+    end
   end
 end

data/lib/doc/command.rb

@@ -20,8 +20,7 @@ module Doc
       output = IO.popen("#{command_string} 2>&1", &:read)
       @status = $?
       status.success? || begin
-        $stderr.puts "cd #{Dir.pwd.shellescape}; #{command_string}"
-        $stderr.puts output
+        $stderr.puts "cd #{Dir.pwd.shellescape}; #{command_string}\n#{output}"
         case
         when status.signaled?
           if status.termsig == 2

data/lib/doc/merger.rb

@@ -16,8 +16,12 @@ module Doc
       tasks.map(&:failed?)
     RUBY
 
+    def progress_message
+      title
+    end
+
     def run
-      tasks.with_progress('building documentation').each do |task|
+      tasks.with_progress(progress_message).each do |task|
         Progress.note = task.dir_name
         task.run
       end
@@ -26,7 +30,7 @@ module Doc
     end
 
     def build
-      $stderr.puts "Merging #{title}"
+      in_progress_message "Merging #{title}"
 
       succeded_tasks = tasks.reject(&:failed?)
       task_titles = succeded_tasks.map{ |task| task.title.gsub(',', '_') }.join(',')

data/lib/doc/root_merger.rb

@@ -4,6 +4,10 @@ module Doc
       documentor.public_dir
     end
 
+    def progress_message
+      'building docs'
+    end
+
     def run
       super
       if succeeded?

data/lib/doc/tasks.rb

@@ -24,7 +24,7 @@ module Doc
     def count_time
       start = Time.now
       yield
-      puts "It took #{humanize_time(Time.now - start)}"
+      $stderr.puts "It took #{humanize_time(Time.now - start)}"
     end
 
   private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -53,12 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 4
+        version: "2.4"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency