coyote 0.5.2 → 0.6.1

data/Manifest

@@ -8,7 +8,6 @@ coyote.gemspec
 lib/coyote.rb
 lib/coyote/closure_compiler.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
@@ -16,5 +15,44 @@ lib/coyote/fs_listeners/polling.rb
 lib/coyote/fs_listeners/windows.rb
 lib/coyote/generator.rb
 lib/coyote/notification.rb
-lib/coyote/output.rb
+lib/coyote/script.rb
+lib/coyote/scripts/coffeescript.rb
+lib/coyote/scripts/combine.rb
+lib/coyote/scripts/javascript.rb
+test/assets/javascripts/app/confio.coffee
+test/assets/javascripts/app/confio/interface.coffee
+test/assets/javascripts/app/confio/main.coffee
+test/assets/javascripts/lib/keystone/extensions.coffee
+test/assets/javascripts/lib/keystone/forms.coffee
+test/assets/javascripts/lib/keystone/utilities.coffee
+test/assets/stylesheets/app/_confio.scss
+test/assets/stylesheets/app/confio/_ie.scss
+test/assets/stylesheets/app/confio/_mobile.scss
+test/assets/stylesheets/app/confio/_print.scss
+test/assets/stylesheets/app/confio/_screen.scss
+test/assets/stylesheets/lib/_keystone.scss
+test/assets/stylesheets/lib/keystone/_css3.scss
+test/assets/stylesheets/lib/keystone/_scaffolding.scss
+test/assets/stylesheets/lib/keystone/_typography.scss
+test/assets/stylesheets/lib/keystone/_utilities.scss
+test/assets/stylesheets/lib/keystone/css3/_background-clip.scss
+test/assets/stylesheets/lib/keystone/css3/_border-radius.scss
+test/assets/stylesheets/lib/keystone/css3/_box-shadow.scss
+test/assets/stylesheets/lib/keystone/css3/_box-sizing.scss
+test/assets/stylesheets/lib/keystone/css3/_opacity.scss
+test/assets/stylesheets/lib/keystone/css3/_transition.scss
+test/assets/stylesheets/lib/keystone/scaffolding/_reset.scss
+test/assets/stylesheets/lib/keystone/scaffolding/_structure.scss
+test/assets/stylesheets/lib/keystone/typography/_links.scss
+test/assets/stylesheets/lib/keystone/typography/_lists.scss
+test/assets/stylesheets/lib/keystone/typography/_replacement.scss
+test/assets/stylesheets/lib/keystone/utilities/_alignment.scss
+test/assets/stylesheets/lib/keystone/utilities/_autoclear.scss
+test/assets/stylesheets/lib/keystone/utilities/_hoverbox.scss
+test/assets/stylesheets/styles.scss
+test/assets/stylesheets/vendor/_vendor.scss
+test/public/scripts/coyote.js
+test/public/scripts/jquery.js
+test/public/scripts/scripts.combine
+test/public/scripts/scripts.js
 Manifest

data/bin/coyote

@@ -18,16 +18,28 @@ OptionParser.new do |opts|
 end.parse!
 
 
+def config
+  config = Coyote::Configuration.new @options
+	ARGV.shift
+	
+	if ARGV.empty?
+  	config.load_from_yaml!
+	else
+    input, output = ARGV[0].split(':', 2)
+	  config.inputs = input
+	  config.output = output
+	end
+
+  return config
+end  
+  
+
 case ARGV.first
 when 'new'
   Coyote::generate
 when 'build'
-  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::usage

data/coyote.gemspec

