redrum 0.2.1 → 0.3.0

data/features/default_files.feature

@@ -0,0 +1,15 @@
+Feature: Default files
+In order to easily and quickly create websites by only filling in the specific data
+As a web designer
+I want to already have some default files I can quickly modify to have a complete website
+
+  Scenario: Creating a redrum project without any special options
+    Given there is no directory already existing at "MyBlog"
+    When I start redrum with "MyBlog"
+    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/default.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
+

data/lib/redrum.rb

@@ -4,6 +4,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 "fileutils"
 
-REDRUM_VERSION = "0.2.1"
+REDRUM_VERSION = "0.3.0"
 

data/lib/redrum/cli.rb

@@ -2,13 +2,6 @@ require "optparse"
 
 module Redrum
   class CLI
-    def initialize(project, params={})
-      params = {:output_to => STDOUT}.merge params
-      @skeleton = Skeleton.new(project, params)
-    rescue Errno::EEXIST => e
-      params[:output_to].puts e.to_s
-    end
-
     def self.parse(out=STDOUT)
         options = {}
         opt = OptionParser.new do |opts|

data/lib/redrum/default_files.rb

@@ -0,0 +1,12 @@
+module Redrum
+  class DefaultFiles
+    def self.copy(project_dir, params={})
+      Dir[File.expand_path("../../../templates/default/*", __FILE__)].each do |default|
+        source = default.scan(/templates\/(.+)$/).flatten.to_s
+        destination = project_dir + "/" + source.scan(/^.+?\/(.+)$/).to_s
+        params[:output_to].puts "Copying #{source} to #{destination}" if params[:output_to]
+        FileUtils.cp_r(default, project_dir)
+      end
+    end
+  end
+end

data/lib/redrum/redrum.rb

@@ -1,8 +1,11 @@
 module Redrum
   FOLDER_STRUCTURE = %w[haml public public/css public/img public/js]
 
-  def self.make(project_dir)
-    Skeleton.new(project_dir)
+  def self.make(project_dir, params={})
+    Skeleton.new(project_dir, params)
+    DefaultFiles.copy(project_dir, params)
+  rescue Errno::EEXIST => e
+    params[:output_to].puts e.to_s if params[:output_to]
   end
 
   def self.folder_structure
@@ -12,10 +15,10 @@ module Redrum
   def self.start(out=STDOUT)
     project = ARGV[0]
     if (ARGV.size == 1) and (ARGV[0] =~ /^[^-].+/)
-      Redrum::CLI.new(project, :output_to => out) if project
+      Redrum.make(project, :output_to => out) if project
     elsif options = Redrum::CLI.parse(out)
       options = { :output_to => out }.merge options
-      Redrum::CLI.new(project, options) if project
+      Redrum.make(project, options) if project
     end
   end
 end

data/spec/redrum/cli_spec.rb

@@ -1,20 +1,6 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Redrum::CLI do
-  describe "#new" do
-    it "creates a new Redrum::Skeleton instance" do
-      Redrum::Skeleton.should_receive(:new).with("temp", {:output_to => STDOUT})
-      Redrum::CLI.new("temp")
-    end
-
-    it "catches an error raised by Redrum::Skeleton.new if a directory already exists" do
-      messenger = StringIO.new
-      Redrum::CLI.new("temp", :output_to => messenger)
-      messenger.should_receive(:puts).with("File exists - temp")
-      Redrum::CLI.new("temp", :output_to => messenger)
-    end
-  end
-
   describe "#self.parse" do
     before do
       no_warnings { ARGV = [] }
@@ -75,8 +61,6 @@ describe Redrum::CLI do
         Redrum::CLI.parse(@messenger)
         @messenger.string.should include("Redrum v")
       end
-      
-      
     end
 
   end

