dependence 0.0.7 → 0.0.8

data/bin/dependence

@@ -1,54 +1,57 @@
 #!/usr/bin/env ruby
-
-$: << "."
 require 'rubygems'
+require 'fileutils'
 require 'coffee-script'
-require 'lib/dependence'
+require 'dependence'
 require 'optparse'
-require  File.join(File.dirname(__FILE__), "..", "lib/dependence.rb")
 
-class DependenceCompiler 
-  def initialize(config) 
+class DependenceCompiler
+  def initialize(config)
     @config = config
     @src_glob = "**/*.#{@config[:type]}"
     @concatenator = Dependence::Concatenator.new(
-      :load_path => @config[:src_dir], 
+      :load_path => @config[:src_dir],
       :source_type => @src_glob
     )
   end
 
   def compile
-    @config[:watch] ? compile_with_watcher : run_compile 
+    begin
+      @config[:watch] ? compile_with_watcher : run_compile
+    rescue => e
+      puts Colors.red("Error during processing, exiting.")
+      raise e
+    end
   end
 
-  private 
+  private
 
   def compile_with_watcher
     FileWatcher.new(:load_path => @config[:src_dir],  :glob_str => @src_glob) do
-      run_compile
+      print "File change detected. Recompiling... "
+      begin
+        run_compile
+        puts "done."
+      rescue => e
+        puts Colors.red("Error: " + e.to_s)
+      end
     end
   end
 
-  def run_compile 
-    begin
-      @concatenator.concat do |module_name, module_content|
-        stdout_compile_msg(module_name)
-        output = File.join(@config[:output], "#{module_name}.js")
-        compiled = compile_code(module_content)
-        compiled = ModuleInjector.modularize(module_name, compiled) unless @config[:bare]
-        File.open(output, 'w') { |f| f.syswrite compiled }
-
-        stdout_compile_complete_msg(module_name, output)
-        compress_code(output) if @config[:compress]
-      end
-
-    rescue
-      puts Colors.red("exiting")
-      exit 1
+  def run_compile
+    @concatenator.concat do |module_name, module_content|
+      stdout_compile_msg(module_name)
+      FileUtils::mkdir_p @config[:output]
+      output = File.join(@config[:output], "#{module_name}.js")
+      compiled = compile_code(module_content)
+      compiled = ModuleInjector.modularize(module_name, compiled) unless @config[:bare]
+      File.open(output, 'w') { |f| f.syswrite compiled }
+
+      stdout_compile_complete_msg(module_name, output)
+      compress_code(output) if @config[:compress]
     end
   end
 
-
   def stdout_compile_msg(module_name)
     puts ""
     puts "================================"
@@ -63,7 +66,7 @@ class DependenceCompiler
   def compile_code(raw_code)
     return CoffeeScript.compile(raw_code, :bare => true) if @config[:type] == "coffee"
     raw_code
-  end 
+  end
 
   def compress_code(source_file)
     JsCompiler.new(source_file).compile
@@ -117,5 +120,3 @@ options[:src_dir] = ARGV[0]
 
 compiler = DependenceCompiler.new options
 compiler.compile
-
-

data/lib/dependence/concatenator.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require File.join(File.dirname(__FILE__), 'colors')
+require "dependence/colors"
 
 module Dependence
   # Take a load path + file glob and concat them into 1 file per directory
@@ -26,13 +26,13 @@ module Dependence
       no_files_error if files.empty?
 
       files_list = get_files_in_dependency_order(dir, files)
-      
+
       block.call module_name, concat_files(files_list)
     end
 
-    def no_files_error 
+    def no_files_error
       puts Colors.red("No files of the specified type #{File.extname(@options[:source_type])} were found in #{@options[:load_path]}")
-      throw :no_files_to_concatenate 
+      throw :no_files_to_concatenate
     end
 
     def get_files_in_dependency_order(dir, files)

data/lib/dependence/js_compiler.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__),'dependency_resolver')
-require File.join(File.dirname(__FILE__),'colors')
+require "dependence/dependency_resolver"
+require "dependence/colors"
 
 class JsCompiler
-  def initialize(source_file, output_file = nil) 
+  def initialize(source_file, output_file = nil)
     output_file = source_file.gsub(".js", ".min.js") unless output_file
     @source = source_file
     @output = output_file
@@ -24,7 +24,7 @@ class JsCompiler
 
   def cmd_prefix
     path = File.join(File.dirname(__FILE__), "../", "../", "compiler", "compiler.jar")
-    "java -jar #{path}" 
+    "java -jar #{path}"
     # --create_source_map js_map
   end
 end

data/lib/dependence/module_injector.rb

@@ -3,13 +3,13 @@ module ModuleInjector
   extend self
 
   @@module_code = <<MODULE_FUNC
-var global = (global != undefined)? global : window 
+var global =  window
 
 if (global.module == undefined) {
   global.module = function(name, body) {
     var exports = global[name]
     if (exports == undefined) {
-      global[name] = {}
+    global[name] = exports = {}
     }
     body(exports)
   }

data/lib/dependence.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), "dependence", "dependency_resolver.rb")
-require File.join(File.dirname(__FILE__), "dependence", "module_injector.rb")
-require File.join(File.dirname(__FILE__), 'dependence', 'js_compiler.rb')
-require File.join(File.dirname(__FILE__), "dependence", "file_watcher.rb")
-require File.join(File.dirname(__FILE__), "dependence", "concatenator.rb")
+require "dependence/dependency_resolver.rb"
+require "dependence/module_injector.rb"
+require "dependence/js_compiler.rb"
+require "dependence/file_watcher.rb"
+require "dependence/concatenator.rb"
 
 module Dependence
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependence
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &2168554380 !ruby/object:Gem::Requirement
+  requirement: &2168635100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168554380
+  version_requirements: *2168635100
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: &2168634660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2168634660
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2168553940 !ruby/object:Gem::Requirement
+  requirement: &2168626520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168553940
+  version_requirements: *2168626520
 description: 
 email: jcarver989@gmail.com
 executables: