coyote 0.7.0 → 1.0.0.beta1

data/Manifest

@@ -1,11 +1,12 @@
 README.md
 Rakefile
 bin/coyote
-config/coyote-icon.png
-config/coyote-usage.txt
-config/coyote.yaml
 coyote.gemspec
 lib/coyote.rb
+lib/coyote/asset.rb
+lib/coyote/assets/coffeescript.rb
+lib/coyote/assets/javascript.rb
+lib/coyote/bundle.rb
 lib/coyote/closure_compiler.rb
 lib/coyote/configuration.rb
 lib/coyote/fs_listener.rb
@@ -13,32 +14,13 @@ lib/coyote/fs_listeners/darwin.rb
 lib/coyote/fs_listeners/linux.rb
 lib/coyote/fs_listeners/polling.rb
 lib/coyote/fs_listeners/windows.rb
-lib/coyote/generator.rb
-lib/coyote/notification.rb
-lib/coyote/script.rb
-lib/coyote/scripts/coffeescript.rb
-lib/coyote/scripts/combine.rb
-lib/coyote/scripts/javascript.rb
-test/src/public/assets/javascripts/app/application/interface.coffee
-test/src/public/assets/javascripts/app/application/main.coffee
-test/src/public/assets/javascripts/app/application/pages/home.coffee
-test/src/public/assets/javascripts/app/boot.coffee
-test/src/public/assets/javascripts/lib/extensions.coffee
-test/src/public/assets/javascripts/lib/imulus.coffee
-test/src/public/assets/javascripts/lib/imulus/forms.coffee
-test/src/public/assets/javascripts/lib/imulus/maps/infowindow.coffee
-test/src/public/assets/javascripts/lib/imulus/maps/map.coffee
-test/src/public/assets/javascripts/lib/imulus/maps/marker.coffee
-test/src/public/assets/javascripts/lib/imulus/maps/point.coffee
-test/src/public/assets/javascripts/lib/imulus/maps/results.coffee
-test/src/public/assets/javascripts/lib/imulus/tables.coffee
-test/src/public/assets/javascripts/lib/imulus/triggers.coffee
-test/src/public/assets/javascripts/scripts.coffee
-test/src/public/assets/javascripts/vendor/jquery.js
-test/src/public/assets/javascripts/vendor/jquery/jquery.cookie.js
-test/src/public/assets/javascripts/vendor/jquery/jquery.cycle.js
-test/src/public/assets/javascripts/vendor/jquery/jquery.query.js
-test/src/public/assets/javascripts/vendor/swfobject.js
-test/src/public/scripts/scripts.combine
-test/src/public/scripts/scripts.js
+lib/coyote/notifications.rb
+test/scripts/input1.js
+test/scripts/input2.js
+test/scripts/input3.js
+test/scripts/input4.js
+test/scripts/lib/input5.coffee
+test/scripts/lib/input6.js
+test/scripts/lib/keystone/input7.js
+test/scripts/vendor/input8.coffee
 Manifest

data/README.md

@@ -1,94 +1,4 @@
 COYOTE
 =============
 
