coyote 0.4.2 → 0.5.0

data/Manifest

@@ -1,34 +1,20 @@
-Manifest
 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/config_reader.rb
+lib/coyote/configuration.rb
+lib/coyote/coy_file.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/hooks.rb
 lib/coyote/notification.rb
 lib/coyote/output.rb
-test/coffeescript/coyote.yaml
-test/coffeescript/lib/animals.js
-test/coffeescript/src/animal.coffee
-test/coffeescript/src/horse.coffee
-test/coffeescript/src/init.coffee
-test/coffeescript/src/snake.coffee
-test/javascript/application.js
-test/javascript/application/controller.js
-test/javascript/application/interface.js
-test/javascript/coyote.yaml
-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
-test/javascript/scripts.js
+Manifest

data/bin/coyote

@@ -1,93 +1,34 @@
 #!/usr/bin/env ruby
+
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'fileutils'
 require 'rubygems'
 require 'optparse'
 require 'coyote'
 
+
 @options = {}
 OptionParser.new do |opts|
-  opts.on("-f", "--force", "Force") do |o|
-  	@options[:force] = o
+  opts.on("-c", "--compress", "Compress") do |option|
+  	@options['compress'] = option
   end
-
-  opts.on("-c", "--compress", "Compress") do |o|
-  	@options[:compress] = o
+  opts.on("-v", "--verbose", "Verbose") do |option|
+  	@options['verbose'] = option
   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?, reader.hooks)
-  output.add_files(reader.input_files)
-  output.save
-end
-
-def compress
-  ARGV.shift
-	if ! ARGV[0]
-    Coyote::Notification.new "Compress requires an input parameter\n", "failure"			
-		puts "Example: 'coyote compress app.js'"
-		exit
-	else
-	  input_output_file = ARGV[0]
-	  temp_file = "#{input_output_file}.tmp"
-
-    output = Coyote::Output.new(temp_file, true, false)
-    output.add_files([input_output_file])
-    output.save  
-
-    Coyote::Notification.new "Copying temporary file #{temp_file} to #{input_output_file}\n", "warning"    
-    File.open(temp_file, 'r') do |temp|
-      output_file = File.open(input_output_file, 'w+')    
-      output_file.write(temp.read)
-      output_file.close
-      Coyote::Notification.new "Successfully copied temporary file #{temp_file} to #{input_output_file}\n", "success"    
-    end
-    
-    File.delete(temp_file)        
-    Coyote::Notification.new "Deleted temporary file #{temp_file}\n", "success"        
-	end  
-end
-
 
 case ARGV.first
-when 'generate'
-	Coyote::Generator.new(@options).generate
+when 'new'
+  Coyote::generate
 when 'build'
-  coyote_the_sources
-when 'compress'
-  compress
+  config = Coyote::Configuration.new @options
+  config.load_from_yaml!
+  Coyote::build config
+when 'watch'
+  config = Coyote::Configuration.new @options
+  config.load_from_yaml!
+  Coyote::watch config
 else
-  
-  coyote_the_sources
-  
-  listener = Coyote::FSListener.select_and_init
-  
-  listener.on_change do |files|
-    if files.include?(Coyote::CONFIG_FILENAME)
-      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
-      #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
+  Coyote::usage
 end

data/config/coyote-usage.txt

@@ -0,0 +1,16 @@
+------------------------------------------
+Coyote - Command-line Concatenation
+http://github.com/imulus/coyote
+------------------------------------------
+
+Usage :  'coyote Action [Environment] [Options]'
+
+== Actions
+  build     - Execute the compiler
+  watch     - Starts the Coyote observe mechanism.
+  new       - Create a Coyote configuration in this directory
+
+== Options
+  -c | --compress  - Use Google Closure Compiler
+  -v | --verbose   - Verbose CLI logging
+

data/config/coyote.yaml

@@ -1,2 +1,2 @@
-output: scripts.js
+output: coyote.js
 input:

data/coyote.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Imulus}]
-  s.date = %q{2011-07-25}
+  s.date = %q{2011-08-21}
   s.description = %q{An intelligent command-line tool for combining and compressing JavaScript files.}
   s.email = %q{developer@imulus.com}
   s.executables = [%q{coyote}]
