coyote 0.4.2 → 0.5.0

data/lib/coyote/generator.rb

@@ -1,38 +1,38 @@
 module Coyote
   class Generator
+		attr_accessor :files_found
 
-		attr_accessor :options, :files_found
-
-		def initialize(options)
-			@options = options
+		def initialize
 			@files_found = []
 		end
 
 		def generate
-			discover_files
-			if config_exists? && ! options[:force]
-        Coyote::Notification.new "Coyote config already exists in this directory. Use --force to overwrite.\n", "failure"				
-			elsif (!config_exists?) || (config_exists? && options[:force])
+			if config_exists?
+        Coyote::Notification.new "This directory is already configured for Coyote.\n", "failure"
+			else
+        discover_files
 				copy_config
 			end
 		end
 
 		def discover_files
-			js_files = File.join("**","*.js")
+			js_files = File.join("**","*#{Coyote::JavaScript::EXTENSION}")
+      cs_files = File.join("**","*#{Coyote::CoffeeScript::EXTENSION}")
 			Dir.glob(js_files).each do |file|
 				@files_found.push file
 			end
+			Dir.glob(cs_files).each do |file|
+				@files_found.push file
+			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
       Coyote::Notification.new "\nGenerating Coyote\n"
-      Coyote::Notification.new "#{@files_found.length} JavaScript files discovered\n"
+      Coyote::Notification.new "#{@files_found.length} files discovered\n"
 
 			File.open("#{Coyote::CONFIG_PATH}/#{Coyote::CONFIG_FILENAME}") do |file|
 				output_file = File.open(Coyote::CONFIG_FILENAME, 'w+')
@@ -42,7 +42,7 @@ module Coyote
 				end
 				output_file.write(generated)
 			end
-			
+
 			Coyote::Notification.new "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n", "success"
 		end
   end

data/lib/coyote/output.rb

@@ -3,15 +3,14 @@ require  "rexml/document"
 module Coyote
   class Output
 
-    attr_accessor :input, :input_files, :output_file, :output_filename, :compress, :hooks
+    attr_accessor :input, :input_files, :output_file, :output_filename, :compress
 
-    def initialize(output_filename, compress = false, hooks)
+    def initialize(output_filename, compress = false)
       @output_filename = output_filename
       @output_file = File.open(@output_filename, 'w+')
       @input_files = []
       @input = ""
       @compress = compress
-      @hooks = Coyote::Hooks.new(hooks)
       print "\n----- Creating #{@output_filename}\n".bold
     end
 
@@ -37,14 +36,10 @@ module Coyote
 
     # save output to file
     def save
-      @hooks.invoke('before_compress')
       compress if @compress
-      @hooks.invoke('after_compress')
-      @hooks.invoke('before_save')
       @output_file.write(@input)
       @output_file.close
       Coyote::Notification.new "Successfully saved to #{@output_filename}\n", "success"
-      @hooks.invoke('after_save')
     end
 
     def add_file_comments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coyote
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-25 00:00:00.000000000Z
+date: 2011-08-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2169061080 !ruby/object:Gem::Requirement
+  requirement: &2168745980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2169061080
+  version_requirements: *2168745980
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2169060520 !ruby/object:Gem::Requirement
+  requirement: &2168745300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169060520
+  version_requirements: *2168745300
 - !ruby/object:Gem::Dependency
   name: rb-appscript
-  requirement: &2169059860 !ruby/object:Gem::Requirement
+  requirement: &2168744720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169059860
+  version_requirements: *2168744720
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2169059260 !ruby/object:Gem::Requirement
+  requirement: &2168744040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2169059260
+  version_requirements: *2168744040
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2169058660 !ruby/object:Gem::Requirement
+  requirement: &2168743420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2169058660
+  version_requirements: *2168743420
 - !ruby/object:Gem::Dependency
   name: rb-appscript
-  requirement: &2169058060 !ruby/object:Gem::Requirement
+  requirement: &2168742880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2169058060
+  version_requirements: *2168742880
 description: An intelligent command-line tool for combining and compressing JavaScript
   files.
 email: developer@imulus.com
