dependence 0.0.94 → 0.0.96

data/bin/dependence

@@ -8,10 +8,10 @@ require 'optparse'
 class DependenceCompiler
   def initialize(config)
     @config = config
-    @src_glob = "**/*"
-    @concatenator = Dependence::Concatenator.new(
-      :load_path => @config[:src_dir]
-    )
+    @load_path = config[:src_dir]
+
+    ext_list = Dependence::Compiler.supported_extensions()
+    @source_type = "**/*{#{ext_list.join(',')}}"
   end
 
   def compile
@@ -26,7 +26,7 @@ class DependenceCompiler
   private
 
   def compile_with_watcher
-    FileWatcher.new(:load_path => @config[:src_dir],  :glob_str => @src_glob) do
+    FileWatcher.new(:load_path => @load_path,  :glob_str => @source_type) do
       print "File change detected. Recompiling... "
       begin
         run_compile
@@ -38,31 +38,26 @@ class DependenceCompiler
   end
 
   def run_compile
-    @concatenator.concat do |module_name, module_content|
-      stdout_compile_msg(module_name)
-      FileUtils::mkdir_p @config[:output]
-
-      compiled = module_content
-      compiled = ModuleInjector.modularize(module_name, module_content) unless @config[:bare]
+    create_output_directory()
 
-      output = File.join(@config[:output], "#{module_name}.js")
-      File.open(output, 'w') { |f| f.syswrite compiled }
+    module_dirs = Dir.glob("#{@load_path}/*/**/").map {|dir| File.expand_path(dir) }
+    module_dirs.delete(File.expand_path(@config[:output]))
 
-      stdout_compile_complete_msg(module_name, output)
-      compress_code(output) if @config[:compress]
+    module_dirs.each do |module_dir|
+      Dependence::JsModule.new(:source_dir   => module_dir, 
+                               :output_dir   => @config[:output],
+                               :source_type  => @source_type, 
+                               :bare         => @config[:bare],
+                               :compress     => @config[:compress]).to_file
     end
   end
 
-  def stdout_compile_msg(module_name)
-    puts Colors.green("Detected Module: #{module_name}")
-  end
-
-  def stdout_compile_complete_msg(module_name, output)
-    puts Colors.green("Compiled #{module_name} to #{output}")
+  def create_output_directory
+    FileUtils.mkdir_p @config[:output]
   end
 
   def compress_code(source_file)
-    JsCompiler.new(source_file).compile
+    JsCompressor.new(source_file).compile
   end
 end
 
@@ -81,9 +76,6 @@ OptionParser.new do |opts|
     options[:output] = dir
   end
 
-  opts.on("-t", "--type TYPE", "Source file extension [js, coffee]") do |type|
-  end
-
   opts.on("-w", "--watch", "Watch src_dir for changes and recompile") do |bool|
     options[:watch] = bool
   end

data/lib/dependence/compiler.rb

@@ -35,12 +35,11 @@ module Dependence
       @@extensions
     end
 
-    def compile(source_string, options = {})
+    def compile(source_string, options = {:bare => true})
       CoffeeScript.compile(source_string, options)
     end
   end
-
-  class JavaScriptCompiler < Compiler
+class JavaScriptCompiler < Compiler
     @@extensions = [:js]
 
     def self.extensions

data/lib/dependence/concatenator.rb

@@ -1,63 +1,20 @@
-require 'fileutils'
-require "dependence/colors"
-
 module Dependence
-  # Take a load path + file glob and concat them into 1 file per directory
   class Concatenator
-    @@defaults = {
-      :load_path    => ".",
-      :source_type  => "**/*{#{Compiler.supported_extensions.join(',')}}"
-    }
-
-    def initialize(opts = {})
-      @options = @@defaults.merge(opts)
-    end
-
-    def concat(&block)
-      get_dirs.each { |dir| concat_module(dir, &block) }
-    end
-
-    private
-
-    def concat_module(dir, &block)
-      module_name = File.basename(dir)
-
-      files = Dir.glob File.join(dir, @options[:source_type])
-      no_files_error if files.empty?
-
-      files_list = get_files_in_dependency_order(dir, files)
-
-      block.call module_name, concat_files(files_list)
+    def initialize(file_list)
+      @files = file_list
     end
 
-    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
-    end
+    def concat_files(&block)
+      content = ""
 
-    def get_files_in_dependency_order(dir, files)
-      resolver = DependencyResolver.new(files, dir)
-      resolver.sorted_files
-    end
+      @files.each do |f|
+        file_content = File.read(f)
+        # processing
+        file_content = block.call(f, file_content) if block
 
-    def concat_files(file_list)
-      content = ""
-      file_list.each do |f| 
-        content << compile_file(f)
-        content << "\n"
+        content << file_content
       end
       content
     end
-
-    def compile_file(file)
-      compiler = Compiler.get_compiler_for(File.extname(file))
-      compiler.new.compile(File.read(file))
-    end
-
-    # Top level dirs only
-    def get_dirs
-      Dir.glob("#{@options[:load_path]}/*/**/")
-    end
-
   end
 end

