xmvc 0.1.0 → 0.1.1

data/.document

@@ -1,5 +1,5 @@
 README.rdoc
-lib/**/*.rb
+#lib/**/*.rb
 bin/*
 features/**/*.feature
 LICENSE

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/xmvc

@@ -2,11 +2,18 @@
 
 # Check if an older version of extjs-mvc is installed
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift("/Users/chris/workspace/extjs/extjs-mvc/lib")
+
 require 'xmvc'
 require 'xmvc/cli'
 
+require 'extjs-mvc'
+require 'extjs-mvc/cli'
+
 begin
-  Xmvc::CLI.start
+  Xmvc::CLI.start(ARGV, {
+    :host => ExtJS::MVC
+  })
 rescue Xmvc::Error => e
   Xmvc.ui.error(e.message)
   exit e.status_code

data/lib/xmvc/builder.rb

@@ -27,17 +27,18 @@ module Xmvc
           # Note that we must pass-in the name of the newly created app @name so that
           # Jammit appends that to its config_path, otherwise it would create its config file
           # in the pwd.
-          
           @asset_root = options[:asset_root] || File.expand_path('.')
           
-          app_assets
+          javascripts = {
+            "application" => application_assets("javascripts", options[:application])
+          }
+          options[:vendors].each do |vendor|
+            javascripts.update(vendor["name"] => vendor_assets("javascripts", vendor))
+          end
           
           jammit = Jammit::CLI.new([], options)
           jammit.invoke(:init)
-          jammit.invoke(:config, ["set", "javascripts", {
-            "mvc" => mvc_assets,
-            "app" => app_assets
-          }])
+          jammit.invoke(:config, ["set", "javascripts",  javascripts])
           jammit.invoke(:build)
 
         rescue Jammit::Error => e
@@ -45,27 +46,16 @@ module Xmvc
         end
       end
       
-      def jammit(options={})
-        Jammit::CLI.new([], options)
+      def vendor_assets(type, vendor)
+        vendor[type].map {|f| File.join("vendor", vendor["name"], f) }
       end
       
-      def mvc_assets
-        YAML.load(File.read(File.join(@asset_root, 'vendor', 'mvc', 'build'))).map {|f|
-          File.join('vendor', 'mvc', f)
-        }
+      def application_assets(type, assets)
+        assets.map {|f| File.join(f)}
       end
       
-      def app_assets
-        [
-          'app/App.js',
-          'config/application.js',
-          'config/routes.js',
-          'vendor/plugins/*/**.js',
-          'overrides/*.js',
-          'app/models/*.js',
-          'app/controllers/*.js',
-          'app/views/*/**.js'
-        ]
+      def jammit(options={})
+        Jammit::CLI.new([], options)
       end
     end
   end

data/lib/xmvc/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 
 require 'jammit-core'
 require 'jammit-core/cli'
+
   
 module Xmvc
   class CLI < Thor
@@ -9,7 +10,7 @@ module Xmvc
     
     desc "install", "Install a framework"
     def install(path)
-      Xmvc.ui.confirm('install')
+      Xmvc.ui.confirm('Xmvc install')
     end
     
     desc "generate", "Generate model, controller, view or app"
@@ -43,16 +44,22 @@ module Xmvc
     end
     
     def initialize(args=ARGV, config={}, options={})
+      
       # Boot UI
       Xmvc.ui = UI::Shell.new(shell)
       
+      unless options[:host]
+        raise Xmvc::NoFramework.new("Xmvc is meant to be supplied with a framework extension, eg extjs-mvc, via Xmvc::CLI.start(ARGV, {:framework => Your::Framework})")
+      end
+      
       # Boot environment
       Xmvc.environment = Xmvc::Environment.new(:development)
       
+      # Set the framework.
+      Xmvc.host = options[:host]
+            
       super
     end
-    
-    private
   
   end
 end

data/lib/xmvc/environment.rb

@@ -1,6 +1,5 @@
 module Xmvc
   class Environment
-    attr_reader :environment
     def initialize(environment)
       @environment = environment
       Xmvc.ui.info("(loaded #{@environment.to_s} environement)")

data/lib/xmvc/generators/app.rb

@@ -1,7 +1,18 @@
 module Xmvc
   module Generator
     class App < Base
-    
+      
+      FRAMEWORK_ASSETS = [
+        'app/App.js',
+        'config/application.js',
+        'config/routes.js',
+        'vendor/plugins/*/**.js',
+        'overrides/*.js',
+        'app/models/*.js',
+        'app/controllers/*.js',
+        'app/views/*/**.js'
+      ]
+      
       def initialize(name, namespace=nil)
         @file_re ||= Regexp.new("^\.?\/(.*)")
         @name = name
@@ -16,32 +27,54 @@ module Xmvc
         FileUtils.mkdir(@name)
         FileUtils.chdir(@name)
         
+        # Save a ref to app root, need for Jammit config.
+        app_root = File.expand_path(".")
+        
+        # Create the root directory
+        create_root
+        
+        # Now walk into the created public folder to write the javascript framework
+        FileUtils.chdir("public")
         create_app
         create_config
         create_lib
         create_public
         create_spec
         create_vendor
-        create_mvc
-        
+        install_host
+                
         # Build assets.
         Xmvc::BuilderManager.dispatch(:setup, {
-          :asset_root => File.expand_path('.')
+          :asset_root => File.expand_path('.'),
+          :app_root => app_root,
+          :vendors => [
+            Xmvc.host.config
+          ],
+          :application => FRAMEWORK_ASSETS
         })
                   
       end
 
       private
       
+      def create_root
+        FileUtils.mkdir(%w(public))
+        
+        # Write config/settings.yml, call-out to Xmvc::Environment isntead.
+        #FileUtils.cp("#{@template}/config/environment.yml", "config")
+        copy_file("config", ".")
+        
+      end
+      
       def create_app
         FileUtils.mkdir(%w(app app/models app/views app/controllers))
-        copy_file("app", ".")
+        copy_file("public/app", ".")
         show_files("app")        
       end
       
       def create_config
         FileUtils.mkdir(%w(config config/environments))
-        copy_file("config", ".")
+        copy_file("public/config", ".")
         show_files("config")
       end
       
@@ -52,27 +85,34 @@ module Xmvc
       
       def create_public
         FileUtils.mkdir(%w(public public/stylesheets public/images public/javascripts))
-        copy_file("public", ".")
+        copy_file("public/public", ".")
         show_files("public")
       end
       
       def create_spec
         FileUtils.mkdir(%w(spec spec/controllers spec/models))
-        copy_file("spec", ".")
+        copy_file("public/spec", ".")
         show_files("spec")
       end
       
       def create_vendor
         FileUtils.mkdir(%w(vendor vendor/plugins))
-        copy_file("vendor", ".")
+        copy_file("public/vendor", ".")
         show_files("vendor", false)
-        show_files("vendor/mvc", false)
       end
       
-      def create_mvc
-        FileUtils.cp_r("#{Xmvc::ROOT}/js/", "vendor/mvc")
+      def install_host
+        begin
+          Xmvc.host.install("vendor")
+          Xmvc.ui.confirm(" install vendor/#{Xmvc.host.config['name']}")
+        rescue StandardError => e
+          Xmvc.ui.error('An error occured while installing the host framework')
+          raise Xmvc::HostError.new(e.message)
+        end
+          
       end
       
+      
       def notify(f)
         m = f.match(@file_re)
         Xmvc.ui.confirm(" create #{(m) ? m[1] : f}")

data/lib/xmvc/generators/base.rb

@@ -9,19 +9,21 @@ module Xmvc
                               
       def initialize *args
         @gsubs ||= {}
-        @gsubs['namespace']  = Xmvc.environment['namespace']
+        @gsubs['namespace']  = "development" #Xmvc.environment['namespace']
       end
 
       protected
       def ensure_directories_present! *args
         args.each do |a|
