gumdrop 0.2.15 → 0.2.16

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.2.16
+- Added option to specify output folder, still defaults to "output"
+- Bugfix: content wasn't looking for layouts right, causing exception
+
 # v0.2.15
 - Fixed minor regression.
 - CLI now will report gumdrop version when show help.

data/Notes.md

@@ -1,8 +1,4 @@
 # Future Features/Changes
-- Add support for `data.pager_for(key, opts={})`
 - Add support for Sprockets
-- Add support for js and css compression
-- Add options to config for `source/` and `output/` folder names. `data/` too? 
-- Page generation from lib/site.rb
 - HTML Manifest generation??
 - Some kind of admin? What would that even do?

data/Readme.md

@@ -59,4 +59,4 @@ When you run `gumdrop --build` or `rake build` it will generate an `output/` fol
           scripts/
             app.js
 
-You'll notice the templates and partials aren't included in the output.
+You'll notice the templates and partials aren't included in the output.

data/lib/gumdrop/context.rb

@@ -114,7 +114,7 @@ module Gumdrop
         page= Gumdrop.site[path]
         page= Gumdrop.site["#{path}.html"] if page.nil? # Bit of a hack...
         page= Gumdrop.partials[path] if page.nil?
-        page= Gumdrop.templates[path] if page.nil? # ???
+        page= Gumdrop.layouts[path] if page.nil? # ???
         page
       end
       

data/lib/gumdrop/template/default/Rakefile

@@ -7,7 +7,7 @@ USER='user'
 SERVER='server.com'
 FOLDER="~/#{SERVER}"
 
-desc "Build source files into output"
+desc "Build source files into output_dir"
 task :build do
   system("bundle exec gumdrop -b")
 end

data/lib/gumdrop/template/twitter/Rakefile

@@ -7,7 +7,7 @@ USER='user'
 SERVER='server.com'
 FOLDER="~/#{SERVER}"
 
-desc "Build source files into output"
+desc "Build source files into output_dir"
 task :build do
   system("bundle exec gumdrop -b")
 end

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.2.15" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.2.16" unless defined?(::Gumdrop::VERSION)
   
 end

data/lib/gumdrop.rb

@@ -8,7 +8,8 @@ DEFAULT_OPTIONS= {
   :auto_run => false,
   :force_reload => false,
   :root => ".",
-  :log_level => :info
+  :log_level => :info,
+  :output_dir => "./output"
 }
 
 LOG_LEVELS = {
@@ -17,6 +18,12 @@ LOG_LEVELS = {
   :error => 2
 }
 
+# LOG_LEVELS = {
+#   info: 0,
+#   warning: 1,
+#   error: 2
+# }
+
 module Gumdrop
   
   autoload :Context, "gumdrop/context"
@@ -105,10 +112,11 @@ module Gumdrop
       
       # Render
       unless opts[:dry_run]
+        output_base_path= File.expand_path(Gumdrop.config.output_dir)
         site.keys.sort.each do |path|
           #unless @blacklist.detect {|p| path.starts_with?(p) }
             node= site[path]
-            output_path= "output/#{node.to_s}"
+            output_path= File.join(output_base_path, node.to_s)
             FileUtils.mkdir_p File.dirname(output_path)
             node.renderTo output_path, @content_filters
           # else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70349166759560 !ruby/object:Gem::Requirement
+  requirement: &70132697222300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166759560
+  version_requirements: *70132697222300
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70349166759100 !ruby/object:Gem::Requirement
+  requirement: &70132697221740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166759100
+  version_requirements: *70132697221740
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70349166758620 !ruby/object:Gem::Requirement
+  requirement: &70132697221280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166758620
+  version_requirements: *70132697221280
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70349166758160 !ruby/object:Gem::Requirement
+  requirement: &70132697220820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166758160
+  version_requirements: *70132697220820
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70349166757720 !ruby/object:Gem::Requirement
+  requirement: &70132697220260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166757720
+  version_requirements: *70132697220260
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70349166757280 !ruby/object:Gem::Requirement
+  requirement: &70132697219820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349166757280
+  version_requirements: *70132697219820
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables: