ninjs 0.13.1 → 0.13.2

data/Rakefile

@@ -54,10 +54,8 @@ namespace :ndoc do
   desc "Generate documentation with NaturalDocs"
   
   task :generate do
-    output = `ndocs -i /Volumes/Storage/Development/ninjs/repository/ninjs/ -o HTML /Volumes/Storage/Development/ninjs-ghpages/repository/ninjs/docs -p /Volumes/Storage/Development/ninjs-ghpages/repository/ninjs/docs` #  -s Slick
+    output = `ndocs -i /Volumes/Storage/Development/ninjs/repository/ninjs/ -o HTML /Volumes/Storage/Development/ninjs-ghpages/docs -p /Volumes/Storage/Development/ninjs-ghpages/docs` #  -s Slick
     puts output
   end
   
-end
-
-require 'metric_fu'
+end

data/VERSION

@@ -1 +1 @@
-0.13.1
+0.13.2

data/bin/ninjs

@@ -3,62 +3,219 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 begin
-  require 'rubikon'
   require 'ninjs'
+  require 'optparse'
 rescue LoadError
   require 'rubygems'
-  require 'rubikon'
   require 'ninjs'
+  require 'optparse'
 end
 
-class NinjsConsole < Rubikon::Application::Base
-  def initialize
-    @directory = '/'
-  end
+header = <<-HEADER
+ninjs #{Ninjs::VERSION}
+Copyright (c) #{Time.new.year} Dayton Nolan
+Released under the MIT License
+
+Description: 
+The ninjs command line application is a simple way to quickly develop and manage your application. With it you can create an application, generate scaffolding, compile, and upgrade your application.
+
+Usage: ninjs [command] [arguments] [options (-h, --help)]
+
+Commands:
+HEADER
+
+create = <<-CREATE
+  create    Creates a new ninjs application in the current working 
+            directory or sub directory within.
+        
+            Arguments:
+            application name - Name of the ninjs application
+            subdirectory* - Directory where the application will be 
+                            installed (created if non existent)
+                                    
+            examples:
+            ninjs create myapp
+            ninjs create myapp subdirectory
+CREATE
+
+generate = <<-GEN
+  generate  Generates scoffolding for the given component file type. 
+
+            Arguments:
+            type - Type of application scaffold to create (module, elements, model).
+            name* - Name of the module to generate the scaffold for
+
+            Options:
+            -a, --alias name* - Create an alias of the application object
+                                (defaults to "app"), passing a name is optional
+            -e, --elements - Generate an elements file
+            -m, --model - Generate a model file 
+
+            examples:
+            ninjs generate module mymodule -em (generates module, elements and model)
+            ninjs generate module mymodule -a (generates an application alias)
+            ninjs generate elements mymodule -m (generates an elements and a model file)
+            ninjs generate model mymodule (generates an model file)
+GEN
+
+compile = <<-COMP
+  compile   Compiles the ninjs project in the current working directory.
   
-  flag :v => :version
-  option :version
-  default do
-    if version.given?
-      time = Time.now
-      Ninjs::Notification.notice 'ninjs ' + Ninjs::VERSION
-      Ninjs::Notification.notice "Copyright (c) #{time.year} Dayton Nolan"
-      Ninjs::Notification.notice "Released under the MIT License"
-    else
-      Ninjs::Command.help
+            Options:
+            -c, --compress - Compress output with JsMin
+          
+            example:
+            ninjs compile
+COMP
+
+watch = <<-WATCH
+  watch     Watches the current working directory for file changes and
+            compiles when changes are detected.
+          
+            example:
+            ninjs watch
+WATCH
+
+upd = <<-UPDATE
+  update   Updates your application's core files to the latest version.
+UPDATE
+
+footer = <<-FOOTER
+* optional argument
+FOOTER
+
+help = {
+  :header => header,
+  :create => create,
+  :generate => generate,
+  :compile => compile,
+  :watch => watch,
+  :update => upd,
+  :footer => footer
+}
+
+command = ARGV[0]
+
+options = {
+  :alias => false,
+  :elements => false,
+  :model => false,
+  :help => false,
+  :compress => false
+}
+
+optparse = OptionParser.new do|opts|
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    options[:help] = true
+
+    if command.nil? || command.match(/^-h/)
+      help.each do |section|
+        puts section
+      end
+      exit
     end
   end
   
-  command :compile do
-    Ninjs::Command.compile
+  opts.on( '-v', '--version', 'Display the version') do
+    time = Time.now
+    Ninjs::Notification.notice 'ninjs ' + Ninjs::VERSION
+    Ninjs::Notification.notice "Copyright (c) #{time.year} Dayton Nolan"
+    Ninjs::Notification.notice "Released under the MIT License"
+    exit
   end
   
-  command :watch do
-    Ninjs::Command.watch
+  opts.on( '-a', '--alias', 'Generate application alias') do
+    options[:alias] = true
   end
   
-  command :import do
-    Ninjs::Command.import
+  opts.on('-e', '--elements', 'Generate elements file') do
+    options[:elements] = true
   end
   
-  command :create, :app_name, :dir => :optional do
-    dir.nil? ? Ninjs::Command.create(app_name) : Ninjs::Command.create(app_name, dir)
+  opts.on('-m', '--model', 'Generate model file') do
+    options[:model] = true
   end
+  
+  opts.on('-c', '--compress', 'Compress with JsMin') do
+    options[:compress] = true
+  end
+end
 
-  option :elements
-  option :model
-  flag :e => :elements
-  flag :m => :model
-  command :generate, :object, :obj_name do
+optparse.parse!
+
+case command
+# create
+  when "create"
+    if options[:help]
+      puts help[:create]
+      exit
+    end
+    app_name = ARGV[1]
+    sub_dir = ARGV[2] || nil
+    
+    if app_name.nil?
+      puts "Error! Application name is required (ninjs create app_name)" 
+      exit
+    end
+    
+    sub_dir.nil? ? Ninjs::Command.create(app_name) : Ninjs::Command.create(app_name, sub_dir)
+# generate
+  when "generate"
+    if options[:help]
+      puts help[:generate]
+      exit
+    end
+    errors = Hash.new
+    type = ARGV[1]
+    name = ARGV[2]
+    als = ARGV[3] || 'app'
+
+    errors[:type] = "Error! Scaffold type is required (ninjs generate module mymodule)" if type.nil?
+    errors[:name] = "Error! Module name is required (ninjs generate module mymodule)" if name.nil?
+    
+    unless errors.empty?
+      errors.each do |error|
+        puts error
+      end
+      exit
+    end
+    
     with = {
-        :model => model.given?,
-        :elements => elements.given?
+        :model => options[:model],
+        :elements => options[:elements]
     }
-    
-    Ninjs::Command.generate(object, obj_name, with)
-  end
-  
-  command :upgrade do
-    Ninjs::Command.upgrade
-  end
-end
+
+    if options[:alias]
+      Ninjs::Command.generate_with_alias(type, name, with, als)
+    else
+      Ninjs::Command.generate(type, name, with)
+    end
+# compile
+  when "compile"
+    if options[:help]
+      puts help[:compile]
+      exit
+    end
+
+    compress_output = options[:compress] ? true : false
+    Ninjs::Command.compile(compress_output)
+# watch
+  when "watch"
+    if options[:help]
+      puts help[:watch]
+      exit
+    end
+    Ninjs::Command.watch
+# update
+  when "update"
+    if options[:help]
+      puts help[:update]
+      exit
+    end
+    Ninjs::Command.update
+# help
+  else
+    help.each do |section|
+      puts section
+    end
+  end

data/lib/ninjs/command.rb

@@ -48,81 +48,40 @@ module Ninjs
       project.create
     end
     
-    def compile
+    def compile(compress_output)
       project_path = Dir.getwd << '/'
       raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}/ninjs.conf"
       project = Ninjs::Project.new
+      project.config.output = compress_output ? 'compressed' : 'expanded'
       project.update
     end
     
     def import(package)
       Ninjs::PackageManager.import(package)
     end
-
-    def help
-      puts <<-DOC
-ninjs #{Ninjs::VERSION}
-Copyright (c) #{Time.new.year} Dayton Nolan
-Released under the MIT License
-
-Description: 
-The ninjs command line application is a simple way to quickly develop and manage your application. With it you can create an application, generate scaffolding, compile, and upgrade your application.
-
-Usage: ninjs [command] [arguments]
-  
-Commands:
-  create    Creates a new ninjs application in the current working 
-            directory or sub directory within.
-          
-            Arguments:
-            application name - Name of the ninjs application
-            sub directory* - Directory where the application will be 
-                            installed (created if non existent)
-                                      
-            examples:
-            ninjs create myapp
-            ninjs create myapp subdirectory
-
-  generate  Generates scoffolding for the given component file type. 
-
-            Arguments:
-            file type - Type of application file to create (module, elements,
-                        model).
-            module name* - Name of the module to generate the scaffold for
-
-            Flags:
-            -e - Generate an elements file for the same module
-            -m - Generate a model file for the same module
-
-            examples:
-            ninjs generate model mymodule -e -m
-            ninjs generate elements mymodule
-            ninjs generate model mymodule
-            
-  compile   Compiles the ninjs project in the current working directory.
-            
-            example:
-            ninjs compile
-            
-  watch     Watches the current working directory for file changes and
-            compiles when changes are detected.
-            
-            example:
-            ninjs watch
-            
-  upgrade   Upgrades your application's core files to the latest version.
-
-  * optional argument
-      DOC
-    end
     
     def generate(object, name, with)
       begin
         conf_path = "#{Dir.getwd}/ninjs.conf"
         raise "ninjs.conf was not located in #{conf_path}" unless File.exists? "#{conf_path}"
         generator = Ninjs::Generator.new(Ninjs::Project.new, name)
-        
-        case object
+        self.generate_object generator, object, with
+      end
+    end
+    
+    def generate_with_alias(object, name, with, als = 'app')
+      begin
+        conf_path = "#{Dir.getwd}/ninjs.conf"
+        raise "ninjs.conf was not located in #{conf_path}" unless File.exists? "#{conf_path}"
+        generator = Ninjs::Generator.new(Ninjs::Project.new, name)
+        generator.alias = true
+        generator.app_name = als
+        self.generate_object generator, object, with
+      end
+    end
+    
+    def generate_object(generator, object, with)
+      case object
         when 'module'       
           generator.generate_module_file(with)
           generator.generate_elements_file if with[:elements]
@@ -131,18 +90,18 @@ Commands:
           generator.generate_elements_file
         when 'model'
           generator.generate_model_file
-        end #case
-      end
+        end
     end
 
-    def upgrade
+    def update
       project_path = Dir.getwd << '/'
       raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}ninjs.conf"
       project = Ninjs::Project.new
       
       project.create_ninjs_lib_file
+      project.create_utility_lib_file
     end
     
-    module_function :create, :watch, :compile, :help, :import, :generate, :upgrade
+    module_function :create, :watch, :compile, :import, :generate, :generate_object, :generate_with_alias, :update
   end
 end

data/lib/ninjs/configuration.rb

@@ -2,27 +2,23 @@ module Ninjs
     class Configuration
       
       attr_reader :name,
-                  :app_filename,
-                  :directory,
-                  :output,
                   :dependencies,
                   :autoload,
-                  :config_path,
-                  :asset_root,
-                  :base_url,
-                  :test_path
+                  :asset_root
+                  
+      attr_accessor :output
                   
       def initialize(project_path, name = '')
         @project_path = project_path
+        
         @defaults = {
           :name => name,
-          :app_filename => name.gsub(/\s|\-|\./, '').downcase,
           :output => 'expanded',
-          :dependencies => ['<jquery/latest>'],
-          :autoload => ['<ninjs/utilities/all>'],
-          :base_url => 'http://www.example.com/',
-          :test_path => 'tests/'
+          :dependencies => ['"<jquery/latest>"'],
+          :autoload => ['"../lib/utilities"']
         }
+        
+        @asset_root = @project_path
 
         @defaults.each do |label, setting|
           instance_variable_set("@#{label}", setting)
@@ -34,16 +30,14 @@ module Ninjs
       end
       
       def create
-        options = @defaults
-        options.delete :app_filename
-        default_content = conf_content options
-        create_conf_file default_content
+        create_conf_file conf_content(@defaults)
       end
       
       def conf_content(options)
         content = String.new
         options.each do |option, value|
-          content << "#{option}: #{value}\n"
+          content << "#{option}: #{value}\n" if value.kind_of? String
+          content << "#{option}: [#{value.join(', ')}]\n" if value.kind_of? Array
         end
         content
       end
@@ -55,33 +49,17 @@ module Ninjs
         
         Ninjs::Notification.notify "ninjs.conf created", :added
       end
-      
-      def update
-        options = {
-          :name => @name,
-          :asset_root => @asset_root,
-          :output => @output,
-          :dependencies => @dependencies,
-          :autoload => @autoload,
-          :base_url => @base_url,
-          :test_path => @test_path
-        }
-        options.reject! { |option| option.nil? }
-        
-        content = conf_content options
-        create_conf_file content
-      end
-      
+ 
       def read
         config = YAML.load_file("#{@project_path}ninjs.conf")
-        @asset_root = config['asset_root'] unless config['asset_root'].nil?
+        
         @name = config['name']
-        @app_filename = config['name'].downcase
         @output = config['output']
+        
         @dependencies = config['dependencies'] || Array.new
         @autoload = config['autoload'] || Array.new
-        @base_url = config['base_url'] || 'http://www.example.com/'
-        @test_path = config['test_path'] || 'tests/'
+        
+        @asset_root = config['asset_root'] unless config['ass'].nil?
       end
       
     end