deplot 0.0.3 → 0.0.4

data/bin/deplot

@@ -22,6 +22,17 @@ $current_source = ""
 $layout = ""
 $options = {}
 
+$errors_occured = 0
+
+# helper methods
+def puts_alert text
+	puts "#{Thor::Shell::Color::RED}#{text}#{Thor::Shell::Color::CLEAR}"
+	$errors_occured += 1
+end
+def puts_success text
+	puts "#{Thor::Shell::Color::GREEN}#{text}#{Thor::Shell::Color::CLEAR}"
+end
+
 # dsl methods for page specification
 def assets_dir dir
 	$assets_dir = $root_dir + "/" + dir.gsub(/^\//, "").gsub(/\/$/, "")
@@ -124,6 +135,9 @@ def publish
   puts "Publishing site..."
   $tasks.each do |task|
     action, path, source, $layout, options, variables = task
+		unless path == "/"
+			path = "/" + path.gsub(/^\//, "")
+		end
 		variables.merge! $global_variables
     content = ""
     $template_arguments = {:path => "", :source => "", :file_name => "", :depth => 0}
@@ -143,13 +157,13 @@ def publish
       if /\/$/ =~ path
         destination_dir = path.gsub /\/$/, ""
         destination_base = "index.#{options[:extension]}"
-      end
+			end
       $template_arguments.merge! :path => "#{destination_dir}/#{destination_base}"
 			$template_arguments.merge! :file_name => destination_base
 			$template_arguments.merge! :source => source
 			$template_arguments.merge! :depth => (destination_dir.count "/")
     
-      puts "Rendering path '#{destination_dir}/#{destination_base}'"
+      puts "Rendering path '"+destination_dir.gsub(/\/$/, "")+"/#{destination_base}'"
       # make path
       FileUtils.mkdir_p "."+destination_dir
       unless File.directory? "."+destination_dir
@@ -173,7 +187,7 @@ def publish
 				begin
 	        layout_tilt = Tilt.new($layout)
 				rescue Exception => e
-					puts "- ERROR creating tilt instance (possibly missing layout file)."
+					puts_alert "- ERROR creating tilt instance (possibly missing layout file)."
 					layout_tilt = nil
 				end
       end
@@ -186,7 +200,7 @@ def publish
 				begin
 	        source_tilt = Tilt.new(source)
 				rescue Exception => e
-					puts "- ERROR creating tilt instance (possibly missing source file)."
+					puts_alert "- ERROR creating tilt instance (possibly missing source file)."
 					source_tilt = nil
 				end
       end
@@ -214,7 +228,7 @@ def publish
       if /\/$/ =~ path
         destination_dir = path.gsub /\/$/, ""
         destination_base = "index.#{options[:extension]}"
-      end
+			end
     
       puts "Rendering path/s '"+destination_dir+"/...'"
       # make path
@@ -237,7 +251,7 @@ def publish
 						begin
 			        layout_tilt = Tilt.new($layout)
 						rescue Exception => e
-							puts "- ERROR creating tilt instance (possibly missing layout file)."
+							puts_alert "- ERROR creating tilt instance (possibly missing layout file)."
 							layout_tilt = nil
 						end
           end
@@ -254,7 +268,7 @@ def publish
 						begin
             	source_tilt = Tilt.new(content_file)
 						rescue Exception => e
-							puts "- ERROR creating tilt instance (possibly missing source file)."
+							puts_alert "- ERROR creating tilt instance (possibly missing source file)."
 							source_tilt = nil
 						end
             if source_tilt.nil?
@@ -287,7 +301,7 @@ def publish
       if /\/$/ =~ path
         destination_dir = path.gsub /\/$/, ""
         destination_base = "index.#{options[:extension]}"
-      end
+			end
       
       $template_arguments.merge! :path => "#{destination_dir}/#{destination_base}"
 			$template_arguments.merge! :file_name => destination_base
@@ -315,7 +329,7 @@ def publish
 					end
 					paths.each do |content_file|
             #content = File.read content_file
-            puts "  Read source file #{source}/#{content_file}"
+            puts "  Read source file #{source}#{content_file}"
       			$template_arguments.merge! :source => "#{source}#{content_file}"
             
             # Create tilt instance
@@ -323,7 +337,7 @@ def publish
 						begin
             	source_tilt = Tilt.new(content_file)
 						rescue Exception => e
-							puts "- ERROR creating tilt instance (possibly missing source file)."
+							puts_alert "- ERROR creating tilt instance (possibly missing source file)."
 							source_tilt = nil
 						end
             if source_tilt.nil?
@@ -341,7 +355,7 @@ def publish
 				begin
 	        layout_tilt = Tilt.new($layout)
 				rescue Exception => e
-					puts "- ERROR creating tilt instance (possibly missing layout file)."
+					puts_alert "- ERROR creating tilt instance (possibly missing layout file)."
 					layout_tilt = nil
 				end
       end
@@ -358,6 +372,13 @@ def publish
       puts "  Wrote to file."
     end # End of action switching
   end
+	if $errors_occured == 0
+		puts_success "Successfully created all pages."
+	elsif $errors_occured == 1
+		puts_alert "#{$errors_occured} error occurred!"
+	else
+		puts_alert "#{$errors_occured} errors occurred!"
+	end
 end
 
 # Thor: Deplot CLI
@@ -443,6 +464,18 @@ watch(/(assets|content)\\/(.*)/) do |m|
 		`echo ""; echo "File '\#{m[2]}' changed."; deplot make`
 	end
 end
+EOF
+    end
+		# .git-ftp-ignore
+    puts "  Creating .git-ftp-ignore..."
+    File.open ".git-ftp-ignore", "w" do |file|
+      file.write <<-EOF
+.gitignore
+.git-ftp-ignore
+Deplotfile
+Guardfile
+assets/.*
+content/.*
 EOF
     end
     # Example content

data/deplot.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'deplot'
-  s.version     = '0.0.3'
-  s.date        = '2012-04-10'
+  s.version     = '0.0.4'
+  s.date        = '2012-04-29'
   s.description = "A ruby static web site generator"
   s.summary     = s.description
   s.authors     = ["Cyril Nusko"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deplot
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Cyril Nusko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 Z
+date: 2012-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: A ruby static web site generator