coyote 0.3.1 → 0.3.2

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rbconfig'
 require 'rake'
 require 'echoe'
 
@@ -12,6 +13,20 @@ Echoe.new(Coyote::APP_NAME.downcase, Coyote::VERSION) do |p|
   p.author         = "Imulus"
   p.email          = "developer@imulus.com"
   p.ignore_pattern = ["tmp/*", "script/*", "test/*", "assets/*"]
-  p.development_dependencies = ["term-ansicolor >=1.0.5", "rb-appscript >=0.6.1"]
-	p.runtime_dependencies = ["term-ansicolor >=1.0.5", "rb-appscript >=0.6.1"]
+  
+  dependencies = Array.new
+  dependencies << "term-ansicolor >=1.0.5"
+  target_os = Config::CONFIG['target_os']
+  
+  if target_os =~ /darwin/i
+    dependencies << "rb-fsevent >=0.4.0"
+    dependencies << "rb-appscript >=0.6.1"
+  elsif target_os =~ /linux/i
+    dependencies << "rb-inotify >=0.8.4"
+  elsif target_os =~ /mswin|mingw/i
+    dependencies << "rb-fchange >=0.0.5"
+  end
+  
+  p.development_dependencies = dependencies
+	p.runtime_dependencies = dependencies
 end

data/bin/coyote

@@ -47,7 +47,7 @@ else
   
   listener.on_change do |files|
     if files.include?(Coyote::CONFIG_FILENAME)
-      print "Config file changed.  Reading it in.\n".yellow
+			Coyote::Notification.new "Config file changed.  Reading it in.\n", "warning"
       config_file_reader(true) #rebuild the sources of the config file
       coyote_the_sources
     else

data/coyote.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Imulus"]
-  s.date = %q{2011-05-22}
+  s.date = %q{2011-05-27}
   s.default_executable = %q{coyote}
   s.description = %q{An intelligent command-line tool for combining and compressing JavaScript files.}
   s.email = %q{developer@imulus.com}
@@ -25,19 +25,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.5"])
+      s.add_runtime_dependency(%q<rb-fsevent>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_development_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"])
     else
       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"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
       s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
     end
   else
     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"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0.4.0"])
     s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
   end
 end

data/lib/coyote.rb

@@ -11,7 +11,7 @@ include Term::ANSIColor
 
 module Coyote
 	APP_NAME = "Coyote"
-	VERSION = "0.3.1"
+	VERSION = "0.3.2"
 	ROOT_PATH = Dir.pwd
 	CONFIG_PATH = File.expand_path(File.dirname(__FILE__) + "/../config")
 	CONFIG_FILENAME = "coyote.yaml"

data/lib/coyote/config_reader.rb

@@ -68,15 +68,16 @@ module Coyote
 					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
+					  
+            Coyote::Notification.new "Coyote configuration exists but has not been defined yet. Configure it in #{Coyote::CONFIG_FILENAME}\n", "failure"					  
 						exit(0)
 					end
 				rescue ArgumentError => e
-				  print "Could not parse YAML: #{e.message}\n".red
+          Coyote::Notification.new "Could not parse YAML: #{e.message}\n", "failure"
 				  exit
 				end
 			else
-				print "Could not find a Coyote configuration file in this directory. Use 'coyote generate' to create one.\n".red
+        Coyote::Notification.new "Could not find a Coyote configuration file in this directory. Use 'coyote generate' to create one.\n", "failure"
 				exit
 			end
 		end

data/lib/coyote/generator.rb

@@ -1,38 +1,39 @@
 module Coyote
   class Generator
-		
+
 		attr_accessor :options, :files_found
-		
+
 		def initialize(options)
 			@options = options
 			@files_found = []
 		end
-		
+
 		def generate
 			discover_files
 			if config_exists? && ! options[:force]
-				print "Coyote config already exists in this directory. Use --force to overwrite.\n".red				
+        Coyote::Notification.new "Coyote config already exists in this directory. Use --force to overwrite.\n", "failure"				
 			elsif (!config_exists?) || (config_exists? && options[:force])
 				copy_config
 			end
 		end
-		
+
 		def discover_files
 			js_files = File.join("**","*.js")
-			Dir.glob(js_files).each do |file|				
+			Dir.glob(js_files).each do |file|
 				@files_found.push file
-			end		
+			end
 		end
 
 		# check to see if coyote.yaml already exists in directory
 		def config_exists?
 			File.exists?(Coyote::CONFIG_FILENAME)
 		end
-		
+
 		# copy sample coyote.yaml to directory
 		def copy_config
-			print "\n----- Generating Coyote\n".bold
-			print "#{@files_found.length} JavaScript files discovered\n"
+      Coyote::Notification.new "\nGenerating Coyote\n"
+      Coyote::Notification.new "#{@files_found.length} JavaScript files discovered\n"
+
 			File.open("#{Coyote::CONFIG_PATH}/#{Coyote::CONFIG_FILENAME}") do |file|
 				output_file = File.open(Coyote::CONFIG_FILENAME, 'w+')
 				generated = file.read
@@ -41,8 +42,8 @@ module Coyote
 				end
 				output_file.write(generated)
 			end
-			print "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n".green
-			Coyote::Notification.new "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n"			
+			
+			Coyote::Notification.new "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n", "success"
 		end
   end
 end

data/lib/coyote/notification.rb

@@ -1,40 +1,62 @@
-require 'appscript'
-
 module Coyote
   class Notification
-	  include Appscript
 
-		attr_accessor :growl, :application, :icon, :default_notifications, :notifications
+		attr_accessor :growl, :application, :icon, :default_notifications, :notifications, :type, :message
+
+		def initialize(message, type = "message")
+      @message = message
+      @type = type
+
+			console_notify
 
