ninjs 0.10.2 → 0.11.0

data/Gemfile

@@ -9,6 +9,7 @@ gem "sprockets", ">= 0"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "metric_fu", ">= 0"
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"

data/Gemfile.lock

@@ -1,16 +1,71 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    Saikuro (1.1.0)
+    abstract (1.0.0)
+    activesupport (3.0.5)
+    arrayfields (4.7.4)
+    chronic (0.3.0)
+    churn (0.0.13)
+      chronic (>= 0.2.3)
+      hirb
+      json_pure
+      main
+      ruby_parser (~> 2.0.4)
+      sexp_processor (~> 3.0.3)
+    colored (1.2)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    fattr (2.2.0)
+    flay (1.4.2)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    flog (2.5.1)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
     fssm (0.2.2)
     git (1.2.5)
+    haml (3.0.25)
+    hirb (0.4.0)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     jsmin (1.0.1)
+    json_pure (1.5.1)
+    main (4.4.0)
+      arrayfields (>= 4.7.4)
+      fattr (>= 2.1.0)
+    metric_fu (2.1.1)
+      Saikuro (>= 1.1.0)
+      activesupport (>= 2.0.0)
+      chronic (~> 0.3.0)
+      churn (>= 0.0.7)
+      flay (>= 1.2.1)
+      flog (>= 2.3.0)
+      rails_best_practices (>= 0.6.4)
+      rcov (>= 0.8.3.3)
+      reek (>= 1.2.6)
+      roodi (>= 2.1.0)
+      syntax
+    rails_best_practices (0.7.1)
+      activesupport
+      colored (~> 1.2)
+      erubis (~> 2.6.6)
+      haml (~> 3.0.18)
+      i18n
+      ruby-progressbar (~> 0.0.9)
+      ruby_parser (~> 2.0.4)
     rake (0.8.7)
     rcov (0.9.9)
+    reek (1.2.8)
+      ruby2ruby (~> 1.2)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    roodi (2.1.0)
+      ruby_parser
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -20,8 +75,16 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
     rubikon (0.5.3)
+    ruby-progressbar (0.0.9)
+    ruby2ruby (1.2.5)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.5)
     shoulda (2.11.3)
     sprockets (1.0.2)
+    syntax (1.0.0)
 
 PLATFORMS
   ruby
@@ -31,6 +94,7 @@ DEPENDENCIES
   fssm
   jeweler (~> 1.5.2)
   jsmin
+  metric_fu
   rcov
   rspec
   rubikon

data/Rakefile

@@ -13,6 +13,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "ninjs"
   gem.homepage = "http://github.com/textnotspeech/ninjs"
+  gem.rubyforge_project = "nowarning"
   gem.license = "MIT"
   gem.summary = %Q{ninjs is a command line application to help you write clean, modular javascript applications.}
   gem.description = %Q{Ninjs is a ruby application and small javascript framework that helps you build clean, modular javascript applications. Ninjs encourages "Good Parts" best practices and the Crockford school Module pattern (http://www.crockford.com/). The ninjs command line application is an automatic compiler, written in ruby, and based on the Sprockets library (http://getsprockets.org/).}
@@ -57,4 +58,6 @@ namespace :ndoc do
     puts output
   end
   
-end
+end
+
+require 'metric_fu'

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0

data/bin/ninjs

@@ -42,11 +42,20 @@ class NinjsConsole < Rubikon::Application::Base
     Ninjs::Command.import
   end
   
-  option :directory, :dir do
-    @directory = dir
-  end
-  option :p => :directory
+  option :withdir, :path
+  flag :p => :withdir
   command :create, :app_name do
-    Ninjs::Command.create(app_name, @directory)
+    directory = (given? :p) ? withdir.path : false
+    Ninjs::Command.create(app_name, directory)
+  end
+
+  option :e
+  option :m
+  command :generate, :object, :obj_name do
+    Ninjs::Command.generate('elements', obj_name) if e.given?
+    Ninjs::Command.generate('model', obj_name) if m.given?
+    elements = e.given? || false
+    models = m.given? || false
+    Ninjs::Command.generate(object, obj_name, elements, models)
   end
 end

data/lib/ninjs.rb

@@ -1,6 +1,3 @@
-module Ninjs
-end
-
 module Ninjs
   def version
     '0.10.1'

data/lib/ninjs/command.rb

@@ -4,127 +4,54 @@ module Ninjs
       require "fssm"
       project_path = Dir.getwd << '/'
       raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}ninjs.conf"
-      color_start = "\e[33m"
-      color_end = "\e[0m"
-      puts "\e[32m>>>#{color_end} Ninjs are watching for changes. Press Ctrl-C to stop."
-      project = Ninjs::Project.init_with_config(project_path)
+      puts "\e[32m>>>\e[0m Ninjs are watching for changes. Press Ctrl-C to stop."
+      project = Ninjs::Project.new
       project.update
 	    
-	    # TODO make this smaller using globs
-      FSSM.monitor do
-        path "#{Ninjs.base_directory}/repository" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} ninjs repository updated #{relative}"
-            project.update
-          end
-
-          create do |base, relative|
-            puts "#{relative} created in repository"
-            project.update
-          end
-        end
-        
-        path "#{project_path}elements" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} change detected in #{relative}"
-            project.update
-          end
-
-          create do |base, relative|
-            puts "#{relative} created"
-            project.update
-          end
-        end
-        
-        path "#{project_path}models" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{@color_start}<<<#{@color_end} change detected in #{relative}"
-            project.update
-          end
-
-          create do |base, relative|
-            puts "#{relative} created"
-            project.update
-          end
-        end
-        
-        path "#{project_path}modules" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} change detected in #{relative}"
-            project.update
-          end
-
-          create do |base, relative|
-            puts "#{relative} created"
-            project.update
-          end
-        end
-
-        path "#{project_path}lib" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} change detected in #{relative}"
-            project.config.read
-            project.update_application_file
-            project.update
-          end
-
-          create do |base, relative|
-            puts "+++ created #{relative}"
-            project.update
-          end
-        end
-        
-        path "#{project_path}plugins" do
-          glob "**/*.js"
-
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} change detected in #{relative}"
-            project.config.read
-            project.update_application_file
-            project.update
-          end
-
-          create do |base, relative|
-            puts "+++ created #{relative}"
-            project.update
-          end
-        end
-        
-        path "#{project_path}" do
-          glob "**/*.conf"
-          
-          update do |base, relative|
-            puts "#{color_start}<<<#{color_end} change detected in #{relative}"
-            project.config.read
-            project.update_application_file
-            project.update
-          end
-        end
-        
-      end
-      
+	    watch_dirs = Ninjs::Manifest.directories.reject { |dir| dir.match(/application|tests/) }
+	    watch_hash = Hash.new
+	    
+	    watch_dirs.each do |dir|
+	     watch_hash["#{project_path}#{dir}"] = "**/*.js"
+	    end
+	    
+	    watch_hash[project_path] = "**/*.conf"
+	    watch_hash["#{Ninjs.base_directory}/repository"] = "**/*.js"
+	    
+	    FSSM.monitor do
+
+	      watch_hash.each do |dir, g|
+	        
+  	     path "#{dir}" do
+           glob g
+
+           update do |base, relative|
+             puts "\e[33m<<<\e[0m change detected in #{relative}"
+             project.update
+           end
+
+           create do |base, relative|
+             puts "\e[33m+++\e[0m #{relative} created"
+             project.update
+           end
+         end
+         
+  	    end
+
+	    end
+	           
     end
 
     def create(name, directory = false)
       raise 'you must specify a project name: ninjs create ProjectName' if name.nil?
-      project = directory ? Ninjs::Project.new(name, directory) : Ninjs::Project.new(name)
+      project = directory ? Ninjs::Project.new(directory, name) : Ninjs::Project.new('/', name)
       project.create
     end
     
     def compile
       project_path = Dir.getwd << '/'
       raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}/ninjs.conf"
-      project = Ninjs::Project.init_with_config(project_path)
+      project = Ninjs::Project.new
       project.update
     end
     
@@ -155,7 +82,37 @@ Example:
   ninjs watch
       DOC
     end