data/spec/redrum/default_files_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Redrum::DefaultFiles do
+  before do
+    @project = "temp"
+    FileUtils.rm_rf @project rescue nil
+  end
+
+  after(:all) do
+    FileUtils.rm_rf @project rescue nil
+  end
+
+  describe "#copy" do
+    it "calls FileUtils.cp_r to copy Rakefile" do
+      FileUtils.as_null_object.should_receive(:cp_r).with(File.expand_path("../../../templates/default/Rakefile", __FILE__), @project)
+      Redrum::DefaultFiles.copy(@project)
+    end
+
+    it "prints what files and directories it is copying to :output_to" do
+      @messenger = StringIO.new
+      @messenger.as_null_object.should_receive(:puts).with("Copying default/Rakefile to temp/Rakefile")
+      @messenger.as_null_object.should_receive(:puts).with("Copying default/haml to temp/haml")
+      @messenger.as_null_object.should_receive(:puts).with("Copying default/public to temp/public")
+      FileUtils.stub(:cp_r)
+      Redrum::DefaultFiles.copy(@project, :output_to => @messenger)
+    end
+  end
+end

data/spec/redrum/redrum_spec.rb

@@ -9,9 +9,21 @@ describe Redrum do
 
   describe "#self.make" do
     it "wraps the Redrum::Skeleton.new call" do
-      Redrum::Skeleton.should_receive(:new).with(@target)
+      Redrum::Skeleton.should_receive(:new).with(@target, {})
+      Redrum::DefaultFiles.stub(:copy)
       Redrum.make(@target)
     end
+
+    it "calls Redrum::DefaultFiles.copy" do
+      Redrum::DefaultFiles.should_receive(:copy).with(@target, :output_to => @messenger)
+      Redrum.make(@target, :output_to => @messenger)
+    end
+
+    it "rescues the raised error from Skeleton.new and prints out a nice error message" do
+      @messenger.should_receive(:puts).with("File exists - temp")
+      Redrum.make(@target, :output_to => @messenger)
+    end
+    
   end
 
   describe "#self.folder_structure" do
@@ -24,17 +36,30 @@ describe Redrum do
   describe "#self.start" do
     before { Dir.stub(:mkdir) }
 
-    it "wraps Redrum::CLI.new" do
-      Redrum::CLI.should_receive(:new)
+    it "wraps Skeleton.new" do
+      Redrum::Skeleton.should_receive(:new)
+      Redrum.start(@messenger)
+    end
+
+    it "calls Redrum.make to do the backend work" do
+      Redrum.should_receive(:make)
       Redrum.start(@messenger)
     end
 
     it "calls Redrum::CLI.parse when there seem to be parameters to parse" do
+      no_warnings { ARGV = [ @target, "--help" ] }
       Redrum::CLI.should_receive(:parse)
       Redrum::CLI.stub(:new)
       Redrum.start(@messenger)
     end
 
+    it "does not call Redrum::CLI.parse when there was only a project name given" do
+      no_warnings { ARGV = [ @target ] }
+      Redrum::CLI.should_not_receive(:parse)
+      Redrum::CLI.stub(:new)
+      Redrum.start(@messenger)
+    end
+
     it "does not show the help page when a project name is defined without parameters" do
       no_warnings { ARGV = [ @target ] }
       Redrum.start(@messenger)

data/spec/redrum/skeleton_spec.rb

@@ -4,6 +4,7 @@ describe Redrum::Skeleton do
   before do
     @target = "temp"
     FileUtils.rm_rf(@target) rescue nil
+    @messenger = StringIO.new
   end
 
   after(:all) { FileUtils.rm_rf("temp") rescue nil }
@@ -22,8 +23,8 @@ describe Redrum::Skeleton do
     end
 
     it "informs us what folders it creates, if params[:output_to] is defined" do
-      STDOUT.as_null_object.should_receive(:puts).with("Creating temp")
-      Redrum::Skeleton.new(@target, :output_to => STDOUT)
+      @messenger.as_null_object.should_receive(:puts).with("Creating temp")
+      Redrum::Skeleton.new(@target, :output_to => @messenger)
     end
 
     it "does not print what it creates if params[:output_to] is not defined" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redrum
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - !binary |
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 +02:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
+        - 0
         - 0
-        version: "0"
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 description: Create static websites with a little help from redrum!
@@ -44,16 +46,19 @@ extra_rdoc_files: []
 
 files: 
 - lib/redrum/cli.rb
+- lib/redrum/default_files.rb
 - lib/redrum/redrum.rb
 - lib/redrum/skeleton.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/spec_helper.rb
 - bin/redrum
 - features/command_line_interface.feature
 - features/create_folder_skeleton.feature
+- features/default_files.feature
 has_rdoc: true
 homepage: http://darkno.de
 licenses: []