extjs-mvc 0.4.0.h → 0.4.0.i

data/VERSION

@@ -1 +1 @@
-0.4.0.h
+0.4.0.i

data/bin/run

@@ -11,7 +11,8 @@ require 'extjs-mvc'
 # Boot Xmvc CLI listener feeding it an instance of ExtJS::MVC::CLI
 begin
   Xmvc::CLI.start(ARGV, {
-    :host => ExtJS::MVC  # <-- Supplied module must contain a CLI Thor task extension
+    :host => ExtJS::MVC,  # <-- Supplied module must contain a CLI Thor task extension
+    :vendors => [ExtJS, ExtJS::MVC]
   })
 rescue Xmvc::Error => e
   Xmvc.ui.error(e.message)

data/lib/extjs-mvc/api.rb

@@ -1,41 +1,49 @@
 module ExtJS
   module MVC 
+    
+    VENDOR_NAME = "extjs-mvc"
+    
     class API < Thor
       include Thor::Actions
       
       desc "secretary", "Returns vendor assets; css, js, images, sass, haml, html...whatever.  Returns a Sprockets::Secretary"
       def secretary
         say_status "ExtJS::MVC", "secretary"
-        
-        #TODO Figure out a std vendor.yml loading mechanism
-        # load_paths? 
-        root = File.expand_path(File.join(options[:root], "extjs-mvc"))
-        begin
-          config = YAML.load_file(File.join(root, "vendor.yml"))
-        rescue StandardError => e
-          raise Xmvc::VendorFileNotFound.new("Failed to load vendor file 'vendor/extjs-mvc/vendor.yml'")
-        end
-        
         Sprockets::Secretary.new({
           :source_files => config["javascripts"],
           :root => root
         })
       end
-    
+      
+      desc "config", "Returns config from vendor.yml"
+      def config
+        config = {}
+        root = File.expand_path(File.join(options[:root], ExtJS::MVC::VENDOR_NAME))
+        path = File.join(root, "vendor.yml")
+        if File.exists?(path)
+          config = YAML.load_file(path)
+        else
+          #raise Xmvc::VendorFileNotFound.new("Failed to load vendor file 'vendor/extjs-mvc/vendor.yml'")
+          puts "failed to load ExtJS::MVC config #{path}"
+        end
+        config
+      end
+      
       ##
       # This task is executed by Xmvc::Generator::App when the "generate app" task is executed.
       # Xmvc provides the /vendor directory as the param
       #
       desc "install", "Install extjs-mvc framework"
-      def install(vendor_root)
-        fancy_name = File.join(File.basename(vendor_root), VENDOR_NAME)
-      
+      def install
+        fancy_name = File.join(File.basename(options[:root]), VENDOR_NAME)
         say_status "git clone", "#{GIT_URL} -> #{fancy_name}"
       
         # Clone the extjs-mvc-js repo!
-        path = File.join(vendor_root, VENDOR_NAME)
-        Git.clone(GIT_URL, path)
-      
+        path = File.join(options[:root], VENDOR_NAME)
+        ##
+        # UNCOMMENT THIS TO INSTALL FROM GIT
+        #
+        Git.clone(GIT_URL, path)  
         # report to console which files were created.
         Dir["#{path}/**/*.*"].each do |f|
           say_status :create, File.join(fancy_name, File.basename(f))

data/lib/vendor.yml

@@ -27,3 +27,5 @@ javascripts:
 - testrunner/TestRunner.js
 - testrunner/*.js
 stylesheets:
+- extjs-mvc-all.css
+sass:

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 0
-  - h
-  version: 0.4.0.h
+  - i
+  version: 0.4.0.i
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency