xmvc 0.1.3 → 0.1.4

data/Rakefile

@@ -16,7 +16,6 @@ begin
     gem.add_dependency "jammit-core", ">=0.1.0"
     gem.add_dependency "whorm", ">=0.1.0"
     gem.add_dependency "hpricot", ">=0.8.2"
-    gem.add_dependency "extjs-mvc", ">=0.4.0.a"
     
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
    # gem.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore']

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/xmvc/builder.rb

@@ -1,57 +1,34 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 module Xmvc
-  class BuilderManager
-    class << self
-      
-      def dispatch(name, *params)
-        name = name.to_sym
-        options = params.shift || {}
-        case name
-        when :setup
-          setup(options)
-        else
-          begin
-            Xmvc.asset_mgr(options).invoke(:build, [name])
-          rescue Jammit::Error => e
-            raise Xmvc::BuilderError.new(e.message)
-          end
-        end
-      end
-      
-  private
-      
-      def setup(options)
-        begin
-          ##
-          # Invoke jammit init app-name so that Jammit creates it's config/assets.yml
-          # 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('.')
-          
-          javascripts = {
-            "application" => application_assets("javascripts", options[:application])
-          }
-          options[:vendors].each do |vendor|
-            javascripts.update(vendor["name"] => vendor_assets("javascripts", vendor))
-          end
-          
-          jammit = Xmvc.asset_mgr(options)
-          jammit.invoke(:init)
-          jammit.invoke(:config, ["set", "javascripts",  javascripts])
-          jammit.invoke(:build)
-
-        rescue Jammit::Error => e
-          raise Xmvc::BuilderError.new(e.message)
-        end
-      end
-      
-      def vendor_assets(type, vendor)
-        vendor[type].map {|f| File.join("vendor", vendor["name"], f) }
-      end
+  class Builder < Thor
+    
+    autoload :Vendor,   'builders/vendor'
+    
+    include Thor::Actions
+    
+    desc "all", "Build all assets"
+    def all(*params)
+      Xmvc.ui.warn('build all assets with sprcokets')
+      sec = Sprockets::Secretary.new({
+        :source_files => Xmvc.environment.get("javascripts")
+      })
+      create_file("public/javascripts/app/app-all-debug.js", sec.concatenation)
+    end
+    
+    desc "setup", "Initialize config file"
+    def setup
+      Xmvc.ui.warn("Builder setup")
       
-      def application_assets(type, assets)
-        assets.map {|f| File.join(f)}
-      end
+      Xmvc.secretary = Sprockets::Secretary.new({})
+      Xmvc.public_path = File.expand_path("public")
+      host = Vendor.new([], {
+        :debug => true
+      })
+      host.invoke("app", [Xmvc.environment])
     end
+    
+  private
+    
+   
   end
 end

data/lib/xmvc/builders/vendor.rb

@@ -0,0 +1,89 @@
+module Xmvc
+  class Builder
+    class Vendor < Thor
+      include Thor::Actions
+      
+      def self.source_root
+        Xmvc.public_path
+      end
+      
+      desc "app", "Build application-host's assets"
+      def app(environment)
+        pkgs = []
+        each_vendor do |vendor|
+          builder = Vendor.new([], {})
+          builder.invoke("build", [vendor, pkgs])
+        end
+        
+        Xmvc.secretary.reset!({
+          :source_files => environment.get("javascripts")
+        })
+        
+        filename = Xmvc.public_build_path(:js, "app", nil, "debug")
+        create_file(filename, Xmvc.secretary.concatenation)
+        
+        pkgs << {
+          :vendor => :host,
+          :filename => filename,
+          :source_files => Xmvc.secretary.preprocessor.source_files
+        }
+        
+      end
+      
+      desc "build", "Build a vendor's assets"
+      def build(spec, pkgs=[])
+        if spec["dependencies"]          
+          spec["dependencies"].each do |vendor|
+            each_vendor do |vspec|
+              builder = Vendor.new([], {})
+              builder.invoke("build", [vspec, pkgs])
+            end
+          end
+        end
+        
+        Xmvc.secretary.reset!({
+          :source_files => spec["javascripts"]
+        })
+        
+        filename = Xmvc.public_build_path(:js, spec["name"], spec["version"], "debug")
+        
+        create_file(filename, Xmvc.secretary.concatenation)        
+        pkgs << {
+          :vendor => spec,
+          :filename => filename,
+          :source_files => Xmvc.secretary.preprocessor.source_files
+        }
+        
+      end
+      
+      private
+      
+      def each_vendor
+        vendors = []
+        Dir["vendor/*"].map {|vendor|
+          inside(vendor) do
+            if File.exists?("vendor.yml")
+              yield YAML.load_file("vendor.yml")
+            end
+          end
+        }
+      end
+
+      def vendor_assets(type, spec)
+        path = (spec["host"]) ? "#{spec['host']}/#{spec['name']}" : vendor_name(spec)
+        spec[type].map {|file|
+          File.join(path, file)
+        }
+      end
+
+      def vendor_name(spec)
+        (spec["version"]) ? "#{spec['name']}-#{spec['version']}" : spec['name']
+      end
+
+      
+
+      
+    end
+  end
+end
+

