benofsky-bolt 0.1.5 → 0.1.6

data/lib/bolt.rb

@@ -40,7 +40,7 @@ module Bolt
     # a bolt project and saving all files into the "out" directory.
     def build
       require 'bolt/build'
-      Build.new($config).run
+      Build.new().run
     end
 
     # Parses command line options
@@ -48,8 +48,8 @@ module Bolt
       $config.resources = "resources"
       $config.lib = "lib"
       $config.views = "views"
-      $config.pages = "pages"
       $config.out = "out"
+      $config.pages = "pages"
       $config.config = "config.yml"
       
       opts = OptionParser.new do |opts|

data/lib/bolt/base.rb

@@ -8,6 +8,7 @@
 
 require 'fileutils'
 
+# Deprecated library in Ruby 1.9
 require 'ftools' if RUBY_VERSION.to_f <= 1.8
 
 $BOLT_BASE = File.dirname(__FILE__) + "/../../"
@@ -23,7 +24,7 @@ module Bolt
     # Creates a directory, prefixes $config.base_dir if required
     def create_directory(directory, options = {})
       options[:error_if_exists] = (options[:error_if_exists].nil?) ? true : options[:error_if_exists]
-      directory = d(directory) if options[:base_dir].nil?     
+      directory = directory
       
       if File.directory?(directory)
         raise ArgumentError, "#{directory} exists already." if options[:error_if_exists]
@@ -35,7 +36,7 @@ module Bolt
     
     # Forces removal of directory, <tt>directory</tt>
     def remove_directory(directory)
-      directory = d(directory)
+      directory = directory
       FileUtils.rm_rf(directory)
       puts "Removed #{directory}"
     end

data/lib/bolt/build.rb

@@ -16,9 +16,17 @@ require 'bolt/view'
 module Bolt
   class Build < Base
     # Performs all the nessecary steps to build a Bolt project
+    def initialize()
+      if $config.out
+        puts $config.out
+      else
+        $config.out = d("out")
+      end
+    end
+    
     def run
-      remove_directory("out")
-      create_directory("out", :error_if_exists => false)      
+      remove_directory($config.out)
+      create_directory($config.out, :error_if_exists => false)      
       copy_resources
       parse_config
       load_pages
@@ -26,8 +34,8 @@ module Bolt
     
     # Copies the contents of $config.resources to the out directory
     def copy_resources
-      FileUtils.cp_r(Dir.glob("#{d($config.resources)}/*"), d($config.out))
-      puts "Copied #{d($config.resources)} to #{d($config.out)}"
+      FileUtils.cp_r(Dir.glob("#{d($config.resources)}/*"), $config.out)
+      puts "Copied #{d($config.resources)} to #{$config.out}"
     end
     
     # Parses $config.config and loads all contents into instance variables

data/lib/bolt/page.rb

@@ -27,7 +27,7 @@ def page(path)
   @current_page = path
   create_path(path)
   
-  path = "#{$config.base_dir}#{$config.out}/#{path}.html"
+  path = "#{$config.out}/#{path}.html"
   File.open(path, 'w') {|f| f.write yield}
   puts "Created #{path}"
 end
@@ -36,7 +36,7 @@ private
 def create_path(path)
   path = path.split('/')
   if path.count > 1
-    path = "#{$config.base_dir}#{$config.out}/#{path[0..path.length-2].join('/')}"
+    path = "#{$config.out}/#{path[0..path.length-2].join('/')}"
     if !File.directory?(path)
       FileUtils.mkdir_p(path)
       puts "Created #{path}"

data/lib/bolt/view.rb

@@ -7,9 +7,9 @@
 # 
 
 def u(path)
-  path + ".html" 
+  path + ".html"
 end
 
 def anchor(path)
-  "#" + path
+  "#"+path
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benofsky-bolt
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ben McRedmond