coyote 0.2.5 → 0.2.6

data/Manifest

@@ -1,8 +1,23 @@
 Manifest
+README.md
 Rakefile
 bin/coyote
 config/coyote.yaml
 lib/coyote.rb
-lib/coyote/builder.rb
+lib/coyote/closure_compiler.rb
+lib/coyote/config_reader.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/output.rb
+test/javascript/application.js
+test/javascript/application/controller.js
+test/javascript/application/interface.js
+test/javascript/init.js
+test/javascript/jquery/jquery.js
+test/javascript/jquery/plugins/jquery.cookie.js
+test/javascript/jquery/plugins/jquery.cycle.all.min.js
+test/javascript/jquery/plugins/jquery.query.js

data/README.md

@@ -0,0 +1,91 @@
+COYOTE
+=============
+
+An intelligent command-line tool for combining and compressing JavaScript files.
+
+Coyote selectively concatenates your JS files, combining them into a single file with the option of running the output through the Google Closure Compiler before save. Coyote automatically observes your directories and source files for changes and will recompile and save on the fly for easy development.
+
+
+Installation
+------
+	$ gem install coyote
+
+Usage
+------
+
+**Configuration**
+
+	$ cd myproject/scripts
+	$ coyote generate
+
+*This will create the configuration file at coyote.yaml and will find any .js files and automatically add them to the input parameter. 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.*
+
+**Running Coyote**
+
+	$ coyote
+
+**Building without watching**
+
+	$ coyote build
+
+**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 JavaScript 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
+	
+or simply
+
+	// require jquery
+
+Dependencies are relative to the top level of your directory, likely where your coyote.yaml config file is located.
+
+
+Options
+-------
+**Forced compression**
+
+	$ coyote -c
+
+or
+
+	$ coyote build -c
+
+Plan
+----
+
+- Global configuration for logging
+- Support for Growl notifications
+- Configuration options for level of compression
+
+
+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.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('coyote', '0.2.5') do |p|
-  p.description    = "A flexible command-line tool for combining and compressing JS files"
-	p.summary 			 = "Coyote is a command-line tool for combining and compressing JS files. It uses YAML for configuration and the Google Closure Compiler to compilation and compression."
-  p.url            = "http://github.com/caseyohara/coyote"
-  p.author         = "Casey O'Hara"
+Echoe.new('coyote', '0.2.6') do |p|
+  p.description    = "An intelligent command-line tool for combining and compressing JavaScript files."
+	p.summary 			 = "Coyote selectively concatenates your JS files, combining them into a single file with the option of running the output through the Google Closure Compiler. Coyote automatically observes your directories and 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          = "casey.ohara@imulus.com"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["closure-compiler >=1.1.1", "term-ansicolor >=1.0.5"]
-	p.runtime_dependencies = ["closure-compiler >=1.1.1", "term-ansicolor >=1.0.5"]
+  p.ignore_pattern = ["tmp/*", "script/*", "test/*"]
+  p.development_dependencies = ["term-ansicolor >=1.0.5"]
+	p.runtime_dependencies = ["term-ansicolor >=1.0.5"]
 end

data/bin/coyote

@@ -1,33 +1,63 @@
 #!/usr/bin/env ruby
-
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'fileutils'
 require 'rubygems'
-require 'closure-compiler'
 require 'optparse'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/coyote")
-require "coyote/builder"
-require "coyote/generator"
-require "coyote/output"
-
+require 'coyote'
 
-options = {}
+@options = {}
 OptionParser.new do |opts|
-  opts.on("-f", "--force", "Force") do |f|
-  	options[:force] = f
+  opts.on("-f", "--force", "Force") do |o|
+  	@options[:force] = o
   end
-  opts.on("-c", "--compress", "Compress") do |c|
-  	options[:compress] = c
+
+  opts.on("-c", "--compress", "Compress") do |o|
+  	@options[:compress] = o
   end
 end.parse!
 
+def config_file_reader(rebuild = false)
+  if nil == @reader or rebuild
+    @reader = Coyote::ConfigReader.new(@options)
+    @reader.find_input_files
+  end
+  
+  return @reader
+end
+
+def coyote_the_sources
+  
+  reader = config_file_reader
+  
+  output = Coyote::Output.new(reader.output_file, reader.should_compress?)
+  output.add_files(reader.input_files)
+  output.save
+end
 
 case ARGV.first
 when 'generate'
-	Coyote::Generator.new(options).generate
+	Coyote::Generator.new(@options).generate
 when 'build'
-	Coyote::Builder.new(options).build
+  coyote_the_sources
 else
-	Coyote::Builder.new(options).build
-end
-
+  
+  coyote_the_sources
+  
+  listener = Coyote::FSListener.select_and_init
+  
+  listener.on_change do |files|
+    if files.include?(Coyote::CONFIG_FILENAME)
+      print "Config file changed.  Reading it in.\n".yellow
+      config_file_reader(true) #rebuild the sources of the config file
+      coyote_the_sources
+    else
+      #see if any of the files in the config file changed
+      changed_watched_files = config_file_reader.input_files & files
+      if changed_watched_files.length > 0
+        coyote_the_sources
+      end
+    end
+  end
 
+  listener.start
+end

data/config/coyote.yaml

@@ -1,22 +1,2 @@
-# Example usages:
-
-# Explicitly defining individual files to join
-application:
-  compress: true
-  output: application.js
-  input: 
-    - application/Application.Data.js
-    - application/Application.Controller.js
-    - application/Application.Interface.js
-
-# Recursively searching and adding
-application_classes:
-  compress: false
-  output:   application.classes.js
-  input:    application/**/*.class.js
-
-# Adding by extension
-jquery:
-  compress: true
-  output:   jquery.plugins.js
-  input:    jquery/plugins/*.js
+output: scripts.js
+input:

data/coyote.gemspec

@@ -2,42 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Casey O'Hara"]
-  s.date = %q{2011-05-02}
+  s.authors = ["Imulus"]
+  s.date = %q{2011-05-20}
   s.default_executable = %q{coyote}
-  s.description = %q{A flexible command-line tool for combining and compressing JS files}
+  s.description = %q{An intelligent command-line tool for combining and compressing JavaScript files.}
   s.email = %q{casey.ohara@imulus.com}
   s.executables = ["coyote"]
-  s.extra_rdoc_files = ["bin/coyote", "lib/coyote.rb", "lib/coyote/builder.rb", "lib/coyote/generator.rb", "lib/coyote/output.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/coyote", "config/coyote.yaml", "lib/coyote.rb", "lib/coyote/builder.rb", "lib/coyote/generator.rb", "lib/coyote/output.rb", "coyote.gemspec"]
-  s.homepage = %q{http://github.com/caseyohara/coyote}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Coyote"]
+  s.extra_rdoc_files = ["README.md", "bin/coyote", "lib/coyote.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/config_reader.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/output.rb"]
+  s.files = ["Manifest", "README.md", "Rakefile", "bin/coyote", "config/coyote.yaml", "lib/coyote.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/config_reader.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/output.rb", "test/javascript/application.js", "test/javascript/application/controller.js", "test/javascript/application/interface.js", "test/javascript/init.js", "test/javascript/jquery/jquery.js", "test/javascript/jquery/plugins/jquery.cookie.js", "test/javascript/jquery/plugins/jquery.cycle.all.min.js", "test/javascript/jquery/plugins/jquery.query.js", "coyote.gemspec"]
+  s.homepage = %q{http://github.com/imulus/coyote}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Coyote", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{coyote}
   s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Coyote is a command-line tool for combining and compressing JS files. It uses YAML for configuration and the Google Closure Compiler to compilation and compression.}
+  s.summary = %q{Coyote selectively concatenates your JS files, combining them into a single file with the option of running the output through the Google Closure Compiler. Coyote automatically observes your directories and source files for changes and will recompile and save on the fly for easy development.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<closure-compiler>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.5"])
-      s.add_development_dependency(%q<closure-compiler>, [">= 1.1.1"])
       s.add_development_dependency(%q<term-ansicolor>, [">= 1.0.5"])
     else
-      s.add_dependency(%q<closure-compiler>, [">= 1.1.1"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
-      s.add_dependency(%q<closure-compiler>, [">= 1.1.1"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
     end
   else
-    s.add_dependency(%q<closure-compiler>, [">= 1.1.1"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
-    s.add_dependency(%q<closure-compiler>, [">= 1.1.1"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.5"])
   end
 end

data/lib/coyote.rb

@@ -1,9 +1,15 @@
 require 'yaml'
 require 'term/ansicolor'
+require 'coyote/config_reader'
+require 'coyote/fs_listener'
+require 'coyote/generator'
+require 'coyote/output'
+require 'coyote/closure_compiler'
+
 include Term::ANSIColor
 
 module Coyote
-	VERSION = "0.2.5"
+	VERSION = "0.2.6"
 	ROOT_PATH = Dir.pwd
 	CONFIG_PATH = File.expand_path(File.dirname(__FILE__) + "/../config")
 	CONFIG_FILENAME = "coyote.yaml"

data/lib/coyote/closure_compiler.rb

@@ -0,0 +1,56 @@
+require 'net/http'
+
+module Coyote
+  class ClosureCompiler
+    
+    def initialize
+      @request = Net::HTTP::Post.new('/compile', 'Content-type' => 'application/x-www-form-urlencoded')
+    end
+    
+    def compile(content)
+      @content = content
+      params = {
+        'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
+        'output_format' => 'xml',
+        'output_info' => 'compiled_code',
+        'js_code' => @content
+      }
+
+      @request.set_form_data(params)
+      begin
+        res = Net::HTTP.new('closure-compiler.appspot.com', 80).start {|http| http.request(@request) }
+        case res
+        when Net::HTTPSuccess
+          #puts res.body
+          @doc = REXML::Document.new(res.body)
+        end
+      rescue REXML::ParseException => msg       
+        print "Failed: #{msg}\n".red
+      rescue
+        #these should be caught by external checking
+      end
+      
+      self
+    end
+    
+    def success?
+      @doc && @doc.root && @doc.root.elements['serverErrors'].nil?
+    end
+    
+    def errors
+      unless @doc
+        nil
+      else
+        @doc.root.elements["serverErrors"]
+      end
+    end
+    
+    def compiled_code
+      @doc.root.elements['compiledCode'].text
+    end
+    
+    def file_too_big?
+      @doc && @doc.root && @doc.root.elements["serverErrors/error[@code='8']"] != nil
+    end
+  end
+end

data/lib/coyote/config_reader.rb

@@ -0,0 +1,88 @@
+module Coyote
+  class ConfigReader
+
+		attr_accessor :config, :options, :input_files
+
+		def initialize(options)
+			@options = options
+			@config = get_config_or_screw_off
+			@input_files = []
+		end
+		
+		def output_file
+		  return @config['output']
+		end
+		
+		def should_compress?
+		  return @config['compress'] || options[:compress]
+		end
+
+		def find_input_files
+		  @input_files = []
+			@config['input'].each { |input| add_input input }
+		end
+
+
+		def add_input(input)
+			if input.class == Array
+				input.each do |input|
+					find_and_add_files input
+				end
+			elsif input.class == String and @config['output'] != input
+				find_and_add_files input
+			end
+		end
+
+		
+		def find_and_add_files(input)
+			Dir.glob(input).each do |file|
+				required = find_requires file
+				required.each do |requirement|
+					find_and_add_files "**/#{requirement}.js"
+				end
+				if ! @input_files.include? file
+					@input_files.push file
+				end
+			end
+		end
+
+
+		def find_requires(input_file)
+			required = []
+			File.open(input_file) do |file|
+				file = file.read
+				pattern = Regexp.new(/(\/\/.*)(require )(.*)$/x)
+				matches = file.scan(pattern)
+				matches.each do |match|
+					required.push match.last.strip.to_s.gsub(/\.js/, '').gsub(/(\"|\')/, '')
+				end
+			end
+			#puts required
+			return required
+		end	
+
+
+		def get_config_or_screw_off
+			if File.exists?(Coyote::CONFIG_FILENAME)
+				begin
+					config = YAML.load(File.open(Coyote::CONFIG_FILENAME))
+					if config.class == Hash && ! config.empty?
+				  	return config
+					else
+						print "Coyote configuration exists but has not been defined yet. Configure it in #{Coyote::CONFIG_FILENAME}\n".red
+						exit(0)
+					end
+				rescue ArgumentError => e
+				  print "Could not parse YAML: #{e.message}\n".red
+				  exit
+				end
+			else
+				print "Could not find a Coyote configuration file in this directory. Use 'coyote generate' to create one.\n".red
+				exit
+			end
+		end
+
+
+
+  end
+end