-  s.extra_rdoc_files = [%q{README.md}, %q{bin/coyote}, %q{lib/coyote.rb}, %q{lib/coyote/closure_compiler.rb}, %q{lib/coyote/config_reader.rb}, %q{lib/coyote/fs_listener.rb}, %q{lib/coyote/fs_listeners/darwin.rb}, %q{lib/coyote/fs_listeners/linux.rb}, %q{lib/coyote/fs_listeners/polling.rb}, %q{lib/coyote/fs_listeners/windows.rb}, %q{lib/coyote/generator.rb}, %q{lib/coyote/hooks.rb}, %q{lib/coyote/notification.rb}, %q{lib/coyote/output.rb}]
-  s.files = [%q{Manifest}, %q{README.md}, %q{Rakefile}, %q{bin/coyote}, %q{config/coyote-icon.png}, %q{config/coyote.yaml}, %q{lib/coyote.rb}, %q{lib/coyote/closure_compiler.rb}, %q{lib/coyote/config_reader.rb}, %q{lib/coyote/fs_listener.rb}, %q{lib/coyote/fs_listeners/darwin.rb}, %q{lib/coyote/fs_listeners/linux.rb}, %q{lib/coyote/fs_listeners/polling.rb}, %q{lib/coyote/fs_listeners/windows.rb}, %q{lib/coyote/generator.rb}, %q{lib/coyote/hooks.rb}, %q{lib/coyote/notification.rb}, %q{lib/coyote/output.rb}, %q{test/coffeescript/coyote.yaml}, %q{test/coffeescript/lib/animals.js}, %q{test/coffeescript/src/animal.coffee}, %q{test/coffeescript/src/horse.coffee}, %q{test/coffeescript/src/init.coffee}, %q{test/coffeescript/src/snake.coffee}, %q{test/javascript/application.js}, %q{test/javascript/application/controller.js}, %q{test/javascript/application/interface.js}, %q{test/javascript/coyote.yaml}, %q{test/javascript/init.js}, %q{test/javascript/jquery/jquery.js}, %q{test/javascript/jquery/plugins/jquery.cookie.js}, %q{test/javascript/jquery/plugins/jquery.cycle.all.min.js}, %q{test/javascript/jquery/plugins/jquery.query.js}, %q{test/javascript/scripts.js}, %q{coyote.gemspec}]
+  s.extra_rdoc_files = [%q{README.md}, %q{bin/coyote}, %q{lib/coyote.rb}, %q{lib/coyote/closure_compiler.rb}, %q{lib/coyote/configuration.rb}, %q{lib/coyote/coy_file.rb}, %q{lib/coyote/fs_listener.rb}, %q{lib/coyote/fs_listeners/darwin.rb}, %q{lib/coyote/fs_listeners/linux.rb}, %q{lib/coyote/fs_listeners/polling.rb}, %q{lib/coyote/fs_listeners/windows.rb}, %q{lib/coyote/generator.rb}, %q{lib/coyote/notification.rb}, %q{lib/coyote/output.rb}]
+  s.files = [%q{README.md}, %q{Rakefile}, %q{bin/coyote}, %q{config/coyote-icon.png}, %q{config/coyote-usage.txt}, %q{config/coyote.yaml}, %q{coyote.gemspec}, %q{lib/coyote.rb}, %q{lib/coyote/closure_compiler.rb}, %q{lib/coyote/configuration.rb}, %q{lib/coyote/coy_file.rb}, %q{lib/coyote/fs_listener.rb}, %q{lib/coyote/fs_listeners/darwin.rb}, %q{lib/coyote/fs_listeners/linux.rb}, %q{lib/coyote/fs_listeners/polling.rb}, %q{lib/coyote/fs_listeners/windows.rb}, %q{lib/coyote/generator.rb}, %q{lib/coyote/notification.rb}, %q{lib/coyote/output.rb}, %q{Manifest}]
   s.homepage = %q{http://github.com/imulus/coyote}
   s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Coyote}, %q{--main}, %q{README.md}]
   s.require_paths = [%q{lib}]

data/lib/coyote.rb

@@ -1,20 +1,88 @@
 require 'yaml'
 require 'term/ansicolor'
-require 'coyote/config_reader'
+require 'coyote/coy_file'
+require 'coyote/configuration'
 require 'coyote/fs_listener'
 require 'coyote/generator'
 require 'coyote/output'
 require 'coyote/closure_compiler'
 require 'coyote/notification'
-require 'coyote/hooks'
 
 include Term::ANSIColor
 
 module Coyote