+    
+    def generate(object, name, create_elements = false, create_models = false, elements = false, models = false)
+      begin
+        project_path = Dir.getwd << '/'
+        raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}ninjs.conf"
+        project = Ninjs::Project.new
+        if object === 'module'
+          File.open "#{project_path}modules/#{name.downcase}.module.js", "w" do |file|
+            file << project.config.name + ".add_module('" + name + "');\n\n"
+            file << '//= require "../elements/' + name.downcase + '.elements.js"' + "\n\n" if elements
+            file << '//= require "../models/' + name.downcase + '.model.js"' + "\n\n" if models
+            file << project.config.name + "." + name + ".actions = function() {\n\n}\n\n"
+            file << project.config.name + "." + name + ".run();"
+            puts "+++ created #{name.downcase}.module.js"
+          end unless File.exists? "#{project_path}modules/#{name.downcase}.module.js"
+        elsif object === 'elements'
+          File.open("#{project_path}elements/#{name.downcase}" + ".elements.js", "w") do |file|
+            file << project.config.name + "." + name + ".elements(function({\n\n}));"
+            puts "+++ created #{name.downcase}.elements.js"
+          end unless File.exists? "#{project_path}elements/#{name.downcase}.elements.js"
+        elsif object === 'model'
+          File.open "#{project_path}models/#{name.downcase}.model.js", "w" do |file|
+            file << project.config.name + "." + name + ".set_data({});"
+            puts "+++ created #{name.downcase}.model.js"
+          end unless File.exists? "#{project_path}models/#{name.downcase}.model.js" 
+        end
+      rescue
+        # TODO rescue this
+      end
+    end
 
-    module_function :create, :watch, :compile, :help, :import
+    module_function :create, :watch, :compile, :help, :import, :generate
   end
 end

data/lib/ninjs/configuration.rb

@@ -2,7 +2,6 @@ module Ninjs
     class Configuration
       
       attr_reader :name,
-                  :project_path,
                   :app_filename,
                   :directory,
                   :output,
@@ -11,41 +10,42 @@ module Ninjs
                   :config_path,
                   :asset_root,
                   :base_url,
-                  :tests_path
+                  :test_path
                   
-      def initialize(project_path, name = 'NinjsApplication')
+      def initialize(project_path, name = '')
+        @project_path = project_path
         @defaults = {
           :name => name,
-          :project_path => project_path,
-          :asset_root => project_path,
+          :app_filename => name.gsub(/\s|\-|\./, '').downcase,
           :output => 'expanded',
           :dependencies => ['<jquery/latest>'],
           :autoload => ['<ninjs/utilities/all>'],
           :base_url => 'http://www.example.com/',
-          :tests_path => 'tests/'
+          :test_path => 'tests/'
         }
 
         @defaults.each do |label, setting|
           instance_variable_set("@#{label}", setting)
         end
+        
+        if File.exists? "#{@project_path}ninjs.conf"
+          read
+        end
       end
       
       def create
-        default_content = conf_content @defaults
+        options = @defaults
+        options.delete :app_filename
+        default_content = conf_content options
         create_conf_file default_content
       end
       
       def conf_content(options)
-        content = <<-CONF
-name: #{options[:name]}
-project_path: #{options[:project_path]}
-asset_root: #{options[:project_path]}
-output: #{options[:output]}
-dependencies: [#{options[:dependencies].join(', ')}]
-autoload: [#{options[:autoload].join(', ')}]
-base_url: #{options[:base_url]}
-tests_path: #{options[:tests_path]}
-        CONF
+        content = String.new
+        options.each do |option, value|
+          content << "#{option}: #{value}\n"
+        end
+        content
       end
       
       def create_conf_file(content)
@@ -57,37 +57,31 @@ tests_path: #{options[:tests_path]}
       end
       
       def update
-        content = conf_content({
+        options = {
           :name => @name,
-          :project_path => @project_path,
-          :asset_root => @project_path,
+          :asset_root => @asset_root,
           :output => @output,
           :dependencies => @dependencies,
           :autoload => @autoload,
           :base_url => @base_url,
-          :tests_path => @tests_path
-        })
+          :test_path => @test_path
+        }
+        options.reject! { |option| option.nil? }
+        
+        content = conf_content options
         create_conf_file content
       end
       
       def read
-        begin
-          raise IOError, "#{@project_path}ninjs.conf does not exist", caller unless File.exists? "#{@project_path}ninjs.conf"
-          config = YAML.load_file("#{@project_path}ninjs.conf")
-          
-          @project_path = config['project_path']
-          @asset_root = config['asset_root']
-          @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/'
-          @tests_path = config['tests_path'] || 'tests/'
-        rescue IOError => e
-          puts e.message
-          puts e.backtrace.inspect
-        end
+        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/'
       end
       
     end