coyote 1.0.1 → 1.0.2

data/Manifest

@@ -7,14 +7,15 @@ lib/coyote/asset.rb
 lib/coyote/assets/coffeescript.rb
 lib/coyote/assets/javascript.rb
 lib/coyote/bundle.rb
+lib/coyote/cli.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/notifications.rb
+lib/coyote/rake.rb
 test/scripts/input1.js
 test/scripts/input2.js
 test/scripts/input3.js

data/bin/coyote

@@ -2,27 +2,4 @@
 
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'rubygems'
-require 'fileutils'
-require 'optparse'
-require 'coyote'
-
-
-options = {}
-OptionParser.new do |opts|
-  Coyote::options.each do |name|
-    opts.on("-#{name[0]}", "--#{name}", "#{name.capitalize}") { |o| options[name.to_sym] = o }
-  end
-end.parse!
-
-if options[:version]
-  puts "coyote #{Coyote::VERSION}"
-  exit 0
-end
-
-input, output = ARGV[0].split(':', 2)
-
-coyote :build do |config|
-  config.input    = input
-  config.output   = output
-  config.options  = options
-end
+require 'coyote/cli'

data/coyote.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coyote"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Imulus"]
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.description = "An intelligent command-line tool for combining, compressing and compiling your JavaScript and CoffeeScript files."
   s.email = "developer@imulus.com"
   s.executables = ["coyote"]
-  s.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", "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/notifications.rb"]
-  s.files = ["README.md", "Rakefile", "bin/coyote", "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", "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/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"]
+  s.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/cli.rb", "lib/coyote/closure_compiler.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/notifications.rb", "lib/coyote/rake.rb"]
+  s.files = ["README.md", "Rakefile", "bin/coyote", "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/cli.rb", "lib/coyote/closure_compiler.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/notifications.rb", "lib/coyote/rake.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"]
   s.homepage = "http://github.com/imulus/coyote"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Coyote", "--main", "README.md"]
   s.require_paths = ["lib"]

data/lib/coyote.rb

@@ -1,13 +1,12 @@
-require 'coyote/configuration'
+require 'fileutils'
 require 'coyote/bundle'
 require 'coyote/fs_listener'
 require 'coyote/notifications'
 include Coyote::Notifications
 
-
 module Coyote
   
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   
   def self.run(input_path, output_path, options = {})
     @@input_path  = input_path

data/lib/coyote/cli.rb

@@ -0,0 +1,18 @@
+require 'coyote'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  Coyote::options.each do |name|
+    opts.on("-#{name[0]}", "--#{name}", "#{name.capitalize}") { |o| options[name.to_sym] = o }
+  end
+end.parse!
+
+if options[:version]
+  puts "coyote #{Coyote::VERSION}"
+  exit 0
+end
+
+input, output = ARGV[0].split(':', 2)
+
+Coyote::run(input, output, options)

data/lib/coyote/rake.rb

@@ -0,0 +1,41 @@
+require 'coyote'
+
+def coyote(task_name, *args, &block)
+
+  args ||= []
+
+  args.insert 0, task_name
+  
+  # Create an anonymous class with input, output and options accessors
+  config = Struct.new(:input, :output, :options).new
+
+  # Start off with options as an empty hash
+  config.options = {}
+
+  # Give them the config struct to configure in the block
+  yield config
+    
+  # Make sure we've got an input
+  if config.input.empty?
+    notify "Coyote: Input filepath must be defined", :failure
+    exit 0
+  end
+
+  # Make sure we've got an output  
+  if config.output.empty?
+    notify "Coyote: Output filepath must be defined", :failure
+    exit 0
+  end
+
+  # If they call the task 'watch', then let's set the watch option for them
+  if task_name == :watch
+    config.options[:watch] = true
+  end
+  
+  # Pass the runner along to Rake as a proc
+  body = proc { 
+    Coyote::run(config.input, config.output, config.options) 
+  }
+  
+  Rake::Task.define_task(*args, &body)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coyote
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2168527360 !ruby/object:Gem::Requirement
+  requirement: &2165621740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168527360
+  version_requirements: *2165621740
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2168524180 !ruby/object:Gem::Requirement
+  requirement: &2165621140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2168524180
+  version_requirements: *2165621140
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2168522140 !ruby/object:Gem::Requirement
+  requirement: &2165620600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2168522140
+  version_requirements: *2165620600
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2168520400 !ruby/object:Gem::Requirement
+  requirement: &2165620040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2168520400
+  version_requirements: *2165620040
 description: An intelligent command-line tool for combining, compressing and compiling
   your JavaScript and CoffeeScript files.
 email: developer@imulus.com
@@ -69,14 +69,15 @@ extra_rdoc_files:
 - lib/coyote/assets/coffeescript.rb
 - lib/coyote/assets/javascript.rb
 - lib/coyote/bundle.rb
+- lib/coyote/cli.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/notifications.rb
+- lib/coyote/rake.rb
 files:
 - README.md
 - Rakefile
@@ -87,14 +88,15 @@ files:
 - lib/coyote/assets/coffeescript.rb
 - lib/coyote/assets/javascript.rb
 - lib/coyote/bundle.rb
+- lib/coyote/cli.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/notifications.rb
+- lib/coyote/rake.rb
 - test/scripts/input1.js
 - test/scripts/input2.js
 - test/scripts/input3.js

data/lib/coyote/configuration.rb

@@ -1,31 +0,0 @@
-module Coyote
-  class Configuration
-    attr_accessor :input, :output, :options
-
-    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