data/lib/dependence/file_watcher.rb

@@ -1,7 +1,7 @@
 class FileWatcher
   @@defaults = {
     :load_path => ".",
-    :glob_str  => "**/*.js"
+    :glob_str  => "**/*"
   }
   def initialize(opts, &block)
     @options = @@defaults.merge(opts)

data/lib/dependence/{js_compiler.rb → js_compressor.rb}

@@ -1,14 +1,13 @@
-require "dependence/dependency_resolver"
 require "dependence/colors"
 
-class JsCompiler
+class JsCompressor
   def initialize(source_file, output_file = nil)
     output_file = source_file.gsub(".js", ".min.js") unless output_file
     @source = source_file
     @output = output_file
   end
 
-  def compile
+  def compress
     @cmd = cmd_prefix
     puts Colors.green("Compressing: #{@source}")
     puts Colors.red "Compressor Output:"

data/lib/dependence/js_module.rb

@@ -0,0 +1,66 @@
+require 'dependence/js_compressor'
+require 'dependence/module_injector'
+
+module Dependence
+  class JsModule
+    attr_reader :name 
+
+    def initialize(config)
+      raise "need to pass :source_dir to constructor" unless config[:source_dir]
+      raise "need to pass :source_type to constructor" unless config[:source_type]
+
+      @config = config
+      @name = File.basename(config[:source_dir])
+      @output_file = File.join(@config[:output_dir], "#{@name}.js")
+
+      @file_list = get_file_list_for_module(@config[:source_dir], @config[:source_type])
+      @concat = Concatenator.new(@file_list)
+    end
+
+    def build
+      stdout_compile_msg(@name)
+      output = @concat.concat_files do |file_path, file_contents|
+        extension = File.extname(file_path) 
+        compile(extension, file_contents)
+      end
+
+      output = ModuleInjector.modularize(@name, output) unless @config[:bare] == true
+      output
+    end
+
+    def to_file
+      File.open(@output_file, 'w') do |f|
+        f.syswrite build()
+      end
+
+      JsCompressor.new(@output_file).compress if @config[:compress] == true
+      stdout_compile_complete_msg(@name, @output_file)
+    end
+
+    private
+
+    def compile(extension, source)
+      Compiler.get_compiler_for(extension).new.compile(source)
+    end
+
+    def get_file_list_for_module(dir, source_type)
+      files = Dir.glob File.join(dir, source_type)
+      no_files_error(dir) if files.empty?
+      DependencyResolver.new(files, dir).sorted_files
+    end
+
+    def no_files_error(dir)
+      puts Colors.red("No source files were found in #{dir}")
+      throw :no_files_to_concatenate
+    end
+
+
+    def stdout_compile_msg(module_name)
+      puts Colors.green("Compiling Module: #{module_name}")
+    end
+
+    def stdout_compile_complete_msg(module_name, output)
+      puts Colors.green("Compiled #{module_name} to #{output}")
+    end
+  end
+end

data/lib/dependence.rb

@@ -1,9 +1,10 @@
 require "dependence/dependency_resolver.rb"
 require "dependence/module_injector.rb"
 require "dependence/compiler.rb"
-require "dependence/js_compiler.rb"
 require "dependence/file_watcher.rb"
 require "dependence/concatenator.rb"
+require "dependence/js_module.rb"
+require "dependence/js_compressor.rb"
 
 module Dependence
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependence
 version: !ruby/object:Gem::Version
-  version: 0.0.94
+  version: 0.0.96
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &15461820 !ruby/object:Gem::Requirement
+  requirement: &2170518060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15461820
+  version_requirements: *2170518060
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &15461380 !ruby/object:Gem::Requirement
+  requirement: &2170517620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15461380
+  version_requirements: *2170517620
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &15460960 !ruby/object:Gem::Requirement
+  requirement: &2170517200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15460960
+  version_requirements: *2170517200
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &15460540 !ruby/object:Gem::Requirement
+  requirement: &2170516780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15460540
+  version_requirements: *2170516780
 description: 
 email: jcarver989@gmail.com
 executables:
@@ -64,13 +64,14 @@ extra_rdoc_files: []
 files:
 - bin/dependence
 - compiler/compiler.jar
-- lib/dependence/compiler.rb
-- lib/dependence/js_compiler.rb
 - lib/dependence/colors.rb
+- lib/dependence/compiler.rb
 - lib/dependence/concatenator.rb
-- lib/dependence/module_injector.rb
-- lib/dependence/file_watcher.rb
 - lib/dependence/dependency_resolver.rb
+- lib/dependence/file_watcher.rb
+- lib/dependence/js_compressor.rb
+- lib/dependence/js_module.rb
+- lib/dependence/module_injector.rb
 - lib/dependence.rb
 homepage: 
 licenses: []
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An easy way to handle your client side javascript dependencies