-		def initialize(message)
-			@growl = app("GrowlHelperApp");
+			if Config::CONFIG['target_os'] =~ /darwin/i
+				require 'appscript'
+				@growl = Appscript.app("GrowlHelperApp");
 
-			if @growl.is_running?
-				register
-				notify message
+				if @growl.is_running?
+					growl_register
+					growl_notify
+				end
 			end
 		end
 
-		# register Coyote as an application with Growl
-    def register
-			@application = Coyote::APP_NAME
-			@icon = "#{Coyote::CONFIG_PATH}/#{Coyote::CONFIG_ICON}"
-	    @default_notifications = ["Coyote Success"]
-	    @notifications = ["Coyote Success", "Coyote Failure"]
-      @growl.register(:as_application => @application, :all_notifications => @notifications, :default_notifications => @default_notifications)
+
+    def console_notify
+    	case @type
+    	when "success"
+        print @message.green
+    	when "warning"
+        print @message.yellow
+      when "failure"
+        print @message.red
+    	else
+        print @message.white
+    	end
     end
 
+
 		# trigger a growl notification
-    def notify(message)
+		def growl_notify
 			options = { :title => @application,
-									:description => message,
+									:description => @message.gsub(/[\n]+/, ""),
 									:application_name => @application,
 									:image_from_location => @icon,
 									:sticky => false,
 									:priority => 0,
 									:with_name => notifications.first }
-      @growl.notify options
+      @growl.notify options			
+		end	
+
+
+		# register Coyote as an application with Growl
+    def growl_register
+			@application = Coyote::APP_NAME
+			@icon = "#{Coyote::CONFIG_PATH}/#{Coyote::CONFIG_ICON}"
+	    @default_notifications = ["Coyote Success"]
+	    @notifications = ["Coyote Success", "Coyote Failure"]
+      @growl.register(:as_application => @application, :all_notifications => @notifications, :default_notifications => @default_notifications)
     end
 
+
 	end
 end

data/lib/coyote/output.rb

@@ -19,7 +19,7 @@ module Coyote
         append(file)
       end
     end
-    
+
 		# open file, add contents to output
 		def append(filename)
 		  if File.exists?(filename) and ! @input_files.include?(filename)
@@ -31,21 +31,16 @@ module Coyote
 			  end
 			  print "+ Added #{filename}\n"
 			else
-			  print "! Error adding #{filename}\n"
+			  Coyote::Notification.new "! Error adding #{filename}\n", "failure"
 			end
 		end
 
 		# save output to file
 		def save
 			add_file_comments
-			
 			compress if @compress
-			
 			@output_file.write(@input)
-			print "Saved to #{@output_filename} \n\n".green
-			
-			Coyote::Notification.new "Successfully saved to #{@output_filename}"
-
+			Coyote::Notification.new "Successfully saved to #{@output_filename}\n\n", "success"
 			@output_file.close
 		end
 
@@ -60,20 +55,19 @@ module Coyote
 
 		# compress output
 		def compress
-			print "Compiling #{@output_filename}...\n".yellow
-			Coyote::Notification.new "Compiling #{@output_filename}..."
-						
+			Coyote::Notification.new "Compiling #{@output_filename}...\n", "warning"
+
 			compiler = ClosureCompiler.new.compile(@input)
 			if compiler.success?
 			  @input = compiler.compiled_code
 				add_file_comments
 			elsif compiler.file_too_big?
-			  print "Input code too big for API, creating uncompiled file\n".red
+			  Coyote::Notification.new "Input code too big for API, creating uncompiled file\n", "failure"
 			elsif compiler.errors
-			  print "Google closure API failed to compile, creating uncompiled file\n".red
-			  print "Errors: \n".red
-			  print "#{compiler.errors.to_s}\n\n".red
-			end  
+			  Coyote::Notification.new "Google closure API failed to compile, creating uncompiled file\n", "failure"
+			  Coyote::Notification.new "Errors: \n", "failure"
+			  Coyote::Notification.new "#{compiler.errors.to_s}\n\n", "failure"
+			end
 		end
 	end
 end

data/test/javascript/application.js

@@ -1,4 +1,3 @@
 var Application = Application || {
-	
-	
+
 };

metadata

@@ -1,69 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: coyote
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Imulus
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-22 00:00:00 -06:00
+date: 2011-05-27 00:00:00.000000000 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: term-ansicolor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152251500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rb-appscript
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152251500
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &2152248100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152248100
+- !ruby/object:Gem::Dependency
+  name: rb-appscript
+  requirement: &2152241840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152241840
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &2152231020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.5
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rb-appscript
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152231020
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &2152225520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *2152225520
+- !ruby/object:Gem::Dependency
+  name: rb-appscript
+  requirement: &2152220960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id004
-description: An intelligent command-line tool for combining and compressing JavaScript files.
+  prerelease: false
+  version_requirements: *2152220960
+description: An intelligent command-line tool for combining and compressing JavaScript
+  files.
 email: developer@imulus.com
-executables: 
+executables:
 - coyote
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - bin/coyote
 - lib/coyote.rb
@@ -77,7 +98,7 @@ extra_rdoc_files:
 - lib/coyote/generator.rb
 - lib/coyote/notification.rb
 - lib/coyote/output.rb
-files: 
+files:
 - Manifest
 - README.md
 - Rakefile
@@ -107,35 +128,35 @@ files:
 has_rdoc: true
 homepage: http://github.com/imulus/coyote
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Coyote
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: coyote
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-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.
+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.
 test_files: []
-