-An intelligent command-line tool for combining, compressing and compiling your JavaScript and CoffeeScript files.
-
-Coyote selectively concatenates your files, combining them into a single file with the option of running the output through the Google Closure Compiler before save. It can be used to observe your source files for changes and will recompile and save on the fly for easy development.
-
-Coyote automatically compiles CoffeeScript files (bare, with no safety closure) before combining them with other source files. You can freely combine JavaScript and CoffeeScript source files in your compilation.
-
-
-Installation
-------
-	$ gem install coyote
-
-Requirements
-------
-- Compiling CoffeeScript files requires that you have nodejs and coffee-script installed
-- Growl notifications require that you have Growl installed
-
-Terminal Usage
-------
-
-**Configuration**
-
-	$ cd myproject/scripts
-	$ coyote new
-
-*This will create the configuration file (coyote.yaml) and will discover any .js and .coffee files in this directory, automatically adding them to the configuration. Open coyote.yaml and modify the input and output configurations to meet your needs. Coyote will combine the input files in the order you define.*
-
-**Trigger a build**
-
-	$ coyote build
-
-**Trigger the observer**
-
-	$ coyote watch
-
-**Input wildcards**
-
-You can wildcard your input parameters to find files.
-
-	- **/*.js # recursively find all files with the extension '.js'
-	- /jquery/plugins/*.js # find all .js files in the directory
-
-
-**Dependency discovery**
-
-If your files depend on other files or libraries to run, you can define those dependencies so Coyote will include them in the compiled output before the files that require them.
-
-	//= require /jquery/jquery.js
-	#= require /jquery/jquery.js (in CoffeeScript)
-
-or simply
-
-	//= require jquery
-	#= require jquery (in CoffeeScript)
-
-Dependencies are relative to the top level of your directory, likely where your coyote.yaml config file is located.
-
-
-Options
--------
-**Compress output with Google Closure Compiler**
-
-	$ coyote build -c
-	$ coyote build --compress
-
-or
-
-	$ coyote watch -c
-	$ coyote watch --compress
-
-License
--------
-
-Copyright (C) 2011 by Imulus
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+TODO: documentation

data/Rakefile

@@ -6,21 +6,19 @@ require 'echoe'
 $: << File.expand_path(File.dirname(__FILE__) + "/lib")
 require 'coyote'
 
-Echoe.new(Coyote::APP_NAME.downcase, Coyote::VERSION) do |p|
+Echoe.new('coyote', Coyote::VERSION) do |p|
   p.description    = "An intelligent command-line tool for combining, compressing and compiling your JavaScript and CoffeeScript files."
 	p.summary 			 = "Coyote selectively concatenates your files, combining them into a single file with the option of running the output through the Google Closure Compiler before save. It can be used to observe your source files for changes and will recompile and save on the fly for easy development."
-		
   p.url            = "http://github.com/imulus/coyote"
   p.author         = "Imulus"
   p.email          = "developer@imulus.com"
-  p.ignore_pattern = ["tmp/*", "script/*", "test/*", "assets/*"]
+  p.ignore_pattern = ["tmp/*", "test/*"]
   
   dependencies = Array.new
   target_os = Config::CONFIG['target_os']
   
   if target_os =~ /darwin/i
     dependencies << "rb-fsevent >=0.4.0"
-    dependencies << "rb-appscript >=0.6.1"
     dependencies << "term-ansicolor >=1.0.5"
   elsif target_os =~ /linux/i
     dependencies << "rb-inotify >=0.8.4"
@@ -30,4 +28,10 @@ Echoe.new(Coyote::APP_NAME.downcase, Coyote::VERSION) do |p|
   
   p.development_dependencies = dependencies
 	p.runtime_dependencies = dependencies
+end
+
+task :build do
+  `rake manifest`
+  `rake build_gemspec`
+  `gem build coyote.gemspec`
 end

data/bin/coyote

@@ -1,46 +1,23 @@
 #!/usr/bin/env ruby
 
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-require 'fileutils'
 require 'rubygems'
+require 'fileutils'
 require 'optparse'
 require 'coyote'
 
 
-@options = {}
+options = {}
 OptionParser.new do |opts|
-  opts.on("-c", "--compress", "Compress") do |option|
-  	@options['compress'] = option
-  end
-  opts.on("-v", "--verbose", "Verbose") do |option|
-  	@options['verbose'] = option
+  Coyote::options.each do |name|
+    opts.on("-#{name[0]}", "--#{name}", "#{name.capitalize}") { |o| options[name.to_sym] = o }
   end
 end.parse!
 
+input, output = ARGV[0].split(':', 2)
 
-def config
-  config = Coyote::Configuration.new @options
-	ARGV.shift
-	
-	if ARGV.empty?
-  	config.load_from_yaml!
-	else
-    input, output = ARGV[0].split(':', 2)
-	  config.inputs = input
-	  config.output = output
-	end
-
-  return config
-end  
-  
-
-case ARGV.first
-when 'new'
-  Coyote::generate
-when 'build'
-  Coyote::build config
-when 'watch'
-  Coyote::watch config
-else
-  Coyote::usage
+coyote :build do |config|
+  config.input    = input
+  config.output   = output
+  config.options  = options
 end

data/coyote.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.7.0"
+  s.version = "1.0.0.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Imulus"]
-  s.date = %q{2012-01-18}
+  s.date = %q{2012-02-13}
   s.default_executable = %q{coyote}
   s.description = %q{An intelligent command-line tool for combining, compressing and compiling your JavaScript and CoffeeScript files.}
   s.email = %q{developer@imulus.com}
   s.executables = ["coyote"]
-  s.extra_rdoc_files = ["README.md", "bin/coyote", "lib/coyote.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/configuration.rb", "lib/coyote/fs_listener.rb", "lib/coyote/fs_listeners/darwin.rb", "lib/coyote/fs_listeners/linux.rb", "lib/coyote/fs_listeners/polling.rb", "lib/coyote/fs_listeners/windows.rb", "lib/coyote/generator.rb", "lib/coyote/notification.rb", "lib/coyote/script.rb", "lib/coyote/scripts/coffeescript.rb", "lib/coyote/scripts/combine.rb", "lib/coyote/scripts/javascript.rb"]
-  s.files = ["README.md", "Rakefile", "bin/coyote", "config/coyote-icon.png", "config/coyote-usage.txt", "config/coyote.yaml", "coyote.gemspec", "lib/coyote.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/configuration.rb", "lib/coyote/fs_listener.rb", "lib/coyote/fs_listeners/darwin.rb", "lib/coyote/fs_listeners/linux.rb", "lib/coyote/fs_listeners/polling.rb", "lib/coyote/fs_listeners/windows.rb", "lib/coyote/generator.rb", "lib/coyote/notification.rb", "lib/coyote/script.rb", "lib/coyote/scripts/coffeescript.rb", "lib/coyote/scripts/combine.rb", "lib/coyote/scripts/javascript.rb", "test/src/public/assets/javascripts/app/application/interface.coffee", "test/src/public/assets/javascripts/app/application/main.coffee", "test/src/public/assets/javascripts/app/application/pages/home.coffee", "test/src/public/assets/javascripts/app/boot.coffee", "test/src/public/assets/javascripts/lib/extensions.coffee", "test/src/public/assets/javascripts/lib/imulus.coffee", "test/src/public/assets/javascripts/lib/imulus/forms.coffee", "test/src/public/assets/javascripts/lib/imulus/maps/infowindow.coffee", "test/src/public/assets/javascripts/lib/imulus/maps/map.coffee", "test/src/public/assets/javascripts/lib/imulus/maps/marker.coffee", "test/src/public/assets/javascripts/lib/imulus/maps/point.coffee", "test/src/public/assets/javascripts/lib/imulus/maps/results.coffee", "test/src/public/assets/javascripts/lib/imulus/tables.coffee", "test/src/public/assets/javascripts/lib/imulus/triggers.coffee", "test/src/public/assets/javascripts/scripts.coffee", "test/src/public/assets/javascripts/vendor/jquery.js", "test/src/public/assets/javascripts/vendor/jquery/jquery.cookie.js", "test/src/public/assets/javascripts/vendor/jquery/jquery.cycle.js", "test/src/public/assets/javascripts/vendor/jquery/jquery.query.js", "test/src/public/assets/javascripts/vendor/swfobject.js", "test/src/public/scripts/scripts.combine", "test/src/public/scripts/scripts.js", "Manifest"]
+  s.extra_rdoc_files = ["README.md", "bin/coyote", "lib/coyote.rb", "lib/coyote/asset.rb", "lib/coyote/assets/coffeescript.rb", "lib/coyote/assets/javascript.rb", "lib/coyote/bundle.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/configuration.rb", "lib/coyote/fs_listener.rb", "lib/coyote/fs_listeners/darwin.rb", "lib/coyote/fs_listeners/linux.rb", "lib/coyote/fs_listeners/polling.rb", "lib/coyote/fs_listeners/windows.rb", "lib/coyote/notifications.rb"]
+  s.files = ["README.md", "Rakefile", "bin/coyote", "coyote.gemspec", "lib/coyote.rb", "lib/coyote/asset.rb", "lib/coyote/assets/coffeescript.rb", "lib/coyote/assets/javascript.rb", "lib/coyote/bundle.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/configuration.rb", "lib/coyote/fs_listener.rb", "lib/coyote/fs_listeners/darwin.rb", "lib/coyote/fs_listeners/linux.rb", "lib/coyote/fs_listeners/polling.rb", "lib/coyote/fs_listeners/windows.rb", "lib/coyote/notifications.rb", "test/scripts/input1.js", "test/scripts/input2.js", "test/scripts/input3.js", "test/scripts/input4.js", "test/scripts/lib/input5.coffee", "test/scripts/lib/input6.js", "test/scripts/lib/keystone/input7.js", "test/scripts/vendor/input8.coffee", "Manifest"]
   s.homepage = %q{http://github.com/imulus/coyote}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Coyote", "--main", "README.md"]
   s.require_paths = ["lib"]
@@ -25,25 +25,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-      s.add_runtime_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.5"])
       s.add_development_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-      s.add_development_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_development_dependency(%q<term-ansicolor>, [">= 1.0.5"])
     else
       s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-      s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
       s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-      s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
     end
   else
     s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-    s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
     s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
-    s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
   end
 end

data/lib/coyote.rb

@@ -1,83 +1,49 @@
-require 'yaml'
-require 'term/ansicolor'
-require 'coyote/script'
 require 'coyote/configuration'
+require 'coyote/bundle'
 require 'coyote/fs_listener'
-require 'coyote/generator'
-require 'coyote/closure_compiler'
-require 'coyote/notification'
+require 'coyote/notifications'
+include Coyote::Notifications
 
-include Term::ANSIColor
 
 module Coyote
-  APP_NAME        = "Coyote"
-  VERSION         = "0.7.0"
-  ROOT_PATH       = Dir.pwd
-  CONFIG_PATH     = File.expand_path(File.dirname(__FILE__) + "/../config")
-  CONFIG_FILENAME = "coyote.yaml"
-  CONFIG_ICON     = "coyote-icon.png"
-  USAGE_FILENAME  = "coyote-usage.txt"
-
-  module Defaults
-    OUTPUT = "coyote.js"
+  
+  VERSION = '1.0.0.beta1'
+  
+  def self.run(input_path, output_path, options = {})
+    @@input_path  = input_path
+    @@output_path = output_path
+    @@options     = options
+    bundle = Coyote::Bundle.new(input_path, output_path)
+    build bundle
+    watch bundle if @@options[:watch]
   end
 
-  def self.generate
-    Coyote::Generator.new.generate
+  def self.options
+    ['compress', 'watch', 'quiet']
   end
 
-  
-
-
-  def self.build(config)
-    if config.inputs == config.output
-      Coyote::Notification.new "Input path cannot be the same as output path\n\n", "Failure"    
-      exit 0
-    end
-    
-    output = Coyote::Script.select_and_init(config.output)
-    output.empty!
-
-    config.inputs.each do |file, input|
-      output.append input.contents
-      print "+ Added #{file}\n" if config.options['verbose']
-    end
-
-    output.compress! if config.should_compress?
-    output.save
-    Coyote::Notification.new "Saved #{config.output}\n\n", "success"
+  def self.build(bundle)
+    notify bundle.manifest unless @@options[:quiet]
+    bundle.compress! if @@options[:compress]
+    bundle.save
+    notify "#{Time.new.strftime("%I:%M:%S")}   Saved bundle to #{@@output_path}   [#{bundle.files.length} files]", :success    
   end
 
 
-  def self.watch(config)
-    self.build config
-
+  def self.watch(bundle)
     listener = Coyote::FSListener.select_and_init
 
-    inputs = config.inputs.values.collect do |script|
-      script.relative_path
-    end
+    listener.on_change do |changed_files|
+      changed_files = bundle.files & changed_files
 
-    listener.on_change do |files|
-      if files.include? config.source
-        Coyote::Notification.new "Config file (#{config.source}) changed. Reading it in.\n", "warning"
-        config.load_from_yaml! config.source
-        self.build config
-      else
-        changed_watched_files = inputs & files
-        if changed_watched_files.length > 0
-          self.build config
-        end
+      if changed_files.length > 0
+        notify "#{Time.new.strftime("%I:%M:%S")}   Detected change, recompiling...", :warning
+        bundle.update! changed_files
+        build bundle
       end
     end
 
+    notify "Watching for changes to your bundle. CTRL+C to stop."
     listener.start
   end
-
-
-  def self.usage
-    file = File.open("#{Coyote::CONFIG_PATH}/#{Coyote::USAGE_FILENAME}", 'r')
-    puts file.read
-    file.close
-  end
 end

data/lib/coyote/asset.rb

@@ -0,0 +1,51 @@
+module Coyote
+  autoload :JavaScript,   'coyote/assets/javascript'
+  autoload :CoffeeScript, 'coyote/assets/coffeescript'
+
+  class Asset
+
+    attr_reader :relative_path, :absolute_path, :relative_directory, :absolute_directory, :dependencies
+    attr_accessor :contents
+
+    # Determine the type of file based on the file extension
+    # and return an instance of the proper asset class
+    def self.select_and_init(path)
+      case File.extname(path)
+      when /\.js/i      ; JavaScript.new(path)
+      when /\.coffee/i  ; CoffeeScript.new(path)
+      else              ; self.new(path)
+      end
+    end
+
+
+    def initialize(relative_path)
+      @relative_path      = File.expand_path(relative_path).gsub("#{Dir.pwd}/", '')
+      @absolute_path      = File.expand_path(@relative_path)
+      @relative_directory = File.dirname(@relative_path)
+      @absolute_directory = File.expand_path("#{Dir.pwd}/#{@relative_directory}")
+      update!
+    end
+
+
+    def update!
+      @contents = File.exists?(@absolute_path) ? File.open(@absolute_path, 'r').read : ""
+      find_dependencies
+    end
+
+
+    protected
+
+    # Defines the regex pattern for scanning the contents of the
+    # file to look for require directives
+    def require_pattern
+      Regexp.new(/\/\/=\s*require\s*(.*)$/i) # '//= require a/b/c.js' => 'a/b/c.js'
+    end
+
+    def find_dependencies
+      matches = @contents.scan(require_pattern)
+      @dependencies = matches.reverse.collect { |match| "#{@relative_directory}/#{match.last.strip}" }
+    end
+
+
+  end
+end