-          Dir.mkdir(a) unless File.exists?(a)
+          path = public_path(a)
+          Dir.mkdir(path) unless File.exists?(path)
         end
       end
 
       def ensure_no_overwrite! *args
         args.each do |a|
-          if File.exists?(a) && !ARGV.include?("--force")
+          path = public_path(a)
+          if File.exists?(path) && !ARGV.include?("--force")
             raise Xmvc::FileExists.new("File already exists: #{a}")
           end
         end
@@ -29,7 +31,7 @@ module Xmvc
 
       def template(template_filename, destination_filename)
         #write the file
-        File.open(destination_filename, 'w') {|f| f.puts(render_template(template_filename))}
+        File.open(public_path(destination_filename), 'w') {|f| f.puts(render_template(template_filename))}
 
         Xmvc.ui.confirm(" Created #{destination_filename}")
       end
@@ -51,7 +53,11 @@ module Xmvc
       end
       
     private
-    
+      
+      def public_path(f)
+        File.join("public", f)
+      end
+      
       ##
       # write a newly generated controller, model or view to environment.json
       # Unfortunately, we cannot JSON.parse the entire config/environment.json, since it contains comments
@@ -59,6 +65,9 @@ module Xmvc
       # Is this Regexp satisfactory??  Could probably be made better.
       #
       def to_environment(key, item)
+        Xmvc.ui.warn('Generator::Base#to_environment disabled')
+        return
+        
         re      = Regexp.new("\"#{key}\"\s*\:\s*(\\[.*?\\](?!\}))", Regexp::MULTILINE)
         content = File.read('config/environment.json')  
         m = content.match(re)

data/lib/xmvc/generators/controller.rb

@@ -23,7 +23,7 @@ module Xmvc
 
         template "Controller.js", @controller_filename
         
-        to_environment(:controllers, @gsubs["controller_name"])
+        Xmvc::Settings.add(:controllers, @gsubs["controller_name"])
         
         generate_views!
       end

data/lib/xmvc/generators/model.rb

@@ -23,7 +23,9 @@ module Xmvc
         template "Model.js",     @model_filename
         template "ModelSpec.js", @spec_filename
         
-        to_environment(:models, @gsubs["file_name"])
+        #to_environment(:models, @gsubs["file_name"])
+        Xmvc::Settings.add(:models, @gsubs["file_name"])
+        
       end
 
       private

data/lib/xmvc/generators/templates/app/config/environment.yml

@@ -0,0 +1,56 @@
+# General settings used by ruby scripts
+
+namespace: MyApp
+
+##
+# Directory paths
+pluginsDIr: ../vendor/plugins
+libsDir: ../lib
+configDir: ../config
+overridesDir: ../config/overrides
+appDir: ../app
+vendor:
+- extjs-mvc
+mvcFilename: extjs-mvc-all-min
+
+# Use config/application for general framework configuration
+config:
+- app/App
+- config/application
+- config/routes
+
+##
+# All stylesheets to be loaded. These are all taken to be relative to the public/stylesheets directory, 
+# and the .css is automatically appended
+#
+stylesheets: []
+
+# Overrides to include. These files should be located in the config/overrides directory
+overrides: []
+
+# Plugins to include. Each will load vendor/plugins/SomePlugin/SomePlugin-all.js
+plugins: []
+
+# All of the models in this application, found in the app/models folder
+models: []
+
+# All of the controllers in this application, found in the app/controllers folder
+controllers:
+- application
+- home
+
+# All of the views in this application, as an object with the subfolder inside app/views as the key, 
+# and an array of filenames as the value. e.g.: 
+#   views: 
+#     index: 
+#     - index
+#     - edit
+#     - new
+#     - view 
+# will load /app/views/index/index.js and app/views/index/my_view.js
+views:
+- layout:
+  - menu
+- home:
+  - index
+

