coyote 0.7.0 → 1.0.0.beta1

data/lib/coyote/assets/coffeescript.rb

@@ -0,0 +1,29 @@
+module Coyote
+ 	class CoffeeScript < Asset
+
+
+    def update!
+      super
+      compile!
+    end
+
+
+    protected
+
+    # Defines the regex pattern for scanning the contents of the
+    # file to look for require directives
+    def require_pattern
+      Regexp.new(/#=\s*require\s(.*)$/i)  # '#= require a/b/c.coffee' => 'a/b/c.coffee'
+    end
+
+
+    private
+
+    def compile!
+      @contents = `cat #{@absolute_path} | coffee -sc`
+    end
+
+
+
+  end
+end

data/lib/coyote/assets/javascript.rb

@@ -0,0 +1,4 @@
+module Coyote
+ 	class JavaScript < Asset
+  end
+end

data/lib/coyote/bundle.rb

@@ -0,0 +1,101 @@
+require 'coyote/closure_compiler'
+
+module Coyote
+  autoload :Asset, 'coyote/asset'
+
+  class Bundle
+
+    attr_reader :contents
+
+    def initialize(entry_point, output_path)
+      @output_path = output_path
+      @assets = {}
+      @contents = ""
+      add entry_point
+      update!
+    end
+
+
+    def files(absolute = false)
+      @assets.collect do |path, asset|
+        absolute ? asset.absolute_path : asset.relative_path
+      end.reverse
+    end
+
+
+    def add(path)
+      if File.directory? path
+        add_directory path
+      elsif File.exists? path
+        add_asset path
+      else
+        notify "Could not find #{path}", :failure
+      end
+    end
+
+
+    def update!(changed_files = [])
+      @contents = ""
+
+      unless changed_files.empty?
+        changed_files.each do |path|
+          @assets["#{Dir.pwd}/#{path}"].update!
+        end
+      end
+
+      files(true).each { |path| @contents += "#{@assets[path].contents} \n\n" }
+    end
+
+
+    def compress!
+      notify "#{Time.new.strftime("%I:%M:%S")}   Compressing bundle...", :warning
+      compiler = ClosureCompiler.new.compile(@contents)
+      if compiler.success?
+        @contents = compiler.compiled_code
+      elsif compiler.file_too_big?
+        notify "Input code too big for API, creating uncompressed file\n", :failure
+      elsif compiler.errors
+        notify "Google closure API failed to compile, creating uncompressed file\n", :failure
+        notify "Errors:", :failure
+        notify "#{compiler.errors.to_s}", :failure
+      end
+    end
+
+    def save
+      output = File.open @output_path, 'w+'
+      output.write @contents
+      output.close
+    end
+
+    def manifest
+      files.inject("") { |result, file| result + "\n + #{file}" }
+    end
+
+    private
+
+    def add_asset(path)
+      asset = Asset.select_and_init(path)
+
+      unless @assets[asset.absolute_path].nil?
+        @assets.delete(asset.absolute_path)
+      end
+
+      @assets[asset.absolute_path] = asset
+      add_dependencies(asset)
+    end
+
+
+    def add_directory(dir_path)
+      Dir.foreach(dir_path) do |path|
+        next if path == '.' or path == '..'
+        add "#{dir_path}/#{path}"
+      end
+    end
+
+
+    def add_dependencies(asset)
+      asset.dependencies.each { |path| add path }
+    end
+
+  end
+end

data/lib/coyote/closure_compiler.rb

@@ -1,12 +1,13 @@
 require 'net/http'
+require 'rexml/document'
 
 module Coyote
   class ClosureCompiler
-    
+
     def initialize
       @request = Net::HTTP::Post.new('/compile', 'Content-type' => 'application/x-www-form-urlencoded')
     end
-    
+
     def compile(content)
       @content = content
       params = {
@@ -21,22 +22,21 @@ module Coyote
         res = Net::HTTP.new('closure-compiler.appspot.com', 80).start {|http| http.request(@request) }
         case res
         when Net::HTTPSuccess
-          #puts res.body
           @doc = REXML::Document.new(res.body)
         end
-      rescue REXML::ParseException => msg       
+      rescue REXML::ParseException => msg
         print "Failed: #{msg}\n".red
       rescue
         #these should be caught by external checking
       end
-      
+
       self
     end
-    
+
     def success?
       @doc && @doc.root && @doc.root.elements['serverErrors'].nil?
     end
-    
+
     def errors
       unless @doc
         nil
@@ -44,11 +44,11 @@ module Coyote
         @doc.root.elements["serverErrors"]
       end
     end
-    
+
     def compiled_code
       @doc.root.elements['compiledCode'].text
     end
-    
+
     def file_too_big?
       @doc && @doc.root && @doc.root.elements["serverErrors/error[@code='8']"] != nil
     end

data/lib/coyote/configuration.rb

@@ -1,85 +1,31 @@
 module Coyote
   class Configuration
+    attr_accessor :input, :output, :options
 
-    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)
-      add_input inputs
-    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(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
-
+    def initialize 
+      @input = ""; @output = "";  @options = {}
+    end    
+  end
+end
 
 
+def coyote(method, &block)
+  config = Coyote::Configuration.new
+  yield config
+  
+  if config.input.empty?
+    notify "Coyote: Input filepath must be defined", :failure
+    exit 0
+  end
 
+  if config.output.empty?
+    notify "Coyote: Output filepath must be defined", :failure
+    exit 0
+  end
+  
+  if method == :watch
+    config.options[:watch] = true 
   end
+  
+  Coyote::run config.input, config.output, config.options
 end

data/lib/coyote/notifications.rb

@@ -0,0 +1,22 @@
+require 'term/ansicolor'
+include Term::ANSIColor
+
+module Coyote
+  module Notifications
+
+    def self.notify(msg, type = "message")
+      notify msg, type
+    end  
+
+    def notify(msg, type = :message)
+      msg = "#{msg}\n"
+      case type
+      when :success           ; print msg.green
+      when :warning           ; print msg.yellow
+      when :failure           ; print msg.red
+      else                    ; print msg.white
+      end
+    end
+    
+  end
+end

data/test/scripts/input1.js

@@ -0,0 +1 @@
+console.log('Input1.js');

data/test/scripts/input2.js

@@ -0,0 +1 @@
+console.log('Input2.js');

data/test/scripts/input3.js

@@ -0,0 +1 @@
+console.log('Input3.js');

data/test/scripts/input4.js

@@ -0,0 +1 @@
+console.log('Input4.js');

data/test/scripts/lib/input5.coffee

@@ -0,0 +1,3 @@
+#= require ../vendor/input8.coffee
+
+console.log 'Input5.coffee'

data/test/scripts/lib/input6.js

@@ -0,0 +1 @@
+console.log('Input6.js');

data/test/scripts/lib/keystone/input7.js

@@ -0,0 +1,2 @@
+console.log('Input7.js');
+console.log("Hello World");

data/test/scripts/vendor/input8.coffee

@@ -0,0 +1 @@
+console.log 'Input8.coffee'

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: coyote
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 1.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Imulus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 -07:00
+date: 2012-02-13 00:00:00.000000000 -07:00
 default_executable: coyote
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2153943140 !ruby/object:Gem::Requirement
+  requirement: &2152452780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153943140
-- !ruby/object:Gem::Dependency
-  name: rb-appscript
-  requirement: &2153942660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153942660
+  version_requirements: *2152452780
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153942180 !ruby/object:Gem::Requirement
+  requirement: &2152452300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +33,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153942180
+  version_requirements: *2152452300
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2153941700 !ruby/object:Gem::Requirement
+  requirement: &2152451820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,21 +44,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153941700
-- !ruby/object:Gem::Dependency
-  name: rb-appscript
-  requirement: &2153941220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: *2153941220
+  version_requirements: *2152451820
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153940740 !ruby/object:Gem::Requirement
+  requirement: &2152451340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +55,7 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2153940740
+  version_requirements: *2152451340
 description: An intelligent command-line tool for combining, compressing and compiling
   your JavaScript and CoffeeScript files.
 email: developer@imulus.com
@@ -88,6 +66,10 @@ extra_rdoc_files:
 - README.md
 - bin/coyote
 - lib/coyote.rb
+- lib/coyote/asset.rb
+- lib/coyote/assets/coffeescript.rb
+- lib/coyote/assets/javascript.rb
+- lib/coyote/bundle.rb
 - lib/coyote/closure_compiler.rb
 - lib/coyote/configuration.rb
 - lib/coyote/fs_listener.rb
@@ -95,21 +77,17 @@ extra_rdoc_files:
 - 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
+- lib/coyote/notifications.rb
 files:
 - README.md
 - Rakefile
 - bin/coyote
-- config/coyote-icon.png
-- config/coyote-usage.txt
-- config/coyote.yaml
 - coyote.gemspec
 - lib/coyote.rb
+- lib/coyote/asset.rb
+- lib/coyote/assets/coffeescript.rb
+- lib/coyote/assets/javascript.rb
+- lib/coyote/bundle.rb
 - lib/coyote/closure_compiler.rb
 - lib/coyote/configuration.rb
 - lib/coyote/fs_listener.rb
@@ -117,34 +95,15 @@ files:
 - 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/src/public/assets/javascripts/app/application/interface.coffee
-- test/src/public/assets/javascripts/app/application/main.coffee
-- test/src/public/assets/javascripts/app/application/pages/home.coffee
-- test/src/public/assets/javascripts/app/boot.coffee
-- test/src/public/assets/javascripts/lib/extensions.coffee
-- test/src/public/assets/javascripts/lib/imulus.coffee
-- test/src/public/assets/javascripts/lib/imulus/forms.coffee
-- test/src/public/assets/javascripts/lib/imulus/maps/infowindow.coffee
-- test/src/public/assets/javascripts/lib/imulus/maps/map.coffee
-- test/src/public/assets/javascripts/lib/imulus/maps/marker.coffee
-- test/src/public/assets/javascripts/lib/imulus/maps/point.coffee
-- test/src/public/assets/javascripts/lib/imulus/maps/results.coffee
-- test/src/public/assets/javascripts/lib/imulus/tables.coffee
-- test/src/public/assets/javascripts/lib/imulus/triggers.coffee
-- test/src/public/assets/javascripts/scripts.coffee
-- test/src/public/assets/javascripts/vendor/jquery.js
-- test/src/public/assets/javascripts/vendor/jquery/jquery.cookie.js
-- test/src/public/assets/javascripts/vendor/jquery/jquery.cycle.js
-- test/src/public/assets/javascripts/vendor/jquery/jquery.query.js
-- test/src/public/assets/javascripts/vendor/swfobject.js
-- test/src/public/scripts/scripts.combine
-- test/src/public/scripts/scripts.js
+- lib/coyote/notifications.rb
+- test/scripts/input1.js
+- test/scripts/input2.js
+- test/scripts/input3.js
+- test/scripts/input4.js
+- test/scripts/lib/input5.coffee
+- test/scripts/lib/input6.js
+- test/scripts/lib/keystone/input7.js
+- test/scripts/vendor/input8.coffee
 - Manifest
 has_rdoc: true
 homepage: http://github.com/imulus/coyote