data/lib/xmvc/cli.rb

@@ -9,6 +9,8 @@ module Xmvc
   class CLI < Thor
     ARGV = ::ARGV.dup
     
+    class_option :environment, :default => :development
+    
     desc "install", "Install a framework"
     def install(path)
       Xmvc.ui.confirm('Xmvc install')
@@ -16,15 +18,22 @@ module Xmvc
     
     desc "generate", "Generate model, controller, view or app"
     def generate(*params)
+      
       which = params.shift
       Xmvc.ensure_in_app unless which == 'app'
-      Xmvc::Generator.dispatch(which, options, *params)  
+      Xmvc::Generator.dispatch(which, options, *params) 
+      
+      puts "generate: #{options.to_yaml}"
+      Xmvc.environment.render
+         
     end
     
     desc "build", "Build stuff"
     def build(name = :all, *params)
       Xmvc.ensure_in_app
-      Xmvc::BuilderManager.dispatch(name, *params)
+      builder = Xmvc::Builder.new([], options.dup)
+      builder.invoke(name.to_sym, params)
+      #Xmvc::BuilderManager.dispatch(name, *params)
     end
     
     desc "plugin", "Manage plugins"
@@ -48,14 +57,14 @@ module Xmvc
     def initialize(args=ARGV, config={}, options={})
       
       # Boot UI
-      Xmvc.ui = shell
+      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.load(:development)
+      Xmvc.environment = Xmvc::Environment.load(options[:environment])
       
       # Set the framework.
       Xmvc.host = options[:host]

data/lib/xmvc/environment.rb

@@ -58,6 +58,10 @@ module Xmvc
         }
       end
       
+      def config
+        @config ||= load_environment(:development)
+      end
+      
       private
       
       ##
@@ -74,10 +78,6 @@ module Xmvc
         end
       end
       
