mango 0.5.0.beta3 → 0.5.0.beta4

data/CHANGES.mdown

@@ -1,4 +1,4 @@
-Mango release 0.5.0.beta3 (October 21, 2010)
+Mango release 0.5.0.beta4 (October 24, 2010)
 ============================================
 
 ### Features
@@ -13,6 +13,8 @@ Mango release 0.5.0.beta3 (October 21, 2010)
 
 ### Dependencies
 
+  * Added [RubyGems](https://rubygems.org/) 1.3.7
+  * Updated [Ruby](http://www.ruby-lang.org/) to 1.9.1 or 1.9.2
   * Updated [Bundler](http://gembundler.com/) to 1.0.3
   * Updated [Haml](http://haml-lang.com/) to 3.0.22
   * Updated [Sass](http://sass-lang.com/) to 3.0.22 (bundled with Haml)
@@ -25,6 +27,7 @@ Mango release 0.5.0.beta3 (October 21, 2010)
 ### Bugs
 
   * The NOT_FOUND handler no longer renders the 404 template within a layout template.
+  * Improved install-time and run-time error messages for Ruby 1.8 environments
 
 Mango release 0.4.0 (August 30, 2010)
 =====================================

data/README.mdown

@@ -2,7 +2,7 @@
 
 Image courtesy of [B.C. Tree Fruits LTD.](http://www.bctree.com/products/sourced/mango.php)
 
-Mango release 0.5.0.beta3 (October 21, 2010)
+Mango release 0.5.0.beta4 (October 24, 2010)
 ============================================
 
 Copyright (c) 2010 Ryan Sobol. Licensed under the MIT license.  Please see the {file:LICENSE} for more information.
@@ -29,6 +29,8 @@ WHAT'S NEW?
 
 ### Dependencies
 
+  * Added [RubyGems](https://rubygems.org/) 1.3.7
+  * Updated [Ruby](http://www.ruby-lang.org/) to 1.9.1 or 1.9.2
   * Updated [Bundler](http://gembundler.com/) to 1.0.3
   * Updated [Haml](http://haml-lang.com/) to 3.0.22
   * Updated [Sass](http://sass-lang.com/) to 3.0.22 (bundled with Haml)
@@ -41,6 +43,7 @@ WHAT'S NEW?
 ### Bugs
 
   * The NOT_FOUND handler no longer renders the 404 template within a layout template.
+  * Improved install-time and run-time error messages for Ruby 1.8 environments
 
 Please see {file:CHANGES.mdown} for the historical overview of the project.
 
@@ -71,7 +74,8 @@ REQUIREMENTS
 
 **Required dependencies**
 
-  * [Ruby](http://www.ruby-lang.org/) 1.9.1
+  * [Ruby](http://www.ruby-lang.org/) 1.9.1 or 1.9.2 ([RVM](http://rvm.beginrescueend.com/) recommended)
+  * [RubyGems](https://rubygems.org/) 1.3.7 (bundled with Ruby)
   * [Bundler](http://gembundler.com/) 1.0.3
   * [Rack](http://rack.rubyforge.org/) 1.2.1
   * [Sinatra](http://www.sinatrarb.com/) 1.0
@@ -91,35 +95,51 @@ REQUIREMENTS
 INSTALLING
 ----------
 
-    $ gem install mango
+    $ gem install mango -v 0.5.0.beta4
+
+Note: Depending on how RubyGems is installed on your machine, you *may* need to prepend the command with `sudo`.
 
 USAGE
 -----
 
-### A sample blog structure
-
-    |-- content
-    |   |-- about
-    |   |   |-- index.haml
-    |   |   `-- us.haml
-    |   `-- index.haml
-    `-- themes
-        `-- default
-            |-- public
-            |   |-- images
-            |   |   `-- ripe-mango.jpg
-            |   `-- robots.txt
-            |-- styles
-            |   `-- screen.sass
-            `-- views
-                |-- 404.haml
-                |-- layout.haml
-                `-- page.haml
-
-### Starting a development server
+### Generating a Mango application
+
+    $ mango create /path/to/your/app
 
+### Starting the application
+
+    $ cd /path/to/your/app
     $ rackup
 
+### Generated application structure
+
+    $ tree
+    .
+    ├── Gemfile
+    ├── README.md
+    ├── config.ru
+    ├── content
+    │   └── index.md
+    └── themes
+        └── default
+            ├── public
+            │   ├── favicon.ico
+            │   ├── images
+            │   │   └── particles.gif
+            │   ├── javascripts
+            │   │   ├── fireworks.js
+            │   │   └── timer.js
+            │   ├── robots.txt
+            │   └── styles
+            │       ├── fireworks.css
+            │       └── reset.css
+            ├── styles
+            │   └── screen.sass
+            └── views
+                ├── 404.haml
+                ├── layout.haml
+                └── page.haml
+
 UNDER THE HOOD
 --------------
 

data/Rakefile

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require_relative "lib/mango"
+require File.expand_path("lib/mango", File.dirname(__FILE__))
 Mango::Dependencies.warn_at_exit
 
 ###################################################################################################

data/bin/mango

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+# Ensure the environment uses the correct version of Ruby
+require File.expand_path("../lib/mango/dependencies", File.dirname(__FILE__))
+
 require_relative "../lib/mango/runner"
 Mango::Runner.start

data/lib/mango.rb

@@ -1,5 +1,8 @@
 # encoding: UTF-8
-require_relative "mango/dependencies" # ruby version guard
+
+# Ensure the environment uses the correct version of Ruby
+require File.expand_path("mango/dependencies", File.dirname(__FILE__))
+
 require_relative "mango/version"
 require_relative "mango/rack/debugger"
 require_relative "mango/application"

data/lib/mango/dependencies.rb

@@ -9,9 +9,9 @@ module Mango
   # is not always a better version.
   #
   # `Mango::Dependencies` automatically enforces a strict parse-time check for the
-  # `REQUIRED_RUBY_VERSION` on both application and development processes for the `Mango` library.
-  # (i.e. `bin/mango`, `rake`, `spec`, etc)  Because of this, I've ensured this file is
-  # syntactically compatible with Ruby 1.8.6 or higher.
+  # `SUPPORTED_RUBY_VERSIONS` on both application and development processes for the `Mango`
+  # library. (i.e. `bin/mango`, `rake`, `spec`, `rackup`, etc)  Because of this, I've ensured this
+  # file is syntactically compatible with Ruby 1.8.7 or higher.
   #
   # Currently, `Mango` does **not** enforce strict parse-time version checking on `DEVELOPMENT_GEMS`.
   # In the future, I would like to experiment with using RubyGems and the `Kernel#gem` method to
@@ -36,8 +36,7 @@ module Mango
   # @see Mango::Dependencies.create_warning_for
   # @see Mango::Dependencies.warn_at_exit
   class Dependencies
-    # For now, starting with Ruby 1.9.1 but I would like to experiment with compatibility with Ruby >= 1.9.1 in the future.
-    REQUIRED_RUBY_VERSION = "1.9.1"
+    SUPPORTED_RUBY_VERSIONS = ["1.9.1", "1.9.2"]
 
     # bluecloth is a hidden yard dependency for markdown support
     DEVELOPMENT_GEMS = {
@@ -49,9 +48,9 @@ module Mango
     }
 
     FILE_NAME_TO_GEM_NAME = {
-      :"rack/test"          => :"rack-test",
-      :"spec/rake/spectask" => :rspec,
-      :"yard/sinatra"       => :"yard-sinatra"
+      :"rack/test"            => :"rack-test",
+      :"rspec/core/rake_task" => :rspec,
+      :"yard/sinatra"         => :"yard-sinatra"
     }
 
     # Empties the warnings cache.  This method is called when the class is required.
@@ -106,17 +105,17 @@ module Mango
 
     private
 
-    # Checks that the version of the current Ruby process matches the `REQUIRED_RUBY_VERSION`.
-    # This method is automatically invoked at the first time this class is required, ensuring the
-    # correct Ruby version at parse-time.
+    # Checks that the version of the current Ruby process matches the one of the
+    # `SUPPORTED_RUBY_VERSIONS`. This method is automatically invoked at the first time this class
+    # is required, ensuring the correct Ruby version at parse-time.
     #
     # @param [String] ruby_version Useful for automated specifications.  Defaults to `RUBY_VERSION`.
     # @raise [SystemExit] Raised, with a message, when the process is using an incorrect version of Ruby.
     def self.check_ruby_version(ruby_version = RUBY_VERSION)
-      unless ruby_version == REQUIRED_RUBY_VERSION
+      unless SUPPORTED_RUBY_VERSIONS.include?(ruby_version)
         abort <<-ERROR
-This library requires Ruby #{REQUIRED_RUBY_VERSION}, but you're using #{ruby_version}.
-Please visit http://www.ruby-lang.org/ for installation instructions.
+This library supports Ruby #{SUPPORTED_RUBY_VERSIONS.join(" or ")}, but you're using #{ruby_version}.
+Please visit http://www.ruby-lang.org/ or http://rvm.beginrescueend.com/ for installation instructions.
         ERROR
       end
     end

data/lib/mango/templates/Gemfile

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 source "http://rubygems.org"
 
-gem "mango", "0.5.0.beta3"
+gem "mango", "0.5.0.beta4"

data/lib/mango/version.rb

@@ -2,5 +2,5 @@
 
 module Mango
   # Current stable released version
-  VERSION = "0.5.0.beta3"
+  VERSION = "0.5.0.beta4"
 end

data/mango.gemspec

@@ -11,12 +11,13 @@ Gem::Specification.new do |s|
   s.summary     = "Mango is a dynamic, database-free, and open source website framework"
   s.description = "Mango is a dynamic, database-free, and open source website framework that is designed to make life easier for small teams of designers, developers, and content writers."
 
-  s.required_rubygems_version = ">= 1.3.7"
+  s.required_ruby_version     = "~> 1.9.1"
+  s.required_rubygems_version = "~> 1.3.7"
   s.rubyforge_project         = "mango"
 
   s.add_runtime_dependency "bundler",   "~> 1.0.3"
   s.add_runtime_dependency "rack",      "~> 1.2.1"
-  s.add_runtime_dependency "sinatra",   "~> 1.0"
+  s.add_runtime_dependency "sinatra",   "~> 1.0.0"
   s.add_runtime_dependency "haml",      "~> 3.0.22"
   s.add_runtime_dependency "bluecloth", "~> 2.0.9"
   s.add_runtime_dependency "thor",      "~> 0.14.3"

data/spec/mango/dependencies_spec.rb

@@ -6,8 +6,8 @@ describe Mango::Dependencies do
   #################################################################################################
 
   describe "class constant and variable defaults" do
-    it "required ruby version should be correct" do
-      Mango::Dependencies::REQUIRED_RUBY_VERSION.should == "1.9.1"
+    it "supports ruby 1.9.1 or 1.9.2" do
+      Mango::Dependencies::SUPPORTED_RUBY_VERSIONS.should == ["1.9.1", "1.9.2"]
     end
 
     it "development gem names and versions should be correct" do
@@ -24,9 +24,9 @@ describe Mango::Dependencies do
 
     it "file name to gem name look-up table should be correct" do
       expected = {
-        :"rack/test"          => :"rack-test",
-        :"spec/rake/spectask" => :rspec,
-        :"yard/sinatra"       => :"yard-sinatra"
+        :"rack/test"            => :"rack-test",
+        :"rspec/core/rake_task" => :rspec,
+        :"yard/sinatra"         => :"yard-sinatra"
       }
       Mango::Dependencies::FILE_NAME_TO_GEM_NAME.should == expected
     end
@@ -49,8 +49,8 @@ describe Mango::Dependencies do
 
     def expected_message(version)
       @expected_message = <<-ERROR
-This library requires Ruby 1.9.1, but you're using #{version}.
-Please visit http://www.ruby-lang.org/ for installation instructions.
+This library supports Ruby 1.9.1 or 1.9.2, but you're using #{version}.
+Please visit http://www.ruby-lang.org/ or http://rvm.beginrescueend.com/ for installation instructions.
       ERROR
     end
 
@@ -82,11 +82,11 @@ Please visit http://www.ruby-lang.org/ for installation instructions.
       }.should_not raise_exception(SystemExit, expected_message(version))
     end
 
-    it "aborts for ruby 1.9.2" do
+    it "doesn't abort for ruby 1.9.2" do
       version = "1.9.2"
       lambda {
         Mango::Dependencies.send(:check_ruby_version, version)
-      }.should raise_exception(SystemExit, expected_message(version))
+      }.should_not raise_exception(SystemExit, expected_message(version))
     end
   end
 
@@ -156,7 +156,7 @@ Please visit http://www.ruby-lang.org/ for installation instructions.
     end
 
     it "displays a warning message to the user on the standard output channel" do
-      Mango::Dependencies.create_warning_for(LoadError.new("no such file to load -- spec/rake/spectask"))
+      Mango::Dependencies.create_warning_for(LoadError.new("no such file to load -- rspec/core/rake_task"))
       Mango::Dependencies.create_warning_for(LoadError.new("no such file to load -- yard"))
       Mango::Dependencies.create_warning_for(LoadError.new("no such file to load -- bluecloth"))
       Mango::Dependencies.render_warnings

data/spec/mango/version_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 describe Mango do
   describe "version synchronizing" do
     before(:each) do
-      @expected = "0.5.0.beta3"
+      @expected = "0.5.0.beta4"
     end
 
     it "is correct for Mango::VERSION" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mango
 version: !ruby/object:Gem::Version 
-  hash: 1162428694
+  hash: 561593429
   prerelease: true
   segments: 
   - 0
   - 5
   - 0
-  - beta3
-  version: 0.5.0.beta3
+  - beta4
+  version: 0.5.0.beta4
 platform: ruby
 authors: 
 - Ryan Sobol
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -07:00
+date: 2010-10-24 00:00:00 -07:00
 default_executable: mango
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,11 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 1
         - 0
-        version: "1.0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -288,16 +289,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 49
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 9
+      - 1
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       hash: 21
       segments: