docster 0.0.1 → 0.0.2

data/docster.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "sdoc"
-  s.add_dependency "thor"
+  %w(sdoc thor colored).each do |dep|
+    s.add_dependency dep
+  end
   s.add_development_dependency "rake"
 end

data/lib/docster/cli.rb

@@ -14,5 +14,6 @@ module Docster
       DocGenerator.generate! options.name, options.groups, (options.without_ruby ? nil : options.ruby_version)
     end
 
+    # TODO: #open should generate, then open merged docs.  #generate should just RE-generate and not open.
   end
 end

data/lib/docster/doc_generator.rb

@@ -1,8 +1,13 @@
 require 'bundler'
+require 'colored'
 
 module Docster
   class RubyNotFound < StandardError; end
-
+  class SdocMergeError < StandardError; end
+  class SdocError < StandardError; end
+  class WgetError < StandardError; end
+  class RubyExtractionError < StandardError; end
+  
   class DocGenerator
     def self.generate!(project_name, groups, ruby_version)
       begin
@@ -28,7 +33,7 @@ module Docster
           FileUtils.rm_rf project_path_for project_name
           sdoc_merge project_name, ruby_version
         end
-              
+        
         `open #{File.join project_path_for(project_name), 'index.html'}`
       ensure
         cleanup!
@@ -39,11 +44,28 @@ module Docster
     def self.sdoc_merge(project_name, ruby_version)
       names = ruby_version ? [gem_names, 'ruby'].join(',') : gem_names
       paths = ruby_version ? doc_paths << %Q( "#{doc_path_for 'ruby', ruby_version}") : doc_paths
-      `sdoc-merge --title "#{project_name}" --op "#{project_path_for project_name}" --names "#{names}" #{paths}`
+      
+      begin
+        print "Generating project documentation...".yellow
+        raise SdocMergeError unless system %Q(sdoc-merge --title "#{project_name}" --op "#{project_path_for project_name}" --names "#{names}" #{paths} &> /dev/null)
+        puts "done!".green
+      rescue SdocMergeError => e
+        # On error, remove potentially partial documentation
+        FileUtils.rm_rf project_path_for(project_name)
+        raise e
+      end
     end
     
-    def self.generate_sdoc_for(options = {})      
-      `sdoc -o "#{doc_path_for options[:name], options[:version]}" "#{options[:path]}"`
+    def self.generate_sdoc_for(options = {})
+      begin
+        print "Generating sdoc for #{options[:name]}-#{options[:version]}...".yellow
+        raise SdocError unless system %Q(sdoc -o "#{doc_path_for options[:name], options[:version]}" "#{options[:path]}" &> /dev/null)
+        puts "done!".green
+      rescue SdocError => e
+        # On error, remove potentially partial documentation
+        FileUtils.rm_rf doc_path_for(options[:name], options[:version])
+        raise e
+      end
     end
     
     def self.gems
@@ -107,9 +129,17 @@ module Docster
     def self.download_ruby(version)
       ruby_archive = "ruby-#{version}.tar.bz2"
       archive_path = File.join tmp_path, ruby_archive
-      `wget http://ftp.ruby-lang.org/pub/ruby/#{version.split('.')[0..1].join('.')}/#{ruby_archive} -O "#{archive_path}"`
+      
+      print "Downloading ruby #{version} source from ruby-lang.org, this may take a while...".yellow
+      raise WgetError unless system %Q(wget http://ftp.ruby-lang.org/pub/ruby/#{version.split('.')[0..1].join('.')}/#{ruby_archive} -O "#{archive_path}" &> /dev/null)
+      puts "done!".green
+      
       raise RubyNotFound unless File.size?(archive_path)
-      `tar -xf "#{archive_path}" -C "#{tmp_path}"`
+      
+      print "Extracting ruby...".yellow
+      raise RubyExtractionError unless system %Q(tar -xf "#{archive_path}" -C "#{tmp_path}" &> /dev/null)
+      puts "done!".green
+      
       File.join tmp_path, "ruby-#{version}"
     end
   end

data/lib/docster/version.rb

@@ -1,3 +1,3 @@
 module Docster
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docster
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2164266320 !ruby/object:Gem::Requirement
+  requirement: &2173340400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164266320
+  version_requirements: *2173340400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2164265900 !ruby/object:Gem::Requirement
+  requirement: &2173339940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164265900
+  version_requirements: *2173339940
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &2173339440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2173339440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164265400 !ruby/object:Gem::Requirement
+  requirement: &2173339020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164265400
+  version_requirements: *2173339020
 description: Generates searchable documentation for your ruby project
 email:
 - info@room118solutions.com
@@ -77,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3265255303828275375
+      hash: -4609553935689345376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3265255303828275375
+      hash: -4609553935689345376
 requirements: []
 rubyforge_project: docster
 rubygems_version: 1.8.6