@@ -2,21 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coyote}
-  s.version = "0.5.2"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Imulus}]
-  s.date = %q{2011-10-03}
+  s.authors = ["Imulus"]
+  s.date = %q{2011-12-13}
+  s.default_executable = %q{coyote}
   s.description = %q{An intelligent command-line tool for combining, compressing and compiling your JavaScript and CoffeeScript 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/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.executables = ["coyote"]
+  s.extra_rdoc_files = ["README.md", "bin/coyote", "lib/coyote.rb", "lib/coyote/closure_compiler.rb", "lib/coyote/configuration.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/notification.rb", "lib/coyote/script.rb", "lib/coyote/scripts/coffeescript.rb", "lib/coyote/scripts/combine.rb", "lib/coyote/scripts/javascript.rb"]
+  s.files = ["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/configuration.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/notification.rb", "lib/coyote/script.rb", "lib/coyote/scripts/coffeescript.rb", "lib/coyote/scripts/combine.rb", "lib/coyote/scripts/javascript.rb", "test/assets/javascripts/app/confio.coffee", "test/assets/javascripts/app/confio/interface.coffee", "test/assets/javascripts/app/confio/main.coffee", "test/assets/javascripts/lib/keystone/extensions.coffee", "test/assets/javascripts/lib/keystone/forms.coffee", "test/assets/javascripts/lib/keystone/utilities.coffee", "test/assets/stylesheets/app/_confio.scss", "test/assets/stylesheets/app/confio/_ie.scss", "test/assets/stylesheets/app/confio/_mobile.scss", "test/assets/stylesheets/app/confio/_print.scss", "test/assets/stylesheets/app/confio/_screen.scss", "test/assets/stylesheets/lib/_keystone.scss", "test/assets/stylesheets/lib/keystone/_css3.scss", "test/assets/stylesheets/lib/keystone/_scaffolding.scss", "test/assets/stylesheets/lib/keystone/_typography.scss", "test/assets/stylesheets/lib/keystone/_utilities.scss", "test/assets/stylesheets/lib/keystone/css3/_background-clip.scss", "test/assets/stylesheets/lib/keystone/css3/_border-radius.scss", "test/assets/stylesheets/lib/keystone/css3/_box-shadow.scss", "test/assets/stylesheets/lib/keystone/css3/_box-sizing.scss", "test/assets/stylesheets/lib/keystone/css3/_opacity.scss", "test/assets/stylesheets/lib/keystone/css3/_transition.scss", "test/assets/stylesheets/lib/keystone/scaffolding/_reset.scss", "test/assets/stylesheets/lib/keystone/scaffolding/_structure.scss", "test/assets/stylesheets/lib/keystone/typography/_links.scss", "test/assets/stylesheets/lib/keystone/typography/_lists.scss", "test/assets/stylesheets/lib/keystone/typography/_replacement.scss", "test/assets/stylesheets/lib/keystone/utilities/_alignment.scss", "test/assets/stylesheets/lib/keystone/utilities/_autoclear.scss", "test/assets/stylesheets/lib/keystone/utilities/_hoverbox.scss", "test/assets/stylesheets/styles.scss", "test/assets/stylesheets/vendor/_vendor.scss", "test/public/scripts/coyote.js", "test/public/scripts/jquery.js", "test/public/scripts/scripts.combine", "test/public/scripts/scripts.js", "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}]
+  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.8.5}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Coyote selectively concatenates your files, combining them into a single file with the option of running the output through the Google Closure Compiler before save. It can be used to observe your source files for changes and will recompile and save on the fly for easy development.}
 
   if s.respond_to? :specification_version then

data/lib/coyote.rb

@@ -1,53 +1,44 @@
 require 'yaml'
 require 'term/ansicolor'
-require 'coyote/coy_file'
+require 'coyote/script'
 require 'coyote/configuration'
 require 'coyote/fs_listener'
 require 'coyote/generator'
-require 'coyote/output'
 require 'coyote/closure_compiler'
 require 'coyote/notification'
 
 include Term::ANSIColor
 
 module Coyote
-	APP_NAME        = "Coyote"
-	VERSION         = "0.5.2"
-	ROOT_PATH       = Dir.pwd
-	CONFIG_PATH     = File.expand_path(File.dirname(__FILE__) + "/../config")
-	CONFIG_FILENAME = "coyote.yaml"
-	CONFIG_ICON     = "coyote-icon.png"
-  USAGE_FILENAME 	= "coyote-usage.txt"
+  APP_NAME        = "Coyote"
+  VERSION         = "0.6.1"
+  ROOT_PATH       = Dir.pwd
+  CONFIG_PATH     = File.expand_path(File.dirname(__FILE__) + "/../config")
+  CONFIG_FILENAME = "coyote.yaml"
+  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 = "//"
+  def self.generate
+    Coyote::Generator.new.generate
   end
 
-
-	def self.generate
-    Coyote::Generator.new.generate
-	end
+  
 
 
   def self.build(config)
