docs 0.0.2 → 0.0.3

data/bin/docs

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'docs'
-Docs::Docs.start
+Docs::Project.start

data/lib/docs.rb

@@ -5,17 +5,3 @@ require "docs/version"
 require "docs/project"
 require "docs/config"
 require "docs/erb_environment"
-
-module Docs
-  class Docs < Thor 
-
-    desc "build [DIRECTORY]", "Builds the current directory (or DIRECTORY) as a docs project into './output'"
-    def build(directory = '.')
-      previous_directory = Dir.pwd
-      Dir.chdir(directory)
-      Project.new.build
-      Dir.chdir(previous_directory)
-    end
-       
-  end
-end

data/lib/docs/config.rb

@@ -20,7 +20,7 @@ module Docs
       if @config.has_key?(name)
         @config[name]
       else
-        super
+        super(name, *args, &block)
       end
     end
   end

data/lib/docs/erb_environment.rb

@@ -14,7 +14,11 @@ module Docs
     end
 
     def pretty_print_json(json)
-      JSON.pretty_generate(JSON.parse(json))
+      begin
+        JSON.pretty_generate(JSON.parse(json))
+      rescue JSON::ParserError => e
+        e.inspect
+      end
     end
 
     def syntax_highlight(str, language)

data/lib/docs/project.rb

@@ -5,28 +5,36 @@ require 'erb'
 require 'redcarpet'
 
 module Docs
-  class Project
+  class Project < Thor
+
+    include Thor::Actions
 
     EXTENSIONS_TO_COMMANDS = {
       '.sh' => 'bash',
       '.rb' => 'ruby'
     }
 
-    def initialize
+    desc "setup [DIRECTORY]", "Creates a new Docs Project"
+    def setup(directory = '.')
+      nil 
+    end
+
+    desc "build", "Builds the current directory as a docs project into './output'"
+    def build
       @examples = {:source => {}, :output => {}}
       @erb_environment = ERBEnvironment.new
-
       @markdown = markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
-      @erb_environment.config = @config = Config.new('config.yaml') if File.exists?('config.yaml')
-    end
 
-    def build
-      create_tmp_directory
-      truncate_or_create_output_directory
+      @erb_environment.config = @config = Config.new('config.yaml') 
+      ['temp', 'output'].each do |dir|
+        dir = @config.directories[dir]
+        remove_file dir if File.exists? dir
+        empty_directory dir
+      end
 
       load_examples 
       build_docs
-      copy_public
+      copy_assets
     end
 
     private
@@ -37,15 +45,15 @@ module Docs
 
         example_file = example_name
         if File.fnmatch?('*.erb.*', example_name)
-          File.open(example_file = "tmp/#{Digest::MD5.hexdigest(example_name)}#{File.extname(example_name)}", 'w+') do |f| 
-            f.write(render_erb_string File.read(example_name))
-          end
+          create_file (example_file = "tmp/#{Digest::MD5.hexdigest(example_name)}#{File.extname(example_name)}"), render_erb_string(File.read(example_name))
         end
 
         @examples[:source][example_name] = File.read(example_file)
 
-        i = IO.popen("#{EXTENSIONS_TO_COMMANDS[File.extname(example_file)]} #{example_file}")
-        @examples[:output][example_name] = i.read
+        unless EXTENSIONS_TO_COMMANDS[File.extname(example_file)].nil?
+          i = IO.popen("#{EXTENSIONS_TO_COMMANDS[File.extname(example_file)]} #{example_file}")
+          @examples[:output][example_name] = i.read
+        end
       end
 
       @erb_environment.examples = @examples
@@ -64,9 +72,7 @@ module Docs
           rendered = render_erb_string File.read(@config.template)
         end
 
-        File.open(output_name, 'w+') do |f|
-          f.write rendered
-        end
+        create_file output_name, rendered
       end
     end
 
@@ -80,14 +86,18 @@ module Docs
     def render_erb_string(str)
       ERB.new(str).result(@erb_environment.get_binding)
     end
-
-    def truncate_or_create_output_directory
-      FileUtils.rm_rf('output') if Dir.exists?('output')
-      Dir.mkdir('output')
+   
+    def in_directory(directory, &block)
+      previous_directory = Dir.pwd
+      Dir.chdir(directory)
+      yield
+      Dir.chdir(previous_directory)
     end
 
-    def create_tmp_directory
-      Dir.mkdir('tmp') unless Dir.exists?('tmp')
+    def copy_assets
+      Dir.glob(@config.directories['assets'] + '/**/*').each do |f|
+        create_file "#{@config.directories['output']}/#{f.sub('public/', '')}", File.read(f)
+      end
     end
 
   end

data/lib/docs/version.rb

@@ -1,3 +1,3 @@
 module Docs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70167636469260 !ruby/object:Gem::Requirement
+  requirement: &70177518374340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70167636469260
+  version_requirements: *70177518374340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70167636468760 !ruby/object:Gem::Requirement
+  requirement: &70177518373840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70167636468760
+  version_requirements: *70177518373840
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70167636468300 !ruby/object:Gem::Requirement
+  requirement: &70177518373380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70167636468300
+  version_requirements: *70177518373380
 description: Documentation generator with support for including code examples and
   compiling them at compile time
 email:
@@ -55,6 +55,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- README
 - Rakefile
 - bin/docs
 - docs.gemspec