-	APP_NAME = "Coyote"
-	VERSION = "0.4.2"
-	ROOT_PATH = Dir.pwd
-	CONFIG_PATH = File.expand_path(File.dirname(__FILE__) + "/../config")
+	APP_NAME        = "Coyote"
+	VERSION         = "0.5.0"
+	ROOT_PATH       = Dir.pwd
+	CONFIG_PATH     = File.expand_path(File.dirname(__FILE__) + "/../config")
 	CONFIG_FILENAME = "coyote.yaml"
-	CONFIG_ICON = "coyote-icon.png"
+	CONFIG_ICON     = "coyote-icon.png"
+  USAGE_FILENAME 	= "coyote-usage.txt"
+
+  module Defaults
+    OUTPUT = "coyote.js"
+  end
+
+
+  module CoffeeScript
+    EXTENSION = ".coffee"
+    COMMENT = "#"
+  end
+
+
+  module JavaScript
+    EXTENSION = ".js"
+    COMMENT = "//"
+  end
+
+
+	def self.generate
+    Coyote::Generator.new.generate
+	end
+
+
+  def self.build(config)
+    output = Coyote::CoyFile.new config.output
+    output.empty!
+
+    config.inputs.each do |file|
+      input = Coyote::CoyFile.new file
+      input.compile! if input.coffee?
+      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"
+  end
+
+
+	def self.watch(config)
+    self.build config
+
+    listener = Coyote::FSListener.select_and_init
+
+    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 = config.inputs & files
+        if changed_watched_files.length > 0
+          self.build config
+        end
+      end
+    end
+
+    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/configuration.rb

@@ -0,0 +1,89 @@
+module Coyote
+  class Configuration
+
+		attr_accessor :options, :output, :source
+		attr_reader :inputs
+
+		def initialize(options = {})
+			@options = options
+		  @inputs = []
+      @output = Coyote::Defaults::OUTPUT
+		end
+
+
+		def should_compress?
+      @options['compress'] || false
+		end
+
+
+    def inputs=(inputs)
+      inputs.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 @output != input
+				find_and_add_files input
+			end
+		end
+
+
+		def load_from_yaml!(yaml_file = Coyote::CONFIG_FILENAME)
+			if File.exists?(yaml_file)
+				begin
+					config = YAML.load(File.open(yaml_file))
+					if config.class == Hash && ! config.empty?
+            self.inputs = config['input']
+            @output = config['output']
+            if config['options'] && config['options'].class == Hash
+              @options = config['options'].merge(@options)
+            end
+            @source = yaml_file
+					else
+            Coyote::Notification.new "Coyote configuration exists but has not been defined yet. Configure it in #{yaml_file}\n", "failure"
+						exit(0)
+					end
+				rescue ArgumentError => e
+          Coyote::Notification.new "Could not parse YAML: #{e.message}\n", "failure"
+				  exit
+				end
+			else
+        Coyote::Notification.new "Could not find a Coyote configuration file #{yaml_file}. Use 'coyote new' to create one.\n", "failure"
+				exit
+			end
+		end
+
+
+
+		private
+
+		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}"
+				end
+				if ! @inputs.include? file
+					@inputs.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 { |match| required.push match.last.strip }
+			end
+			return required
+		end
+
+  end
+end

data/lib/coyote/coy_file.rb

@@ -0,0 +1,64 @@
+module Coyote
+  class CoyFile
+		attr_accessor :filename, :contents
+
+		def initialize(filename, contents = "")
+		  @filename = filename
+      if contents.empty? and File.exists? @filename
+        @contents = File.open(@filename, 'r').read
+		  else
+		    @contents = contents
+		  end
+		end
+
+		def append(content)
+		  @contents += "#{content}\n\n"
+		end
+
+		def prepend(content)
+		  @contents = "#{content}\n\n" + @contents
+		end
+
+    def type
+      File.extname @filename
+    end
+
+    def coffee?
+      type == Coyote::CoffeeScript::EXTENSION
+    end
+
+    def javascript?
+      type == Coyote::JavaScript::EXTENSION
+    end
+
+    def empty!
+      @contents = ""
+    end
+
+		def compress!
+      Coyote::Notification.new "Compiling #{@filename}...\n", "warning"
+      compiler = ClosureCompiler.new.compile(@contents)
+      if compiler.success?
+        @contents = compiler.compiled_code
+      elsif compiler.file_too_big?
+        Coyote::Notification.new "Input code too big for API, creating uncompiled file\n", "failure"
+      elsif compiler.errors
+        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
+
+    def compile!
+      @contents = `cat #{@filename} | coffee -scb`
+    end
+
+		def save
+      output = File.open @filename, 'w+'
+      output.write @contents
+      output.close
+		end
+	end
+end
+
+