coyote 0.2.3 → 0.2.4

data/Rakefile

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('coyote', '0.2.3') do |p|
-  p.description    = "A command-line tool for combining and compressing JS files"
+Echoe.new('coyote', '0.2.4') 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"

data/bin/coyote

@@ -10,7 +10,6 @@ require "coyote/generator"
 require "coyote/output"
 
 
-
 options = {}
 OptionParser.new do |opts|
   opts.on("-f", "--force", "Force") do |f|

data/config/coyote.yaml

@@ -1,17 +1,22 @@
-# Example usage:
+# Example usages:
 
-# application:
-#   compress: false
-#   output: "application.js"
-#   files: 
-#     - "application/Application.Data.js"
-#     - "application/Application.Controller.js"
-#     - "application/Application.Interface.js"
-# 
-# jquery:
-#   compress: true
-#   output: "jquery.plugins.js"
-#   files:
-#     - "jquery/plugins/jquery.cookie.js"
-#     - "jquery/plugins/jquery.cycle.all.min.js"
-#     - "jquery/plugins/jquery.query.js"
+# 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

data/coyote.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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-04-30}
+  s.date = %q{2011-05-02}
   s.default_executable = %q{coyote}
-  s.description = %q{A command-line tool for combining and compressing JS files}
+  s.description = %q{A flexible command-line tool for combining and compressing JS 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"]

data/lib/coyote.rb

@@ -3,7 +3,7 @@ require 'term/ansicolor'
 include Term::ANSIColor
 
 module Coyote
-	VERSION = "0.1.0"
+	VERSION = "0.2.4"
 	ROOT_PATH = Dir.pwd
 	CONFIG_PATH = File.expand_path(File.dirname(__FILE__) + "/../config")
 	CONFIG_FILENAME = "coyote.yaml"

data/lib/coyote/builder.rb

@@ -5,21 +5,29 @@ module Coyote
 
 		def initialize(options)
 			@options = options
-			@config = get_config_or_defaults
+			@config = get_config_or_screw_off
 		end
 		
 		def build
-			if @config && config_defined?
-				@config.each do |k,v|
-					input_files = @config[k]['files']
-					output_filename = @config[k]['output']
+			if config_defined?
+				@config.each do |key,value|
+					input = value['input']
+					output_filename = value['output']
 					output = Coyote::Output.new output_filename
 			
-					input_files.each do |filename|
-						output.append(filename)
+					if input.class == Array
+						input.each do |input|
+							Dir.glob(input).each do |file|
+								output.append file								
+							end
+						end
+					elsif input.class == String 
+						Dir.glob(input).each do |file|
+							output.append file
+						end
 					end
 
-					if @config[k]['compress'] || @options[:compress]
+					if value['compress'] || @options[:compress]
 						output.compress
 					end
 
@@ -31,12 +39,13 @@ module Coyote
 		end
 
 
-		def get_config_or_defaults
+		def get_config_or_screw_off
 			if File.exists?(Coyote::CONFIG_FILENAME)
-				config = begin
-				  YAML.load(File.open(Coyote::CONFIG_FILENAME))
+				begin
+				  return YAML.load(File.open(Coyote::CONFIG_FILENAME))
 				rescue ArgumentError => e
 				  print "Could not parse YAML: #{e.message}\n".red
+				  return false
 				end
 			else
 				print "Could not find a Coyote configuration file in this directory. Use 'coyote generate' to create one.\n".red
@@ -45,7 +54,7 @@ module Coyote
 		end
 		
 		def config_defined?
-			@config.class == Hash && ! @config.empty?
+			@config && @config.class == Hash && ! @config.empty?
 		end
   end
 end

data/lib/coyote/output.rb

@@ -13,13 +13,17 @@ module Coyote
 
 		# open file, add contents to output
 		def append(filename)
-			@input_files.push(filename)
-			File.open(filename, 'r') do |file|
-				@input += "/***** #{filename} *****/\n"
-				@input += file.read
-       	@input += "\n\n\n"
+		  if File.exists?(filename) 
+			  @input_files.push(filename)
+			  File.open(filename, 'r') do |file|
+			  	@input += "/***** #{filename} *****/\n"
+			  	@input += file.read
+         	@input += "\n\n\n"
+			  end
+			  print "+ Added #{filename}\n"
+			else
+			  print "! Error adding #{filename}\n"
 			end
-			print "+ Added #{filename}\n"
 		end
 
 		# save output to file
@@ -27,6 +31,7 @@ module Coyote
 			add_file_comments
 			@output_file.write(@input)
 			print "Saved to #{@output_filename} \n\n".green
+			@output_file.close
 		end
 
 		def add_file_comments

metadata

@@ -2,7 +2,7 @@
 name: coyote
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Casey O'Hara
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -06:00
+date: 2011-05-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
         version: 1.0.5
   type: :development
   version_requirements: *id004
-description: A command-line tool for combining and compressing JS files
+description: A flexible command-line tool for combining and compressing JS files
 email: casey.ohara@imulus.com
 executables: 
 - coyote