data/lib/xmvc/generators/view.rb

@@ -16,10 +16,11 @@ module Xmvc
           'class_name'      => Extlib::Inflection.camelize(@name)
         })
         
-        to_environment(:views, {
+        Xmvc::Settings.add(:views, {
           :package => @package,
           :filename  => @name
         })
+        
       end
 
       def generate!

data/lib/xmvc/settings.rb

@@ -1,3 +1,62 @@
+module Xmvc
+    module Settings
+    
+    class << self
+      
+      def dispatch(action, *params)
+        
+      end
+      
+      def load
+        @settings = YAML.load_file('config/environment.yml')
+      end
+        
+      ##
+      # write a newly generated controller, model or view to environment.json
+      # Unfortunately, we cannot JSON.parse the entire config/environment.json, since it contains comments
+      # and such.  Have to RegExp, pick-out the requested key, and JSON.parse the returned chunk.
+      # Is this Regexp satisfactory??  Could probably be made better.
+      #
+      def add (key, item)
+        key = key.to_s
+        @settings[key] = [] unless @settings[key] && @settings[key].kind_of?(Array)
+        
+        unless key == "views"
+          @settings[key] << item
+        else
+          if controller = @settings[key].find {|i| i[item[:package]]}
+            controller[item[:package]] << item[:filename]
+          else
+            @settings[key] << {
+              item[:package] => [
+                item[:filename]
+              ]
+            }
+          end
+        end
+        save
+      end
+      
+      private
+      
+      def save
+        File.open('config/environment.yml', "w") {|file|
+          file << @settings.to_yaml
+        }
+        File.open('public/config/environment.json', "w") {|file|
+          file << @settings.to_json
+        }
+      end
+    end
+  end
+end
+
+
+##
+# 
+# ORIGINAL CODE
+#
+#
 module ExtJS
   module MVC
 

data/lib/xmvc.rb

@@ -15,15 +15,16 @@ module Xmvc
   # Do autoloads here
   #
   require 'xmvc/settings'
+  require 'xmvc/builder'
   
   autoload :UI,             'xmvc/ui'
   autoload :Generator,      'xmvc/generator'
   autoload :Environment,    'xmvc/environment'
-  autoload :BuilderManager, 'xmvc/builder'
   autoload :Plugin,         'xmvc/plugin'
   autoload :Stats,          'xmvc/stats'
   autoload :Update,         'xmvc/update'
   autoload :Text,           'xmvc/test'
+  autoload :Settings,       'xmvc/settings'
   
   class Error < StandardError
     def self.status_code(code = nil)
@@ -41,6 +42,8 @@ module Xmvc
   class AppAlreadyExists < Error; status_code(3) ; end
   class FileExists < Error; status_code(4) ; end
   class BuilderError < Error; status_code(5) ; end
+  class NoFramework < Error; status_code(6) ; end
+  class HostError < Error; status_code(10) ; end
 
   ##
   # Add more error classes here
@@ -49,8 +52,17 @@ module Xmvc
   #class GemNotFound      < BundlerError; status_code(7)  ; end
 
   class << self
+    ##
+    # The Xmvc::UI instance
     attr_writer :ui
-    attr_writer :environment
+    ##
+    # The Xmvc::Environemnt instance
+    #
+    attr_accessor :environment
+    ##
+    # An instance of supplied framework plugin, eg ExtJS::MVC::CLI
+    #
+    attr_accessor :host
     
     def configure
       @configured ||= begin
@@ -62,13 +74,33 @@ module Xmvc
       end
     end
     
+    def settings
+      @settings ||= Settings.load
+    end
+    
     ##
     # Ensure we're running within a rails app unless generating a new app ($ xmvc generate app foo)
     #
     def ensure_in_app
-      unless ARGV.empty? || ARGV.first == 'help' || (File.exists?('app') && File.exists?('config') && File.exists?('config/environment.json'))
+
+      
+      if File.exists?("app") && File.exists?("config") && File.exists?("config/environment.json")
+        
+        FileUtils.chdir("..")
+        ##
+        # For development, ensure we don't execute from installed gem code
+        #
+        $LOAD_PATH.unshift('../lib')
+        #
+        #
+      end
+      
+      # Check for existence of arbitrary app files...see if it *looks* like we're in an Xmvc app.
+      unless ARGV.empty? || ARGV.first == "help" || (File.exists?("public") && File.exists?("config") && File.exists?("config/environment.yml"))
         raise Xmvc::AppNotFound.new("This command must be executed from the root of an xmvc application")
       end
+      Settings.load
+      
     end
     
     def ui

data/xmvc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xmvc}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ed Spencer and Chris Scott"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-03-11}
   s.default_executable = %q{xmvc}
   s.description = %q{A full-stack, full-stack MVC framework generator geared towards generating towards the Ext JS framework.  The actual javascript framework implementation is provided by the Gem extjs-mvc.  This gem contains a series of builders and erb-templates for auto-generating javascript model, view and controller class-files.}
   s.email = %q{christocracy@gmail.com}
@@ -49,42 +49,43 @@ Gem::Specification.new do |s|
      "lib/xmvc/generators/templates/ModelSpec.js",
      "lib/xmvc/generators/templates/View.js",
      "lib/xmvc/generators/templates/_Action.js",
-     "lib/xmvc/generators/templates/app/README.rdoc",
-     "lib/xmvc/generators/templates/app/app/App.js",
-     "lib/xmvc/generators/templates/app/app/controllers/application_controller.js",
-     "lib/xmvc/generators/templates/app/app/controllers/home_controller.js",
-     "lib/xmvc/generators/templates/app/app/views/home/index.js",
-     "lib/xmvc/generators/templates/app/app/views/layout/menu.js",
-     "lib/xmvc/generators/templates/app/config/application.js",
-     "lib/xmvc/generators/templates/app/config/boot.js",
-     "lib/xmvc/generators/templates/app/config/database.js",
-     "lib/xmvc/generators/templates/app/config/environment.json",
-     "lib/xmvc/generators/templates/app/config/environments/development.json",
-     "lib/xmvc/generators/templates/app/config/environments/production.json",
-     "lib/xmvc/generators/templates/app/config/routes.js",
-     "lib/xmvc/generators/templates/app/config/settings.yml",
-     "lib/xmvc/generators/templates/app/public/index.html",
-     "lib/xmvc/generators/templates/app/public/stylesheets/extjs-mvc-all.css",
-     "lib/xmvc/generators/templates/app/spec/SpecHelper.js",
-     "lib/xmvc/generators/templates/app/spec/index.html",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/EXAMPLE.html",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/LICENSE",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/README.markdown",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery-1.2.3.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery.fn.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery.print.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.assets.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.behaviors.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.builder.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.css",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.events.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.matchers.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.server.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/spec/behaviors_spec.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/spec/matchers_spec.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/spec/print_spec.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/spec/spec_helper.js",
-     "lib/xmvc/generators/templates/app/vendor/screw-unit/spec/suite.html",
+     "lib/xmvc/generators/templates/app/config/environment.yml",
+     "lib/xmvc/generators/templates/app/config/environments/development.yml",
+     "lib/xmvc/generators/templates/app/config/environments/production.yml",
+     "lib/xmvc/generators/templates/app/public/app/App.js",
+     "lib/xmvc/generators/templates/app/public/app/controllers/application_controller.js",
+     "lib/xmvc/generators/templates/app/public/app/controllers/home_controller.js",
+     "lib/xmvc/generators/templates/app/public/app/views/home/index.js",
+     "lib/xmvc/generators/templates/app/public/app/views/layout/menu.js",
+     "lib/xmvc/generators/templates/app/public/config/application.js",
+     "lib/xmvc/generators/templates/app/public/config/boot.js",
+     "lib/xmvc/generators/templates/app/public/config/database.js",
+     "lib/xmvc/generators/templates/app/public/config/environment.json",
+     "lib/xmvc/generators/templates/app/public/config/environments/development.json",
+     "lib/xmvc/generators/templates/app/public/config/environments/production.json",
+     "lib/xmvc/generators/templates/app/public/config/routes.js",
+     "lib/xmvc/generators/templates/app/public/public/index.html",
+     "lib/xmvc/generators/templates/app/public/public/stylesheets/extjs-mvc-all.css",
+     "lib/xmvc/generators/templates/app/public/spec/SpecHelper.js",
+     "lib/xmvc/generators/templates/app/public/spec/index.html",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/EXAMPLE.html",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/LICENSE",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/README.markdown",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery-1.2.3.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery.fn.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery.print.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.assets.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.behaviors.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.builder.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.css",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.events.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.matchers.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.server.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/behaviors_spec.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/matchers_spec.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/print_spec.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/spec_helper.js",
+     "lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/suite.html",
      "lib/xmvc/generators/templates/scaffold/ScaffoldController.js",
      "lib/xmvc/generators/view.rb",
      "lib/xmvc/plugin.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-03-11 00:00:00 -05:00
 default_executable: xmvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,42 +154,43 @@ files:
 - lib/xmvc/generators/templates/ModelSpec.js
 - lib/xmvc/generators/templates/View.js
 - lib/xmvc/generators/templates/_Action.js
-- lib/xmvc/generators/templates/app/README.rdoc
-- lib/xmvc/generators/templates/app/app/App.js
-- lib/xmvc/generators/templates/app/app/controllers/application_controller.js
-- lib/xmvc/generators/templates/app/app/controllers/home_controller.js
-- lib/xmvc/generators/templates/app/app/views/home/index.js
-- lib/xmvc/generators/templates/app/app/views/layout/menu.js
-- lib/xmvc/generators/templates/app/config/application.js
-- lib/xmvc/generators/templates/app/config/boot.js
-- lib/xmvc/generators/templates/app/config/database.js
-- lib/xmvc/generators/templates/app/config/environment.json
-- lib/xmvc/generators/templates/app/config/environments/development.json
-- lib/xmvc/generators/templates/app/config/environments/production.json
-- lib/xmvc/generators/templates/app/config/routes.js
-- lib/xmvc/generators/templates/app/config/settings.yml
-- lib/xmvc/generators/templates/app/public/index.html
-- lib/xmvc/generators/templates/app/public/stylesheets/extjs-mvc-all.css
-- lib/xmvc/generators/templates/app/spec/SpecHelper.js
-- lib/xmvc/generators/templates/app/spec/index.html
-- lib/xmvc/generators/templates/app/vendor/screw-unit/EXAMPLE.html
-- lib/xmvc/generators/templates/app/vendor/screw-unit/LICENSE
-- lib/xmvc/generators/templates/app/vendor/screw-unit/README.markdown
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery-1.2.3.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery.fn.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/jquery.print.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.assets.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.behaviors.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.builder.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.css
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.events.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.matchers.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/lib/screw.server.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/spec/behaviors_spec.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/spec/matchers_spec.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/spec/print_spec.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/spec/spec_helper.js
-- lib/xmvc/generators/templates/app/vendor/screw-unit/spec/suite.html
+- lib/xmvc/generators/templates/app/config/environment.yml
+- lib/xmvc/generators/templates/app/config/environments/development.yml
+- lib/xmvc/generators/templates/app/config/environments/production.yml
+- lib/xmvc/generators/templates/app/public/app/App.js
+- lib/xmvc/generators/templates/app/public/app/controllers/application_controller.js
+- lib/xmvc/generators/templates/app/public/app/controllers/home_controller.js
+- lib/xmvc/generators/templates/app/public/app/views/home/index.js
+- lib/xmvc/generators/templates/app/public/app/views/layout/menu.js
+- lib/xmvc/generators/templates/app/public/config/application.js
+- lib/xmvc/generators/templates/app/public/config/boot.js
+- lib/xmvc/generators/templates/app/public/config/database.js
+- lib/xmvc/generators/templates/app/public/config/environment.json
+- lib/xmvc/generators/templates/app/public/config/environments/development.json
+- lib/xmvc/generators/templates/app/public/config/environments/production.json
+- lib/xmvc/generators/templates/app/public/config/routes.js
+- lib/xmvc/generators/templates/app/public/public/index.html
+- lib/xmvc/generators/templates/app/public/public/stylesheets/extjs-mvc-all.css
+- lib/xmvc/generators/templates/app/public/spec/SpecHelper.js
+- lib/xmvc/generators/templates/app/public/spec/index.html
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/EXAMPLE.html
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/LICENSE
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/README.markdown
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery-1.2.3.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery.fn.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/jquery.print.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.assets.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.behaviors.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.builder.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.css
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.events.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.matchers.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/lib/screw.server.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/behaviors_spec.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/matchers_spec.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/print_spec.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/spec_helper.js
+- lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/suite.html
 - lib/xmvc/generators/templates/scaffold/ScaffoldController.js
 - lib/xmvc/generators/view.rb
 - lib/xmvc/plugin.rb

data/lib/xmvc/generators/templates/app/README.rdoc

@@ -1,152 +0,0 @@
-= ExtJS MVC Base App
-
-Ext MVC Application structure for any new MVC application.  Structure inspired by Ruby on Rails.
-
-== Installation
-
-Clone this as the starting point for your apps.  Place your cloned directory somewhere apache can serve it, then head to index.html:
-
-http://localhost/myDirectory/index.html
-
-You should see a default application set up and ready to go.
-
-== Prerequisites
-
-Most prerequisites are installed for you inside the vendor directory:
-
-* vendor/ext            - contains a copy of ExtJS v2.2.1 (debug version, production copy by defaults comes off the cachefly CDN)
-* vendor/mvc            - contains a copy of the latest stable version of Ext MVC (debug and minified versions)
-* vendor/screw-unit     - contains a copy of ScrewUnit, a BDD testing framework for JavaScipt
-* vendor/yui-compressor - contains a copy of the YUI compressor, which is used in the automatic build process
-
-Although is is not strictly a prerequisite, you are *strongly* advised to install Ruby and Rubygems as the scripts below will automate a lot of things 
-for you and save you a lot of time.  If you're running OSX you probably already have these, if you're on Windows it's a very simple install process.
-Take a look at http://rubyonrails.org/download for instructions (just the Ruby and RubyGems sections).
-
-If you don't intend to use the Ruby automation scripts, you can safely delete the script, vendor/mvc/scripts and vendor/yui-compressor folders.
-
-== Getting Started
-
-The only thing you need to change is the namespace your application will be using.  Choose a meaningful namespace for your application - e.g. for
-a blog application you might choose BlogApp, or something similar.  All of your code will sit under that namespace, like this:
-
-* BlogApp.models.Post                 // reference to a Post model constructor
-* BlogApp.controllers.IndexController // reference to a controller constructor
-* BlogApp.views.posts.New             // reference to a view constructor, usually an Ext.Panel subclass
-
-It doesn't matter if you don't know what those do yet, the important thing is that you don't pollute the global namespace.  The whole of Ext MVC is
-build around this idea.
-
-Once you've chosen your namespace, just run the following command:
-
-ruby script/setup MyAppNamespace
-
-This will update all files with the default namespace ('MyApp') with the namespace you specify.
-
-If you can't run the script, you can easily perform the setup yourself - just change the references from the default 'MyApp' namespace to your own 
-namespace in the following files:
-
-* app/OS.js
-* app/controllers/IndexController.js
-* app/views/index/Index.js
-* config/initialize.js
-* config/settings.yml
-
-Just use a simple find/replace all.
-
-== Build tools
-
-You need to ensure you have Ruby installed to use the build tools, and also the rake and hpricot gems (sudo gem install rake hpricot).
-
-Ext MVC will automatically build (concatenate and minify) your javascript and CSS files.  Just run the following command from the base directory:
-
-ruby script/build all
-
-This will inspect the javascript and css include tags inside index.html and compress them into a single JS file and a single CSS file.  It will minify
-the javascript if the YUI Compressor is installed in vendor/yui-compressor and create the following files:
-
-* public/application-all.js
-* public/application-all-min.js
-* public/stylesheets/application-all.css
-
-== Generators:
-
-Ext MVC comes with some built-in generators to automate some aspects of application development.  Run the generators
-described below from within the main directory of your Ext MVC application.
-
-Be sure that you have updated your config/settings.yml file before running these, otherwise everything will be namespaced
-to 'MyApp' (see above).
-
-=== Model
-
-ruby script/generate model User first_name:string last_name:string balance:int is_admin:boolean
-
-Will generate the following files:
-
-in app/models/User.js:
-/**
- * @class MyApp.models.MyModel
- * @extends ExtMVC.Model
- */
-ExtMVC.Model.define("MyApp.models.User", {
-  modelName: 'user',
-  fields:    [
-    {name: 'first_name', type: 'string'},
-    {name: 'last_name',  type: 'string'},
-    {name: 'balance',    type: 'int'},
-    {name: 'is_admin',   type: 'boolean'}
-  ]
-});
-
-in spec/models/User.spec.js:
-Screw.Unit(function() {
-  describe("The User class", function() {
-    var user;
-    before(function() {
-      user = new MyApp.models.User({
-        //set fields for this model here
-      });
-    });
-    
-    //create your unit tests here
-  });
-});
-
-It will also add the following line to your index.html file:
-
-<script type="text/javascript" src="app/models/User.js"></script>
-
-And the following to your spec/index.html file:
-
-<script type="text/javascript" src="../app/models/User.js"></script>
-<script type="text/javascript" src="models/User.spec.js"></script>
-
-
-== Deployment
-
-Once you've built your app, upload only the 'public' folder to your web server.  Nothing else is required to run the app.
-
-== Directory Structure:
-
-* app             - a directory to contain your models, views and controllers
-* app/controllers - contains all of your controllers
-* app/models      - contains all modesl
-* app/views       - contains all view files, usually in subdirectories (e.g. app/views/users/Index.js)
-* config          - contains application configuration files (see below)
-* lib             - contains any library files which are not suited to being plugins
-* public          - the directory you will set as document root on your web server.  Place any public-facing assets in here.  Note that all javascript and stylesheet files will be concatenated automatically into here when you deploy, so these can exist outside of this folder.  Images and other assets will need to be placed here though.
-* script          - contains scripts to automate site build and minification
-* spec            - a directory to place your unit tests or specs
-* vendor          - holds any third-party code
-* vendor/ext      - contains the required version of ExtJS.  ExtJS 2.2 comes pre-installed here, with the Ext adapter.
-* vendor/mvc      - contains the required version of Ext MVC.  Most recent stable version installed by default.  Obtain latest version from http://github.com/extmvc/extmvc/tree
-* vendor/plugins  - contains any MVC-compatible plugins (such as viewport builders, model extensions etc)
-
-== Important Files:
-
-* config/routes.js     - set up any Ext.History related routing required (see file for help)
-* config/initialize.js - any app-wide config code, such as setting up location of s.gif, booting your app, etc
-* config/database.js   - define which data adapter your app uses (RESTful adapter, Gears adapter, your own concoction etc)
-
-* index.html           - Development version of the site, including one file at a time and using ext-all-debug
-* public/index.html    - Production version of the site referencing concatenated and minified files

data/lib/xmvc/generators/templates/app/config/settings.yml

@@ -1,3 +0,0 @@
-# General settings used by ruby scripts
-environment:
-  namespace: MyApp