-      def config
-        @config ||= load_environment(:development)
-      end
-      
       def save
         File.open("#{DEFAULT_ENVIRONMENT}.yml", "w") {|file|
           file << config.to_yaml

data/lib/xmvc/generator.rb

@@ -13,6 +13,7 @@ module Xmvc
     GENERATORS = %w(app model controller scaffold view namespace)
     
     def self.dispatch(generator, options, *params)
+      Xmvc.public_path = File.expand_path("./public")
       
       unless GENERATORS.include?(generator)
         raise MVC::ArgumentError.new("Must use one of the following: " + GENERATORS.join(", ").downcase)
@@ -20,9 +21,17 @@ module Xmvc
       
       case generator
         when "app"
-          App.start(params, options.dup)
-          boot = Boot.new([], options.dup)
-          boot.invoke("generate")
+          options = options.dup
+          
+          App.start(params, options)
+          
+          Xmvc.public_path = File.expand_path("./public")
+          
+          builder = Xmvc::Builder.new([], {})    
+          packages = builder.invoke(:setup, [])      
+          
+          boot = Boot.new([], {})  
+          boot.invoke(:generate, [packages])
           
         when "model"
           model = Model.new([], options.dup)

data/lib/xmvc/generators/app.rb

@@ -4,17 +4,6 @@ module Xmvc
       
       include Thor::Actions
       
-      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 self.source_root 
         File.join(Xmvc::TEMPLATE_PATH, "app", "public")
       end
@@ -25,6 +14,7 @@ module Xmvc
       def create_root
         empty_directory(name)
         self.destination_root = name
+        FileUtils.chdir(name)
       end
       
       def create_app
@@ -82,19 +72,6 @@ module Xmvc
           # install vendor/plugins here
         end
       end
-      
-      def build_assets
-        # Build assets.
-        Xmvc::BuilderManager.dispatch(:setup, {
-          :asset_root => destination_root,
-          :vendors => [
-            Xmvc.host.config
-          ],
-          :application => FRAMEWORK_ASSETS
-        })
-        FileUtils.chdir(destination_root)
-        Xmvc.environment.render
-      end
     end
   end
 end

data/lib/xmvc/generators/boot.rb

@@ -3,37 +3,61 @@ module Xmvc
     class Boot < Thor
       include Thor::Actions
       
+      class PathError < Xmvc::Error; status_code(10) ; end
+        
       def self.source_root 
         File.join(Xmvc::TEMPLATE_PATH)
       end
       
       desc "generate", "Generate the config/boot.js file"
-      def generate
+      def generate(packages)
         
         host = Xmvc.host.config["name"]
+        @development = []
+        @production = []
+        @test = []
         
-        @development = [
-          'http://extjs.cachefly.net/ext-3.1.1/adapter/ext/ext-base.js',
-          'http://extjs.cachefly.net/ext-3.1.1/ext-all-debug.js'
-        ]
-        @development << url_for(host, "js", Jammit::DEBUG_SUFFIX)
-        
-        @production = [
-          'http://extjs.cachefly.net/ext-3.1.1/adapter/ext/ext-base.js',
-          'http://extjs.cachefly.net/ext-3.1.1/ext-all.js'
-        ]
-        @production << url_for(host, "js", Jammit::SUFFIX)
-        
-        @test = @development.dup
-        @test << url_for(host, "js", Jammit::DEBUG_SUFFIX)
-        @test << File.join("/", Xmvc::PUBLIC_PATH, "vendor", "jspec", "lib", "jspec.js")
-        @test << File.join("/", Xmvc::PUBLIC_PATH, "vendor", "spec", "TestHelper.js")
+        packages.each do |pkg|
+          if pkg[:vendor] == :host
+            pkg[:source_files].each do |file|
+              #@development << url_for_path(file.pathname.to_s)
+            end
+            @production << Xmvc.public_build_url(:js, "app")
+          else
+            spec = pkg[:vendor]
+            # No source-files generated but host defined?  cachefly resources (ie: ext)?
+            if pkg[:source_files].empty? and spec["host"] 
+              package = spec["name"].to_s
+              version = spec["version"].to_s
+              package += "-#{version}" unless version.empty?
+              spec["javascripts"].each do |file|
+                debug = file.gsub(/(\.js)/, "-debug.js")
+                #TODO Fix this hard-coded "-debug" hack for Ext cachefly resources.
+                @development << File.join(spec["host"], package, debug)
+                @production << File.join(spec["host"], package, file)
+              end
+            elsif pkg[:source_files].length
+              @development << Xmvc.public_build_url(:js, spec["name"], spec["version"], "debug")
+              @production << Xmvc.public_build_url(:js, spec["name"], spec["version"])
+            end
+          end  
+        end  
+        @test = @development
         
         template("boot.js", "config/boot.js")
       end
       
       private
       
+      def url_for_path(path)
+        @re ||= Regexp.new("^#{FileUtils.pwd}(.*)$")
+        begin
+          path.match(@re)[1]
+        rescue StandardError
+          raise PathError.new("Xmvc::Generator::Boot failed to determine the relative filename for the path #{path}")
+        end
+      end
+      
       def url_for(name, ext, suffix)
         File.join("/", Xmvc::PUBLIC_PATH, name, Jammit.filename(name, ext, suffix))
       end

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

@@ -13,6 +13,18 @@ vendor:
 - extjs-mvc
 mvcFilename: extjs-mvc-all-min
 
+name: app
+
+javascripts:
+- app/App.js
+- config/application.js
+- config/routes.js
+- vendor/plugins/*/**.js
+- overrides/*.js
+- app/models/*.js
+- app/controllers/*.js
+- app/views/*/**.js
+
 # Use config/application for general framework configuration
 config:
 - app/App

data/lib/xmvc/generators/templates/app/public/vendor/screw-unit/vendor.yml

@@ -0,0 +1,12 @@
+# Defines the build order of Ext MVC. Comments indicated with a hash.
+# Each line denotes either a single file, or a directory glob. If a glob, all matching files are included
+# (unless they have already been defined)
+name: screw-unit
+
+version:
+
+dependencies:
+
+javascripts: []
+
+stylesheets: []

data/lib/xmvc/ui.rb

@@ -0,0 +1,55 @@
+module Xmvc
+  class UI
+    def warn(message)
+    end
+ 
+    def error(message)
+    end
+ 
+    def info(message)
+    end
+ 
+    def confirm(message)
+    end
+ 
+    class Shell < UI
+      def initialize(shell)
+        @shell = shell
+      end
+ 
+      # TODO: Add debug mode
+      def debug(msg)
+      end
+ 
+      def info(msg)
+        @shell.say(msg)
+      end
+ 
+      def confirm(msg)
+        @shell.say(msg, :green)
+      end
+ 
+      def warn(msg)
+        @shell.say(msg, :yellow)
+      end
+ 
+      def error(msg)
+        @shell.say(msg, :red)
+      end
+    end
+ 
+    class RGProxy < Gem::SilentUI
+      def initialize(ui)
+        @ui = ui
+      end
+ 
+      def say(message)
+        if message =~ /native extensions/
+          @ui.info "with native extensions "
+        else
+          @ui.debug(message)
+        end
+      end
+    end
+  end
+end

data/lib/xmvc.rb

@@ -4,6 +4,12 @@ require 'yaml'
 require 'json'
 require 'extlib'
 require 'whorm'
+#require 'thor-cheese/ui'
+
+require 'jammit-core'
+require 'jammit-core/cli'
+
+require 'sprockets'
 
 module Xmvc
 
@@ -22,7 +28,7 @@ module Xmvc
   #
   require 'xmvc/builder'
   
-  #autoload :UI,             'xmvc/ui'
+  autoload :UI,             'xmvc/ui'
   autoload :Generator,      'xmvc/generator'
   autoload :Environment,    'xmvc/environment'
   autoload :Plugin,         'xmvc/plugin'
@@ -66,6 +72,12 @@ module Xmvc
     # An instance of supplied framework plugin, eg ExtJS::MVC::CLI
     #
     attr_accessor :host
+    ##
+    # An instance of the sprockets secretary
+    #
+    attr_accessor :secretary
+    
+    attr_accessor :public_path
     
     def configure
       @configured ||= begin
@@ -77,6 +89,40 @@ module Xmvc
       end
     end
     
+    ##
+    # @param {Symbol} type :js, :css, :image
+    # @param {String} name
+    # @param {String} version
+    #
+    def public_build_path(type, name, version=nil, suffix=nil)      
+      File.join(public_path, asset_dir(type), build_name(type, name, version, suffix))
+    end
+    
+    def public_build_url(type, name, version=nil, suffix=nil)
+      File.join("/#{PUBLIC_PATH}", asset_dir(type), build_name(type, name, version, suffix))
+    end
+    
+    def build_name(type, name, version=nil, suffix=nil)
+      version   = "" if version.nil?
+      suffix    = "" if suffix.nil?
+      package   = name
+      package   += "-#{version}" unless version.empty?
+      name      += "-all"
+      name      += "-#{suffix}" unless suffix.empty?
+      File.join(package, "#{name}.#{type.to_s}")
+    end
+    
+    def asset_dir(type)
+      case type
+      when :js
+        "javascripts"
+      when :css
+        "stylesheets"
+      when :images
+        "images"
+      end
+    end
+    
     ##
     # Ensure we're running within a rails app unless generating a new app ($ xmvc generate app foo)
     #
@@ -90,12 +136,18 @@ module Xmvc
     end
     
     def asset_mgr(options={})
-      @asset_mgr ||= Jammit::CLI.new([], options)
+      warn("Xmvc.asset_mgr is disabled")
+      #@asset_mgr ||= Jammit::CLI.new([], options)
     end
     
     def ui
-      @ui ||= Thor::Shell::Basic
+      @ui ||= UI.new
     end
+    
+    private
+    
+    
+    
   end
 end
 

data/xmvc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xmvc}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ed Spencer and Chris Scott"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/xmvc/builders/docs_builder.rb",
      "lib/xmvc/builders/mvc_builder.rb",
      "lib/xmvc/builders/plugin_builder.rb",