-    output = Coyote::CoyFile.new config.output
+    if config.inputs == config.output
+      Coyote::Notification.new "Input path cannot be the same as output path\n\n", "Failure"    
+      exit 0
+    end
+    
+    output = Coyote::Script.select_and_init(config.output)
     output.empty!
 
-    config.inputs.each do |file|
-      input = Coyote::CoyFile.new file
-      input.compile! if input.coffee?
+    config.inputs.each do |file, input|
       output.append input.contents
       print "+ Added #{file}\n" if config.options['verbose']
     end
@@ -58,7 +49,7 @@ module Coyote
   end
 
 
-	def self.watch(config)
+  def self.watch(config)
     self.build config
 
     listener = Coyote::FSListener.select_and_init
@@ -77,12 +68,12 @@ module Coyote
     end
 
     listener.start
-	end
+  end
 
 
-	def self.usage
-	  file = File.open("#{Coyote::CONFIG_PATH}/#{Coyote::USAGE_FILENAME}", 'r')
-		puts file.read
-		file.close
-	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

@@ -1,19 +1,19 @@
 module Coyote
   class Configuration
 
-		attr_accessor :options, :output, :source
-		attr_reader :inputs
+    attr_accessor :options, :output, :source
+    attr_reader :inputs
 
-		def initialize(options = {})
-			@options = options
-		  @inputs = []
+    def initialize(options = {})
+      @options = options
+      @inputs = {}
       @output = Coyote::Defaults::OUTPUT
-		end
+    end
 
 
-		def should_compress?
+    def should_compress?
       @options['compress'] || false
-		end
+    end
 
 
     def inputs=(inputs)
@@ -21,69 +21,65 @@ module Coyote
     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 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?
+    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
+          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
+            exit(0)
+          end
+        rescue ArgumentError => e
           Coyote::Notification.new "Could not parse YAML: #{e.message}\n", "failure"
-				  exit
-				end
-			else
+          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
+        exit
+      end
+    end
+
+
+
+    private
+
+    def find_and_add_files(path)
+      Dir.glob(path).each do |file|
+        # Grab the absolute path of the file
+        # so we can ensure we don't have duplicate inputs
+        filename = File.absolute_path(file)
+
+        script = Coyote::Script.select_and_init(filename)
+        script.requires.each { |path| find_and_add_files(path) }
+
+        # Check to see if the file already exists in the inputs hash
+        # If not, add it with the full file path as the key
+        if @inputs[filename].nil?
+          @inputs[filename] = script
+        end
+      end
+    end
+
+
+
 
   end
-end
+end

data/lib/coyote/generator.rb

@@ -1,49 +1,49 @@
 module Coyote
   class Generator
-		attr_accessor :files_found
+    attr_accessor :files_found
 
-		def initialize
-			@files_found = []
-		end
+    def initialize
+      @files_found = []
+    end
 
-		def generate
-			if config_exists?
+    def generate
+      if config_exists?
         Coyote::Notification.new "This directory is already configured for Coyote.\n", "failure"
-			else
+      else
         discover_files
-				copy_config
-			end
-		end
+        copy_config
+      end
+    end
 
-		def discover_files
-			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
+    def discover_files
+      js_files = File.join("**","*.js")
+      cs_files = File.join("**","*.coffee")
+      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
 
-		def config_exists?
-			File.exists?(Coyote::CONFIG_FILENAME)
-		end
+    def config_exists?
+      File.exists?(Coyote::CONFIG_FILENAME)
+    end
 
-		def copy_config
+    def copy_config
       Coyote::Notification.new "\nGenerating Coyote\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+')
-				generated = file.read
-				@files_found.each do |file|
-				  generated += "  - #{file}\n"
-				end
-				output_file.write(generated)
-			end
+      File.open("#{Coyote::CONFIG_PATH}/#{Coyote::CONFIG_FILENAME}") do |file|
+        output_file = File.open(Coyote::CONFIG_FILENAME, 'w+')
+        generated = file.read
+        @files_found.each do |file|
+          generated += "  - #{file}\n"
+        end
+        output_file.write(generated)
+      end
 
-			Coyote::Notification.new "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n", "success"
-		end
+      Coyote::Notification.new "Coyote generated at #{Coyote::CONFIG_FILENAME}\n\n", "success"
+    end
   end
-end
+end