serve 1.5.0.pre5 → 1.5.0

data/spec/project_spec.rb

@@ -4,101 +4,101 @@ require 'fileutils'
 
 describe Serve::Project do
   
-  describe "Creating a new serve project" do
+  describe "Creating a new Serve project" do
     
     class SilentOut
       def puts(*args); end
       def print(*args); end
     end
     
+    include Serve::Path
+    
     before(:all) do
       @options = {
-        :port         => 4000,
-        :address      => '0.0.0.0',
-        
-        :name       => 'test_mockup',
-        :directory  => File.dirname(__FILE__),
+        :port       => 4000,
+        :address    => '0.0.0.0',
+        :directory  => 'serve_project_for_tests',
         :framework  => 'jquery'
       }
       
-      @mockup        = Serve::Project.new(@options)
-      @mockup.stdout = SilentOut.new
-      @mockup.stderr = SilentOut.new
+      @project        = Serve::Project.new(@options)
+      @project.stdout = SilentOut.new
+      @project.stderr = SilentOut.new
       
-      @mockup_file  = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), @options[:name]))).relative_path_from(Pathname.new(Dir.pwd)).to_s
-    end
-    
-    after(:all) do
-      FileUtils.rm_rf(@mockup_file)
+      @project_root  = normalize_path(@options[:directory])
     end
     
-    it "should have a project name" do
-      @mockup.name.should == 'test_mockup'
+    after :all do
+      FileUtils.rm_rf @project_root
     end
     
     it "should have a project directory" do
-      @mockup.location.should == @mockup_file
+      @project.location.should == 'serve_project_for_tests'
     end
     
     it "should have a framework" do
-      @mockup.framework.should == 'jquery'
+      @project.framework.should == 'jquery'
+    end
+    
+    it "should have a default template" do
+      @project.template.should == 'default'
     end
     
     describe "The created files" do
       before(:all) do
-        @mockup.create
+        @project.create
       end
       
       it "should create a directory" do
-        File.exists?(@mockup_file).should be_true
+        exists?('.').should be_true
       end
       
       it "should have a public directory" do
-        File.exists?(File.join(@mockup_file, 'public')).should be_true
+        exists?('public').should be_true
       end
       
       it "should have a javascript directory" do
-        File.exists?(File.join(@mockup_file, 'public/javascripts')).should be_true
+        exists?('public/javascripts').should be_true
       end
       
       it "should have a stylesheets directory" do
-        File.exists?(File.join(@mockup_file, 'public/stylesheets')).should be_true
+        exists?('public/stylesheets').should be_true
       end
       
       it "should have an images directory" do
-        File.exists?(File.join(@mockup_file, 'public/images')).should be_true
+        exists?('public/images').should be_true
       end
       
       it "should have a sass directory" do
-        File.exists?(File.join(@mockup_file, 'stylesheets')).should be_true
+        exists?('stylesheets').should be_true
       end
       
       it "should have a tmp directory" do
-        File.exists?(File.join(@mockup_file, 'tmp')).should be_true
+        exists?('tmp').should be_true
       end
       
       it "should have a views directory" do
-        File.exists?(File.join(@mockup_file, 'views')).should be_true
+        exists?('views').should be_true
       end
       
       it "should have config.ru file" do
-        File.exists?(File.join(@mockup_file, 'config.ru')).should be_true
+        exists?('config.ru').should be_true
       end
       
       it "should have a compass.config file" do
-        File.exists?(File.join(@mockup_file, 'compass.config')).should be_true
+        exists?('compass.config').should be_true
       end
       
       it "should have a dot gitignore file" do
-        File.exists?(File.join(@mockup_file, '.gitignore')).should be_true
+        exists?('.gitignore').should be_true
       end
       
-      it "should have a README file" do
-        File.exists?(File.join(@mockup_file, 'README.markdown')).should be_true
+      it "should have a restart file" do
+        exists?('tmp/restart.txt').should be_true
       end
       
-      it "should have a restart file" do
-        File.exists?(File.join(@mockup_file, 'tmp/restart.txt')).should be_true
+      def exists?(filename)
+        File.exists?(File.join(@project_root, filename))
       end
     end
     

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.5.0.pre5
+  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors: 
 - John W. Long
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -04:00
+date: 2011-07-12 00:00:00 -04:00
 default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -255,6 +255,11 @@ files:
 - bin/serve
 - lib/serve.rb
 - lib/serve/application.rb
+- lib/serve/bootstrap/Gemfile
+- lib/serve/bootstrap/README.md
+- lib/serve/bootstrap/compass.config
+- lib/serve/bootstrap/config.ru
+- lib/serve/bootstrap/gitignore
 - lib/serve/export.rb
 - lib/serve/handlers/dynamic_handler.rb
 - lib/serve/handlers/email_handler.rb
@@ -268,16 +273,20 @@ files:
 - lib/serve/project.rb
 - lib/serve/rack.rb
 - lib/serve/router.rb
-- lib/serve/templates/Gemfile
-- lib/serve/templates/README.markdown
-- lib/serve/templates/_layout.html.erb
-- lib/serve/templates/application.scss
-- lib/serve/templates/compass.config
-- lib/serve/templates/config.ru
-- lib/serve/templates/gitignore
-- lib/serve/templates/hello.html.erb
-- lib/serve/templates/index.redirect
-- lib/serve/templates/view_helpers.rb
+- lib/serve/templates/default/public/images/serve-logo.png
+- lib/serve/templates/default/stylesheets/modules/_all.scss
+- lib/serve/templates/default/stylesheets/modules/_links.scss
+- lib/serve/templates/default/stylesheets/modules/_typography.scss
+- lib/serve/templates/default/stylesheets/modules/_utility.scss
+- lib/serve/templates/default/stylesheets/partials/_base.scss
+- lib/serve/templates/default/stylesheets/partials/_content.scss
+- lib/serve/templates/default/stylesheets/partials/_layout.scss
+- lib/serve/templates/default/stylesheets/screen.scss
+- lib/serve/templates/default/views/_layout.html.erb
+- lib/serve/templates/default/views/index.redirect
+- lib/serve/templates/default/views/layouts/default.html.erb
+- lib/serve/templates/default/views/view_helpers.rb
+- lib/serve/templates/default/views/welcome.html.erb
 - lib/serve/version.rb
 - lib/serve/view_helpers.rb
 - spec/application_spec.rb
@@ -287,18 +296,16 @@ files:
 - spec/project_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
+- spec/stylesheets/application.scss
+- spec/views/_layout.html.erb
+- spec/views/hello.html.erb
+- spec/views/index.redirect
+- spec/views/view_helpers.rb
 has_rdoc: true
 homepage: http://get-serve.com
 licenses: 
 - MIT
-post_install_message: |-
-  Thanks for installing Serve! If you plan to use Serve with another
-  template language (apart from ERB), don't forget to install it.
-  
-  If you want use Sass or Compass remember to install them, too!
-  
-  Serve doesn't install these dependencies by default, so that you can
-  make your own decisions about what you want to use.
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -308,16 +315,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1813519296002584178
+      hash: -400107684497950535
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: