assette 0.1.5 → 0.1.6

data/Gemfile

@@ -2,10 +2,8 @@ source "http://rubygems.org"
 
 group :development do
   gem "rspec", "~> 2.4.0"
-  gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
   gem 'rack-test', :require => false
 end
 
@@ -13,7 +11,6 @@ gem "rack", '~> 1'
 gem "thor", '~> 0'
 gem "json", '>= 1.4'
 gem "sass", '>= 3.1'
-gem 'less'
 gem "mime-types", ">= 1.16", :require => 'mime/types'
 gem "git"
 gem "coffee-script", "~> 2"

data/Gemfile.lock

@@ -5,8 +5,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.1.1)
-    commonjs (0.2.0)
-      therubyracer (~> 0.9.9)
     diff-lcs (1.1.2)
     execjs (1.1.3)
       multi_json (~> 1.0)
@@ -16,17 +14,12 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.5.2)
-    less (2.0.8)
-      commonjs (~> 0.2.0)
-      therubyracer (~> 0.9.9)
-    libv8 (3.3.10.4)
     mime-types (1.16)
     multi_json (1.0.3)
     rack (1.3.0)
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
-    rcov (0.9.9)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -36,13 +29,10 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
     sass (3.1.2)
-    therubyracer (0.9.9)
-      libv8 (~> 3.3.10)
     thor (0.14.6)
     uglifier (1.1.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    yard (0.6.8)
 
 PLATFORMS
   ruby
@@ -53,13 +43,10 @@ DEPENDENCIES
   git
   jeweler (~> 1.5.2)
   json (>= 1.4)
-  less
   mime-types (>= 1.16)
   rack (~> 1)
   rack-test
-  rcov
   rspec (~> 2.4.0)
   sass (>= 3.1)
   thor (~> 0)
   uglifier
-  yard (~> 0.6.0)

data/Rakefile

@@ -23,14 +23,13 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Tal Atlas"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency "rack", '>= 1.4'
-  gem.add_runtime_dependency "thor", '~> 0'
-  gem.add_runtime_dependency "json", '>= 1.4'
-  gem.add_runtime_dependency "sass", '>= 3.1'
-  gem.add_runtime_dependency "less", '>= 2.0'
-  gem.add_runtime_dependency "coffee-script", '~> 2'
-  gem.add_runtime_dependency "uglifier"
-  gem.add_runtime_dependency "mime-types", ">= 1.16"
+  # gem.add_runtime_dependency "rack", '>= 1.4'
+  # gem.add_runtime_dependency "thor", '~> 0'
+  # gem.add_runtime_dependency "json", '>= 1.4'
+  # gem.add_runtime_dependency "sass", '>= 3.1'
+  # gem.add_runtime_dependency "coffee-script", '~> 2'
+  # gem.add_runtime_dependency "uglifier"
+  # gem.add_runtime_dependency "mime-types", ">= 1.16"
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -47,8 +46,8 @@ end
 
 task :default => :spec
 
-require 'yard'
-YARD::Rake::YardocTask.new
+# require 'yard'
+# YARD::Rake::YardocTask.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/assette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assette}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Tal Atlas}]
-  s.date = %q{2012-01-12}
+  s.date = %q{2012-01-17}
   s.description = %q{Renders all asset types (coffeescript/sass/scss) as equals}
   s.email = %q{me@tal.by}
   s.executables = [%q{assette}]
@@ -112,74 +112,41 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, ["~> 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1"])
-      s.add_runtime_dependency(%q<less>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
       s.add_runtime_dependency(%q<uglifier>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_runtime_dependency(%q<rack>, [">= 1.4"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0"])
-      s.add_runtime_dependency(%q<json>, [">= 1.4"])
-      s.add_runtime_dependency(%q<sass>, [">= 3.1"])
-      s.add_runtime_dependency(%q<less>, [">= 2.0"])
-      s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
-      s.add_runtime_dependency(%q<uglifier>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
     else
       s.add_dependency(%q<rack>, ["~> 1"])
       s.add_dependency(%q<thor>, ["~> 0"])
       s.add_dependency(%q<json>, [">= 1.4"])
       s.add_dependency(%q<sass>, [">= 3.1"])
-      s.add_dependency(%q<less>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<coffee-script>, ["~> 2"])
       s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 1.4"])
-      s.add_dependency(%q<thor>, ["~> 0"])
-      s.add_dependency(%q<json>, [">= 1.4"])
-      s.add_dependency(%q<sass>, [">= 3.1"])
-      s.add_dependency(%q<less>, [">= 2.0"])
-      s.add_dependency(%q<coffee-script>, ["~> 2"])
-      s.add_dependency(%q<uglifier>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 1.16"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1"])
     s.add_dependency(%q<thor>, ["~> 0"])
     s.add_dependency(%q<json>, [">= 1.4"])
     s.add_dependency(%q<sass>, [">= 3.1"])
-    s.add_dependency(%q<less>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<coffee-script>, ["~> 2"])
     s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 1.4"])
-    s.add_dependency(%q<thor>, ["~> 0"])
-    s.add_dependency(%q<json>, [">= 1.4"])
-    s.add_dependency(%q<sass>, [">= 3.1"])
-    s.add_dependency(%q<less>, [">= 2.0"])
-    s.add_dependency(%q<coffee-script>, ["~> 2"])
-    s.add_dependency(%q<uglifier>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 1.16"])
   end
 end
 

data/lib/assette/cli.rb

@@ -28,36 +28,36 @@ class Rack::Server
 end
 
 module Assette
-  
+
   class CLI < Thor
     ASSET_PREFIX_MATCHER = /^([a-f0-9]{9}|\d{6}_\d{6})\//
-    
-    
+
+
     include Thor::Actions
     DEFAULT_PID_FILE = '.assette_pid'
     class_option :'config-file', :desc => 'config file to use', :type => :string
     class_option :trace, :type => :boolean, :default => false
-    
+
     map "-v" => :version
-    
+
     desc 'version', 'displays current gem version'
     def version
       say Assette::VERSION
     end
-    
+
     desc 'server', 'Launches the assette server (should only be used for dev or behind a cdn)'
     method_option :port, :aliases => '-p', :type => :numeric
     method_option :'dont-daemonize', :aliases => '-D', :type => :boolean
     method_option :pid, :type => :string, :default => DEFAULT_PID_FILE, :description => 'file to store pid in'
     def server(cmd = nil)
       if cmd.nil? || cmd == 'start'
-        
+
         opts = {}
         opts[:Port] = options[:port] || 4747
         opts[:config] = File.join(File.dirname(__FILE__),'run.ru')
-      
+
         unless options['dont-daemonize']
-          
+
           if File.exist?(pid_file)
             pid = File.open(pid_file).read.chomp.to_i
             begin
@@ -67,7 +67,7 @@ module Assette
 
             end
           end
-          
+
           opts[:daemonize] = true
           opts[:pid] = pid_file
         else
@@ -77,7 +77,7 @@ module Assette
             "#{severity}: #{progname} - #{msg}\n"
           end
         end
-      
+
         say "Starting Assette server on port #{opts[:Port]}"
         ret = Rack::Server.start(opts)
       elsif cmd == 'stop'
@@ -90,47 +90,48 @@ module Assette
         end
       end
     end
-    
+
     desc "compile", "Compile all the assettes in a folder for static serving"
     method_option :minified, :type => :boolean, :default => false, :description => "only compile minified files"
     method_option :static_min, :type => :boolean, :default => false, :description => "only copy static files and minified files"
+    method_option :not_verbose, :type => :boolean, :default => false, :description => "don't ask whether to overwrite files or not"
     def compile
       files = []
       all_files = []
       Assette.config.compiling = true
-      
+
       unless File.exist?('assets')
         Dir.mkdir('assets')
       end
-      
+
       sha = Git.open('.').log.first.sha[0...8] rescue Time.now.strftime("%y%m%d_%H%M%S")
       Assette.config.sha = sha
-      
+
       Assette.config.file_paths.each do |path|
         all_files |= Dir[File.join(path,'**',"*")]
         Assette::Reader::ALL.keys.each do |extension|
           files |= Dir[File.join(path,'**',"*.#{extension}")]
         end
       end
-      
+
       not_compiled = all_files - files
-      
+
       files.delete_if {|f| f =~ /\/_/} # remove any mixins to speed up process
-      
+
       # files = files.collect {|f| Assette::File.open(f)}
-      
+
       container = if Assette.config.cache_method.to_s == 'path'
         File.join(Assette.config.build_target,sha)
       else
         Assette.config.build_target
       end
-      
+
       made_dirs = []
-      
+
       say "Compiling all asset files to #{container}"
 
       files_to_minify = []
-      
+
       files.each do |file_path|
         Assette::File.open(file_path) do |file|
 
@@ -139,15 +140,15 @@ module Assette
           else
             unless options.minified? || options.static_min?
               target_path = file.relative_target_path
-              
+
               Assette.config.file_paths.each do |p|
                 # target_path.gsub!(p,'')
               end
-              
+
               new_path = File.join(container,target_path)
-              
+
               Assette.logger.debug("Compiling file") {"#{file.path} -> #{new_path}"}
-              create_file(new_path, file.all_code)
+              create_file(new_path, file.all_code, :verbose => !options.not_verbose?)
             end
           end
         end
@@ -163,11 +164,11 @@ module Assette
             new_path = File.join(container,target_path).sub(/(\.[A-Za-z0-9]{2,10})$/,'.min\1')
 
             Assette.logger.debug("Compiling minified file") {"#{file.path} -> #{new_path}"}
-            create_file(new_path, file.all_code)
+            create_file(new_path, file.all_code, :verbose => !options.not_verbose?)
           end
         end
       end
-      
+
       say "\nCopying all non-compiled assets to #{container}"
       not_compiled.each do |file|
         next if File.directory?(file)
@@ -177,11 +178,11 @@ module Assette
         Assette.config.file_paths.each do |p|
           target_path.gsub!(Regexp.new(p+'/'),'')
         end
-        
+
         new_path = File.join(container,target_path)
-        
+
         Assette.logger.debug("Copying file") {"#{file} -> #{new_path}"}
-        copy_file(file,new_path)
+        copy_file(file,new_path, :verbose => !options.not_verbose?)
       end
 
 
@@ -191,31 +192,31 @@ module Assette
 
       Assette.config.after_compile.call(sha)
     end
-    
+
     def initialize(*)
       super
       get_services
     end
-    
+
   private
     def set_color *args
       @shell.set_color(*args)
     end
-    
+
     def get_services
       Assette.config(options['config-file'])
     end
-    
+
     def pid_file
       @pid ||= begin
         pid = options.pid
         unless pid =~ /^\//
           pid = File.expand_path(File.join(Dir.pwd,pid))
         end
-        
+
         pid
       end
     end
   end
-  
-end 
+
+end

data/lib/assette/readers/less.rb

@@ -1,15 +1,21 @@
-require 'less'
-
 class Assette::Reader::Less < Assette::Reader(:css)
 
   LESSC = !`which lessc`.empty?
 
+  begin
+    require 'less'
+  rescue LoadError => e
+    unless LESSC
+      warn("No version of less installed please run npm install -g less; or gem install less (not preferred)")
+    end
+  end
+
   def compile args={}
 
     if LESSC
       Assette.logger.info("less running") {"cd #{@file.dirname} && lessc < #{@file.filename}"}
       `cd #{@file.dirname} && lessc #{@file.filename}`
-    else
+    elsif defined?(Less)
       parser = Less::Parser.new({
         :paths => [File.expand_path(@file.dirname)]|Assette.config.file_paths,
         :filename => @file.filename
@@ -18,9 +24,13 @@ class Assette::Reader::Less < Assette::Reader(:css)
       tree = parser.parse(text)
 
       tree.to_css(options.merge(args))
+    else
+      warn("cannot compile because no less interpreter installed #{@file.path}")
+
+      text
     end
   end
-  
+
 private
 
   def options

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assette
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -77,20 +77,6 @@ dependencies:
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: less
-  prerelease: false
-  type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,9 +89,9 @@ dependencies:
   name: mime-types
   prerelease: false
   type: :runtime
-  requirement: *id006
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,9 +103,9 @@ dependencies:
   name: git
   prerelease: false
   type: :runtime
-  requirement: *id007
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,9 +117,9 @@ dependencies:
   name: coffee-script
   prerelease: false
   type: :runtime
-  requirement: *id008
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,9 +131,9 @@ dependencies:
   name: uglifier
   prerelease: false
   type: :runtime
-  requirement: *id009
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -161,25 +147,9 @@ dependencies:
   name: rspec
   prerelease: false
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  name: yard
-  prerelease: false
-  type: :development
-  requirement: *id011
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -193,9 +163,9 @@ dependencies:
   name: bundler
   prerelease: false
   type: :development
-  requirement: *id012
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -209,23 +179,9 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  prerelease: false
-  type: :development
-  requirement: *id014
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -237,124 +193,7 @@ dependencies:
   name: rack-test
   prerelease: false
   type: :development
-  requirement: *id015
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  name: rack
-  prerelease: false
-  type: :runtime
-  requirement: *id016
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: thor
-  prerelease: false
-  type: :runtime
-  requirement: *id017
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  name: json
-  prerelease: false
-  type: :runtime
-  requirement: *id018
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
-  name: sass
-  prerelease: false
-  type: :runtime
-  requirement: *id019
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  name: less
-  prerelease: false
-  type: :runtime
-  requirement: *id020
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id021 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  name: coffee-script
-  prerelease: false
-  type: :runtime
-  requirement: *id021
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id022 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: uglifier
-  prerelease: false
-  type: :runtime
-  requirement: *id022
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id023 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  name: mime-types
-  prerelease: false
-  type: :runtime
-  requirement: *id023
+  requirement: *id012
 description: Renders all asset types (coffeescript/sass/scss) as equals
 email: me@tal.by
 executables: