deplot 0.0.1 → 0.0.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Cyril Nusko
+Copyright (c) 2012 Cyril Nusko 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.md

@@ -3,17 +3,27 @@ deplot
 
 Deplot is a static web site generator with a ruby DSL.
 
-Usage
+Intention
+---------
+
+Deplot is intended to simplify the progress of creating and maintaining a static web site. Its main advantages are:
+
+* Separating content from markup with layout (template) files
+* Independency from specific markup languages by using [tilt][tilt] in both layout and content files
+* Simplifying the design/development workflow with a pre-built Guardfile that allows [guard][guard] to recompile any asset or the whole project if a source file changes.
+* Easy deployment with a folder structure ready for [git-ftp][git-ftp]
+
+Installation and usage
 -----
 
-Deplot separates content from markup. If the deplot gem is installed, calling `deplot new <project_name>` will create a project directory with all the files and directories needed to get a new site started. You can also use an existing skeleton with `deplot new <project_name> <git_url>`, which will clone the specified git repo. Deplot's built upon a custom DSL that's used to describe your site's pages (in the `Deplotfile`):
+Install the deplot gem via rubygems.org: `gem install deplot`. Or build it directly from the sources with `gem build deplot.gemspec; gem install deplot-0.0.x.gem` in the cloned repo. For both `gem install` commands, admin rights may be required.
+
+If the deplot gem is installed, calling `deplot new <project_name>` will create a project directory with all the files and directories needed to get a new site started. You can also use an existing skeleton with `deplot new <project_name> <git_url>`, which will clone the specified git repo. Deplot's built upon a custom DSL that's used to describe your site's pages (in the `Deplotfile`):
 
 ```ruby
 path "/" do
 	render "index.markdown"
 end
-
-publish
 ```
 
 You can create multiple pages from multiple source files with `render_all` (the `#` is replaced by the file name with `.html` extension):

data/bin/deplot

@@ -9,7 +9,11 @@ require 'tilt'
 $assets_dir = Dir.pwd+"/assets"
 $content_dir = Dir.pwd+"/content"
 $root_dir = Dir.pwd
+
+$is_currently_rendering = false
+
 $template_arguments = {}
+$global_variables = {}
 $variables = {}
 
 $tasks = []
@@ -26,7 +30,11 @@ def content_dir dir
 	$content_dir = $root_dir + "/" + dir.gsub(/^\//, "").gsub(/\/$/, "")
 end
 def variables vars
-  $variables.merge! vars
+	if $is_currently_rendering
+  	$variables.merge! vars
+	else
+		$global_variables.merge! vars
+	end
 end
 def layout file
   $layout = file
@@ -56,9 +64,12 @@ def path path, &block
   $layout = "layout.erb"
 	$options = {}
 	$variables = {}
-  
+  $is_currently_rendering = true
+	
   # set
   block.call
+	
+	$is_currently_rendering = false
   
   # remember
   if $render_type == "render-all"
@@ -113,6 +124,7 @@ def publish
   puts "Publishing site..."
   $tasks.each do |task|
     action, path, source, $layout, options, variables = task
+		variables.merge! $global_variables
     content = ""
     $template_arguments = {:path => "", :source => "", :file_name => "", :depth => 0}
 		$template_arguments.merge! variables
@@ -380,12 +392,26 @@ EOF
       File.open "style.less", "w" do |file|
         file.write <<-EOF
 body {
+	margin: 0;
 	font-family: "Helvetica", sans-serif;
+	background-color: #EEE;
 }
 #wrapper {
 	width: 500px;
-	margin: 0px auto;
+	padding: 10px;
+	margin: 10px auto;
+	background-color: #FFF;
+	border: 3px solid #DDD;
+}
+p {
+	color: #444;
+}
+h1 {
+	margin-bottom: 20px;
+	padding-bottom: 8px;
+	border-bottom: 1px solid #EEE;
 }
+
 EOF
       end
     end
@@ -396,8 +422,6 @@ EOF
 path '/' do
 	render "index.markdown"
 end
-
-publish
 EOF
     end
     # Guardfile
@@ -512,6 +536,7 @@ EOF
     end
     $LOAD_PATH.unshift(Dir.pwd)
     load "Deplotfile"
+		publish
   end
 end
 Deplot.start

data/deplot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'deplot'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = '2012-04-09'
   s.description = "A ruby static web site generator"
   s.summary     = s.description

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deplot
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Cyril Nusko