+     "lib/xmvc/builders/vendor.rb",
      "lib/xmvc/cli.rb",
      "lib/xmvc/environment.rb",
      "lib/xmvc/generator.rb",
@@ -84,6 +85,7 @@ Gem::Specification.new do |s|
      "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/app/public/vendor/screw-unit/vendor.yml",
      "lib/xmvc/generators/templates/boot.js",
      "lib/xmvc/generators/templates/layout.html.erb",
      "lib/xmvc/generators/templates/scaffold/ScaffoldController.js",
@@ -92,6 +94,7 @@ Gem::Specification.new do |s|
      "lib/xmvc/stats.rb",
      "lib/xmvc/test.rb",
      "lib/xmvc/testserver.ru",
+     "lib/xmvc/ui.rb",
      "lib/xmvc/update.rb",
      "test/helper.rb",
      "test/test_extjs-core.rb",
@@ -117,7 +120,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jammit-core>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<whorm>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0.8.2"])
-      s.add_runtime_dependency(%q<extjs-mvc>, [">= 0.4.0.a"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<extlib>, [">= 0.9.14"])
@@ -125,7 +127,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jammit-core>, [">= 0.1.0"])
       s.add_dependency(%q<whorm>, [">= 0.1.0"])
       s.add_dependency(%q<hpricot>, [">= 0.8.2"])
