Add the choco server command to launch your application locally on a …

…rack server

HISTORY

@@ -1,3 +1,7 @@
+== 0.1.3 [08-31-10]
+* Add $ choco server command to launch a local rack server
+* A config.ru file is created at the root of each new project
+
 == 0.1.2 [08-27-10]
 * Add fixtures generate (mock ajax requests)
 

README.rdoc

@@ -42,10 +42,18 @@ This will generate your project structure.
 You can then install the required JS dependencies (jQuery, Sammy, ...) by executing the following command at the root of your project :
 
   $ rake choco:js:install
+
+Launch your local server :
+
+  $ choco server
+
 
 == Location
 
 A Choco app is composed of static files (js, css, images, ...), it must be directly accessible on your web server.
+
+A local Rack web server can be launched directly using the '$ choco server' command. You'll have to install WEBRick or Mongrel.
+
 If you use Rails, you can for example put your Choco app inside the public/javascripts folder.
 
 Once you've chosen the location where your application will reside, don't forget to configure the path to your view files.

choco.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Heukmes"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-07-31}
   s.default_executable = %q{choco}
   s.description = %q{Choco brings the MVC to the client side! It allows you to easily develop maintainable Rich Internet Applications using Javascript.}
   s.email = %q{anthony.heukmes@skynet.be}
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/choco/generators/templates/Rakefile",
      "lib/choco/generators/templates/application.css",
      "lib/choco/generators/templates/choco",
+     "lib/choco/generators/templates/config.ru",
      "lib/choco/generators/templates/controllers/application_controller.js",
      "lib/choco/generators/templates/controllers/base_controller.js",
      "lib/choco/generators/templates/controllers/rest_controller.js",
@@ -87,19 +88,22 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<fssm>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])      
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<jim>, [">= 0"])
       s.add_dependency(%q<fssm>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])      
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<jim>, [">= 0"])
     s.add_dependency(%q<fssm>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

lib/choco.rb

@@ -3,7 +3,7 @@
 require 'active_support/inflector'
 
 module Choco
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   autoload :DependencyManager, 'choco/dependency_manager'
   autoload :CLI, 'choco/cli'  

lib/choco/cli.rb

@@ -13,7 +13,8 @@ def run
       @args << '--help' if @args.empty?
 
       aliases = {
-        "g"  => "generate"
+        "g"  => "generate",
+        "s"  => "server"
       }
 
       command = @args.shift
@@ -28,6 +29,14 @@ def run
           else
             @output = template('generators')
           end
+
+        when 'server'
+          port = 9292
+          port = @args[@args.index('-p') + 1] if @args.include?('-p')
+          port = @args[@args.index('--port') + 1] if @args.include?('--port')
+          puts "*** Choco server is now running on port #{port}"
+          puts "*** Launch http://localhost:#{port}/index.html to start your Choco application"
+          system "rackup #{@args.join(' ')}"
 
         when '--watch'
           require 'fssm'

lib/choco/generators/app_generator.rb

@@ -62,6 +62,10 @@ def create_rakefile
       template('templates/Rakefile', "#{name}/Rakefile")
     end
 
+    def create_rackup_file
+      template('templates/config.ru', "#{name}/config.ru")
+    end
+
     def create_readme_file
       create_file "#{name}/README.rdoc"
     end

lib/choco/generators/templates/config.ru

@@ -0,0 +1,3 @@
+map '/' do
+  run Rack::Directory.new('.')
+end

lib/choco/generators/templates/controllers/application_controller.js

@@ -2,7 +2,7 @@ var app = $.sammy(function() {
 
 	this.element_selector = '#choco';
 	this.template_engine = 'template';
-	this.project_path = '/<%= name %>';
+	this.project_path = '';
 	this.fixtures = true;
 
 	// Configure your Sammy JS plugins

lib/choco/generators/templates/help/commands

@@ -9,4 +9,8 @@ The choco script responds to the following commands and options :
 generate <generator_name> <resource_name> [options]
   Available generators are : controller, model, scaffold, fixture, layout, plugin
   Run '$ choco generate', for more information.
-
+
+server [options]
+  -s, --server SERVER      serve using SERVER (webrick/mongrel)
+  -p, --port PORT          use PORT (default: 9292)
+

spec/generators_spec.rb

@@ -64,14 +64,6 @@
 
     describe "templates" do
 
-      describe "ApplicationController" do
-
-        it "should set the views path to the project views folder" do
-          file = get_file_as_string(@project_path + '/app/controllers/application_controller.js')
-          file.include?("this.project_path = '/spec/tmp/test_project';").should be_true
-        end
-      end
-
       describe "index.html" do
 
         before(:all) do