redrum 0.3.4 → 0.4.0

data/features/templates.feature

@@ -0,0 +1,20 @@
+Feature: Templates
+  So that I can choose a template for my redrum project
+  As a web designer
+  I want to be able to select a specific template from all the available templates
+
+  Scenario: Creating a redrum project called MyBLog with --template bright or -t bright
+    Given there is no directory already existing at "MyBlog"
+    When I start redrum with "--template=bright" or "-t bright"
+    Then I want to get a Rakefile in MyBlog
+    And I want to get a haml/index.haml in MyBlog
+    And I want to get a public/css/bright.css in MyBlog
+    And I want to see "Copying default/Rakefile to MyBlog/Rakefile" from the command line
+    And I want to see "Copying default/haml to MyBlog/haml" from the command line
+    And I want to see "Copying default/public to MyBlog/public" from the command line
+    And I want to see "Overwriting MyBlog/public with bright/public" from the command line
+
+  Scenario: Checking out what templates are there to choose from
+    When I start redrum with "--list-templates" or "-l"
+    Then I want to see "default" from the command line
+    And I want to see "bright" from the command line

data/lib/redrum.rb

@@ -5,7 +5,8 @@ require File.expand_path("../redrum/skeleton", __FILE__)
 require File.expand_path("../redrum/redrum", __FILE__)
 require File.expand_path("../redrum/cli", __FILE__)
 require File.expand_path("../redrum/default_files", __FILE__)
+require File.expand_path("../redrum/templates", __FILE__)
 require "fileutils"
 
-REDRUM_VERSION = "0.3.4"
+REDRUM_VERSION = "0.4.0"
 

data/lib/redrum/cli.rb

@@ -14,6 +14,14 @@ module Redrum
             out.puts "Redrum v" + REDRUM_VERSION
             return false
           end
+          opts.on("-t", "--template=TEMPLATE", "Select a template") do |template|
+            options[:template] = template
+            return options
+          end
+          opts.on("-l", "--list-templates", "List all available templates") do
+            Redrum::Templates.list(out)
+            return false
+          end
           opts.on_tail do
             out.puts opts
           end
@@ -21,7 +29,7 @@ module Redrum
 
         opt.parse!
         options
-      rescue OptionParser::InvalidOption => e
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
         out.puts e.to_s
         out.puts opt.to_s
         false

data/lib/redrum/redrum.rb

@@ -4,6 +4,7 @@ module Redrum
   def self.make(project_dir, params={})
     Skeleton.new(project_dir, params)
     DefaultFiles.copy(project_dir, params)
+    Templates.copy(project_dir, params) if params[:template]
   rescue Errno::EEXIST => e
     params[:output_to].puts e.to_s if params[:output_to]
   end

data/lib/redrum/templates.rb

@@ -0,0 +1,18 @@
+module Redrum
+  class Templates
+    def self.copy(project_dir, params = {})
+      Dir[File.expand_path("../../../templates/#{params[:template]}/*", __FILE__)].each do |template|
+        source = template.scan(/templates\/(.+)$/).flatten.to_s
+        destination = project_dir + "/" + source.scan(/^.+?\/(.+)$/).to_s
+        params[:output_to].puts "Overwriting #{destination} with #{source}" if params[:output_to]
+        FileUtils.cp_r(template, project_dir)
+      end
+    end
+
+    def self.list(out=STDOUT)
+      Dir[File.expand_path("../../../templates/*", __FILE__)].each do |template|
+       out.puts template.scan(/.+\/([^\/]+)$/).to_s
+      end
+    end
+  end
+end

data/spec/redrum/cli_spec.rb

@@ -63,5 +63,28 @@ describe Redrum::CLI do
       end
     end
 
+    context "with -t, --template=TEMPLATE" do
+      before { no_warnings { ARGV = ["temp", "--template=default"] } }
+
+      it "returns a hash" do
+        Redrum::CLI.parse(@messenger).should be_kind_of(Hash)
+      end
+    end
+
+    context "with -l, --list-templates" do
+      before { no_warnings { ARGV = ["-l"] } }
+      
+      it "shows a list of available templates" do
+        Redrum::CLI.parse(@messenger)
+        @messenger.string.should include("default")
+        @messenger.string.should include("bright")
+      end
+
+      it "returns false" do
+        Redrum::CLI.parse(@messenger).should == false
+      end
+      
+    end
+
   end
 end

data/spec/redrum/templates_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Redrum::Templates do
+  before do
+    @project = "temp"
+    @messenger = StringIO.new
+    @options = { :template => "bright", :output_to => @messenger }
+    FileUtils.rm_rf @project rescue nil
+  end
+
+  after(:all) do
+    FileUtils.rm_rf @project rescue nil
+  end
+
+  describe "self#copy" do
+    it "copies the public folder from the template to the project folder" do
+      FileUtils.as_null_object.should_receive(:cp_r).with(File.expand_path("../../../templates/bright/public", __FILE__), @project)
+      Redrum::Templates.copy(@project, @options)
+    end
+
+    it "copies the haml folder from the template to project folder" do
+      FileUtils.as_null_object.should_receive(:cp_r).with(File.expand_path("../../../templates/bright/haml", __FILE__), @project)
+      Redrum::Templates.copy(@project, @options)
+    end
+    it "prints what files it is copying/overwriting" do
+      @messenger.as_null_object.should_receive(:puts).with("Overwriting #{@project}/public with bright/public")
+      Redrum::Templates.copy(@project, @options)
+    end
+  end
+
+  describe "self#list" do
+    it "shows every available template" do
+      Redrum::Templates.list(@messenger)
+      Dir[File.expand_path("../../../templates/*", __FILE__)].each do |template|
+        @messenger.string.should include template.scan(/.+\/([^\/]+)$/).to_s
+      end
+    end
+    
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,4 @@
 require File.expand_path( "../../lib/redrum", __FILE__ )
+require File.expand_path("../../helpers", __FILE__)
 require "fileutils"
 require "stringio"
-
-def no_warnings
-  verbosity = $VERBOSE
-  $VERBOSE = nil
-  result = yield
-  $VERBOSE = verbosity
-  result
-end

data/templates/bright/haml/index.haml

@@ -0,0 +1,35 @@
+!!!
+%html(xmlns="http://www.w3.org/1999/xhtml")
+  %head
+    %meta(http-equiv="content-type" content="text/html; charset=utf-8")
+    %link(href="css/bright.css" rel="stylesheet" media="screen")
+    %title Redrum::Default
+  %body
+    #wrapper
+      #header
+        %h1 Welcome to Redrum!
+        %p
+          %em A way to quickly produce static websites for the ruby enthusiast!
+      #content
+        %h2 What's this redrum then?
+        %p
+          Say, you like to work with haml and use rake for lot's of stuff?
+          That's of course great when working with frameworks that use and
+          support these tools, like rails. But what about static websites for
+          example? Wouldn't it be nice to be able to utilitze haml and rake
+          effectively for those kinda projects?
+          %em That's where redrum comes in!
+        %p
+          The purpose of redrum is to make developing static websites easier,
+          faster and especially more organized by creating a skeleton project
+          for you. You just add your content, run rake and deploy.
+        %h2 Workflow
+        %h3 The general workflow is as follows:
+        %ul
+          %li Edit one or more haml files in [project folder]/haml
+          %li run rake to translate all haml-files into html-files in [project folder]/public
+          %li Deploy by uploading all content from the public folder to your webserver
+      #footer
+        %p
+          %a(href="http://github.com/oem/redrum")redrum on github
+

data/templates/bright/public/css/bright.css

@@ -0,0 +1,69 @@
+/* General Styles */
+
+body {
+  font: 10px Arial, Helvetica;
+  color: #666666;
+  background-color: #F5F5F5;
+  padding: 0px;
+  margin: 0px;
+}
+
+h1, h2, h3, h4 {
+  font: italic 16px "Georgia", "Times", serif;
+  color: #222222;
+}
+
+p {
+  line-height: 1.5em;
+}
+
+em {
+  color: #3592a8;
+  padding: 4px 8px;
+  font-style: italic;
+}
+
+a {
+  color: #000;
+  text-decoration: none;
+  font-weight: bold;
+  border-bottom: dotted 1px #009983;
+  padding: 2px 5px;
+  border-bottom: dotted 1px #aaa;
+}
+
+a:hover {
+  border:none;
+  color: #aaa;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+#wrapper {
+  width: 1000px;
+  font-size: 1.3em;
+  padding: 1em .5em;
+}
+
+/* Page Structure */
+
+#header {
+  margin-top: 1.5em;
+}
+
+#header, #content, #footer{ 
+  padding-left: 200px;
+  padding-right: 30px;
+}
+
+#header h1 {
+  font-size: 3em;
+}
+
+#footer {
+  margin-top: 50px;
+}
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redrum
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - !binary |
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,16 +49,21 @@ files:
 - lib/redrum/default_files.rb
 - lib/redrum/redrum.rb
 - lib/redrum/skeleton.rb
+- lib/redrum/templates.rb
 - lib/redrum.rb
 - spec/redrum/cli_spec.rb
 - spec/redrum/default_files_spec.rb
 - spec/redrum/redrum_spec.rb
 - spec/redrum/skeleton_spec.rb
+- spec/redrum/templates_spec.rb
 - spec/spec_helper.rb
 - bin/redrum
 - features/command_line_interface.feature
 - features/create_folder_skeleton.feature
 - features/default_files.feature
+- features/templates.feature
+- templates/bright/haml/index.haml
+- templates/bright/public/css/bright.css
 - templates/default/haml/index.haml
 - templates/default/public/css/default.css
 - templates/default/Rakefile