-      s.add_dependency(%q<extjs-mvc>, [">= 0.4.0.a"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
@@ -134,7 +135,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jammit-core>, [">= 0.1.0"])
     s.add_dependency(%q<whorm>, [">= 0.1.0"])
     s.add_dependency(%q<hpricot>, [">= 0.8.2"])
-    s.add_dependency(%q<extjs-mvc>, [">= 0.4.0.a"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -87,25 +87,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: extjs-mvc
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
-        - a
-        version: 0.4.0.a
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -113,7 +98,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 description: 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.
 email: christocracy@gmail.com
 executables: 
@@ -141,6 +126,7 @@ files:
 - lib/xmvc/builders/docs_builder.rb
 - lib/xmvc/builders/mvc_builder.rb
 - lib/xmvc/builders/plugin_builder.rb
+- lib/xmvc/builders/vendor.rb
 - lib/xmvc/cli.rb
 - lib/xmvc/environment.rb
 - lib/xmvc/generator.rb
@@ -189,6 +175,7 @@ files:
 - 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/app/public/vendor/screw-unit/vendor.yml
 - lib/xmvc/generators/templates/boot.js
 - lib/xmvc/generators/templates/layout.html.erb
 - lib/xmvc/generators/templates/scaffold/ScaffoldController.js
@@ -197,6 +184,7 @@ files:
 - lib/xmvc/stats.rb
 - lib/xmvc/test.rb
 - lib/xmvc/testserver.ru
+- lib/xmvc/ui.rb
 - lib/xmvc/update.rb
 - test/helper.rb
 - test/test_extjs-core.rb