@@ -88,52 +88,37 @@ extra_rdoc_files:
 - bin/coyote
 - 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
 files:
-- 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
-- coyote.gemspec
+- Manifest
 homepage: http://github.com/imulus/coyote
 licenses: []
 post_install_message: 

data/lib/coyote/config_reader.rb

@@ -1,92 +0,0 @@
-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
-		  @config['output']
-		end
-		
-		def should_compress?
-		  @config['compress'] || options[:compress]
-		end
-		
-		def hooks
-      @config['hooks']
-		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
-			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
-					  
-            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
-          Coyote::Notification.new "Could not parse YAML: #{e.message}\n", "failure"
-				  exit
-				end
-			else
-        Coyote::Notification.new "Could not find a Coyote configuration file in this directory. Use 'coyote generate' to create one.\n", "failure"
-				exit
-			end
-		end
-
-
-
-  end
-end

data/lib/coyote/hooks.rb

@@ -1,18 +0,0 @@
-module Coyote
-  class Hooks
-
-    def initialize(hooks)
-      @hooks = hooks || {}
-    end
-
-    def invoke(segment)
-      if @hooks[segment] and ! @hooks[segment].strip.empty?
-        command = @hooks[segment]
-        Coyote::Notification.new "\nInvoking hook '#{segment}' - '#{command}' \n"
-        output = `#{command}`
-        Coyote::Notification.new "#{output}\n" if output != ""
-      end
-    end
-
-  end
-end

data/test/coffeescript/coyote.yaml

@@ -1,9 +0,0 @@
-output: lib/animals.coffee
-input:
-  - src/animal.coffee
-  - src/horse.coffee
-  - src/snake.coffee
-  - src/init.coffee  
-hooks:
-  before_save: "echo great job"
-  after_save: "coffee -c lib/animals.coffee && rm lib/animals.coffee"

data/test/coffeescript/lib/animals.js

@@ -1,46 +0,0 @@
-(function() {
-  var Animal, Horse, Snake, sam, tom;
-  var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
-    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-    function ctor() { this.constructor = child; }
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor;
-    child.__super__ = parent.prototype;
-    return child;
-  };
-  Animal = (function() {
-    function Animal(name) {
-      this.name = name;
-    }
-    Animal.prototype.move = function(meters) {
-      return console.log(this.name + " moved " + meters + "m.");
-    };
-    return Animal;
-  })();
-  Horse = (function() {
-    __extends(Horse, Animal);
-    function Horse() {
-      Horse.__super__.constructor.apply(this, arguments);
-    }
-    Horse.prototype.move = function() {
-      console.log("Galloping...");
-      return Horse.__super__.move.call(this, 45);
-    };
-    return Horse;
-  })();
-  Snake = (function() {
-    __extends(Snake, Animal);
-    function Snake() {
-      Snake.__super__.constructor.apply(this, arguments);
-    }
-    Snake.prototype.move = function() {
-      console.log("Slithering...");
-      return Snake.__super__.move.call(this, 5);
-    };
-    return Snake;
-  })();
-  sam = new Snake("Sammy the Python");
-  tom = new Horse("Tommy the Palomino");
-  sam.move();
-  tom.move();
-}).call(this);

data/test/coffeescript/src/animal.coffee

@@ -1,5 +0,0 @@
-class Animal
-  constructor: (@name) ->
-
-  move: (meters) ->
-    console.log @name + " moved " + meters + "m."

data/test/coffeescript/src/horse.coffee

@@ -1,5 +0,0 @@
-class Horse extends Animal
-  move: ->
-    console.log "Galloping..."
-    super 45
-    

data/test/coffeescript/src/init.coffee

@@ -1,5 +0,0 @@
-sam = new Snake "Sammy the Python"
-tom = new Horse "Tommy the Palomino"
-
-sam.move()
-tom.move()

data/test/coffeescript/src/snake.coffee

@@ -1,4 +0,0 @@
-class Snake extends Animal
-  move: ->
-    console.log "Slithering..."
-    super 5

data/test/javascript/application.js

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