jsdm 0.4.2 → 0.4.3

data/Rakefile

@@ -11,11 +11,12 @@ spec = Gem::Specification.new do |s|
   s.files             = Dir['{lib,doc,bin,ext}/**/*'].delete_if { |f|
                           /\/rdoc(\/|$)/i.match f
                         } + %w(Rakefile README.rdoc)
+  s.executables       = Dir['bin/*'].map(&File.method(:basename))
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.rubyforge_project = 'jsdm'
   s.homepage          = 'http://www.github.com/retiman/jsdm'
-  s.version           = '0.4.2'
+  s.version           = '0.4.3'
   s.summary           = 'Javascript dependency manager'
   s.description       = <<-EOF
     Use #require statements to declare dependencies in JavaScript and let JSDM

data/bin/jsdm

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+$: << 'lib'
+
+require 'jsdm'
+require 'optparse'
+require 'pp'
+
+options = {
+  :load_path => ['.']
+}
+
+optparse = OptionParser.new do |opts|
+  opts.banner = 'Usage: jsdm [options] path1 path2 path3'
+
+  opts.on(
+    '-e',
+    '--extension EXTENSION',
+    'Process files ending in .EXTENSION'
+  ) do |extension|
+    if extension.nil?
+      puts opts
+      exit
+    end
+    options[:extension] = extension
+  end
+
+  opts.on(
+    '-c',
+    '--comment-pattern PATTERN',
+    'Process comments matching regex PATTERN'
+  ) do |pattern|
+    if pattern.nil?
+      puts opts
+      exit
+    end
+    options[:comment_pattern] = Regexp.new(pattern)
+  end
+
+  opts.on(
+    '-r',
+    '--require-pattern',
+    'Process require directives matching regex PATTERN'
+  ) do |pattern|
+    if pattern.nil?
+      puts opts
+      exit
+    end
+    options[:require_pattern] = Regexp.new(pattern)
+  end
+
+  opts.on(
+    '-R',
+    '--randomize',
+    'Randomize files beforehand'
+  ) do
+    options[:randomize] = true
+    options[:sort] = false
+  end
+
+  opts.on(
+    '-S',
+    '--sort',
+    'Sort files beforehand'
+  ) do
+    options[:randomize] = false
+    options[:sort] = true
+  end
+
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
+options[:load_path] = ARGV unless ARGV.empty?
+
+begin
+  sources = JSDM.new(options).sources
+  exit if sources.empty?
+  sources.each { |s| puts s }
+rescue JSDM::CircularDependencyError => e
+  puts e.message
+rescue JSDM::UnsatisfiableDependencyError => e
+  puts e.message
+end

data/lib/jsdm.rb

@@ -26,9 +26,28 @@ class JSDM
                 :manager,
                 :resolver
 
+  # Options: randomize sort load_path extension comment_pattern require_pattern
+  #
+  # Examples:
+  #
+  #   # Looks for both .js and .jsm extensions in the current directory
+  #   JSDM.new :extension => '{js,jsm}'
+  #
+  #   # Looks for JavaScript files in two different directories
+  #   JSDM.new :load_path => %w(some/path some/other/path)
+  #
+  #   # Sorts the JavaScript files beforehand; ensures a unique ordering of
+  #   # dependencies, even if you've made a mistake in specifying the require
+  #   # statements
+  #   JSDM.new :sort => true
+  #
+  #   # Randomizes the JavaScript files beforehand; hopefully ensures that you
+  #   # will get an error from improperly specifying dependencies
+  #   JSDM.new :randomize => true
   def initialize(opts = {})
     defaults = {
-      :randomize       => true,
+      :randomize       => false,
+      :sort            => true,
       :load_path       => '.',
       :extension       => 'js',
       :comment_pattern => Preprocessor.comment_pattern,
@@ -57,8 +76,9 @@ class JSDM
     self.sources      = options[:load_path].map { |path|
                           Dir[File.join(path, '**', "*.#{options[:extension]}")]
                         }.flatten
-    self.sources      = sources.sort { rand } if options[:randomize]
-    self.preprocessor = Preprocessor.new       sources, options
+    self.sources      = sources.sort if options[:sort]
+    self.sources      = sources.sort_by { rand } if options[:randomize]
+    self.preprocessor = Preprocessor.new sources, options
     self.manager      = DependencyManager.new  sources
     self.resolver     = DependencyResolver.new options[:load_path]
     self.requires     = preprocessor.process

data/lib/jsdm/errors.rb

@@ -39,7 +39,7 @@ class JSDM
     private :source=, :dep=
 
     def initialize(source, dep)
-      msg = "File #{source} has unsatisfiable dependency:\n" +
+      msg = "File #{source} has one or more unsatisfiable dependencies:\n" +
             "  #{dep}"
       self.source = source
       self.dep = dep

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsdm
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Min Huang
@@ -20,8 +21,8 @@ dependencies: []
 
 description: "    Use #require statements to declare dependencies in JavaScript and let JSDM\n    resolve the dependencies for you.\n"
 email: min.huang@alumni.usc.edu
-executables: []
-
+executables: 
+- jsdm
 extensions: []
 
 extra_rdoc_files: []
@@ -37,6 +38,7 @@ files:
 - lib/jsdm/dependency_resolver.rb
 - doc/LICENSE
 - doc/REFERENCES
+- bin/jsdm
 - Rakefile
 - README.rdoc
 has_rdoc: true
@@ -49,23 +51,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: jsdm
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Javascript dependency manager