bunch 0.2.2 → 1.0.0pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: efebcfd36e823c3ec86e0442561e0dae5b269992
+  data.tar.gz: a5e89ce41f38db3a0b6b1bb0b93ac19f4778ad6c
+SHA512:
+  metadata.gz: 3f66c4238a91ea23234ff00fa0b3dadfaa6a304f6e5c144e10d3388cda68a45228edf3e280ed932a5f66804ae4760541d80fe4cc8c35986efca9ee1165a906f6
+  data.tar.gz: 37d71071cd267674130898cd31856e47d788e26ebf765ddba3e34c888fdd040d6bfd0b5122bb9c8ba04f8e0ba6ef5a59cc3967755d221d02abc8c18f2d375481

data/.gitignore

@@ -1,10 +1,19 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
 .sass-cache
-.yardoc
-doc/*
-*.sublime-workspace
-*.sublime-project
-*.DS_Store
+.bunch-cache

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
+
+gem 'rb-fsevent'
 
 # Specify your gem's dependencies in bunch.gemspec
 gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'minitest' do
+  watch(%r|^spec/(.*)_spec\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)  { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|) { "spec" }
+end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Academia.edu
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,18 +1,13 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
+Rake::TestTask.new do |t|
+  t.libs.concat %w(bunch spec)
+  t.pattern = "spec/**/*_spec.rb"
 end
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+task :pry do
+  system "pry -Ilib -rbunch"
 end
 
-task :default => :test
+task :default => [:test]

data/bin/bunch

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'bunch'
-require 'bunch/cli'
-
-Bunch::CLI.process!
+require "bunch"
+Bunch::CLI.run!(ARGV)

data/bunch.gemspec

@@ -1,31 +1,38 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bunch/version'
 
-Gem::Specification.new do |s|
-  s.name        = 'bunch'
-  s.version     = Bunch::VERSION
-  s.authors     = ['Ryan Fitzgerald']
-  s.email       = ['rfitz@academia.edu']
-  s.homepage    = ''
-  s.summary     = %q{Directory-structure-based asset bundling.}
-  s.description = %q{Directory-structure-based asset bundling.}
+Gem::Specification.new do |gem|
+  gem.name          = "bunch"
+  gem.version       = Bunch::VERSION
+  gem.authors       = ["Ryan Fitzgerald"]
+  gem.email         = ["rwfitzge@gmail.com"]
+  gem.summary       = %q{Directory-structure-based asset bundling.}
+  gem.description   = gem.summary
+  gem.homepage      = "https://github.com/academia-edu/bunch"
 
-  s.rubyforge_project = 'bunch'
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+  gem.add_dependency "mime-types", "~> 1.16"
 
-  s.add_runtime_dependency 'mime-types'
+  gem.add_development_dependency "yard",          "~> 0.8.3"
+  gem.add_development_dependency "minitest",      "~> 4.3.3"
+  gem.add_development_dependency "mocha",         "~> 0.13.1"
+  gem.add_development_dependency "rdiscount"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "guard"
+  gem.add_development_dependency "guard-minitest"
+  gem.add_development_dependency "pry"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "rack"
 
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'rdiscount'
-  s.add_development_dependency 'shoulda-context'
-  s.add_development_dependency 'mocha'
-
-  s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'sass'
-  s.add_development_dependency 'ejs'
+  gem.add_development_dependency "coffee-script"
+  gem.add_development_dependency "sass"
+  gem.add_development_dependency "ejs"
+  gem.add_development_dependency "ruby-jade"
+  gem.add_development_dependency "uglifier"
 end

data/lib/bunch.rb

@@ -1,94 +1,50 @@
-require 'fileutils'
-require 'optparse'
-require 'pathname'
-require 'yaml'
-
-require 'mime/types'
-
-begin
-  require 'v8'
-rescue LoadError
-  $stderr.puts "WARNING: 'gem install therubyracer' for much faster CoffeeScript compilation."
+# encoding: utf-8
+
+require "bunch/version"
+require "bunch/cli"
+require "bunch/combiner"
+require "bunch/compiler"
+require "bunch/content_hash"
+require "bunch/css_minifier"
+require "bunch/file"
+require "bunch/file_cache"
+require "bunch/file_tree"
+require "bunch/ignorer"
+require "bunch/js_minifier"
+require "bunch/middleware"
+require "bunch/server"
+require "bunch/simple_cache"
+require "bunch/pipeline"
+require "bunch/tree_merge"
+
+Dir.glob(File.expand_path("../bunch/compilers/*.rb", __FILE__)) do |compiler|
+  require compiler
 end
 
-require 'bunch/version'
-require 'bunch/rack'
-require 'bunch/middleware'
-require 'bunch/cache'
-
-require 'bunch/abstract_node'
-require 'bunch/directory_node'
-require 'bunch/file_node'
-require 'bunch/coffee_node'
-require 'bunch/sass_node'
-require 'bunch/null_node'
-require 'bunch/ejs_node'
-require 'bunch/jade_node'
-
 module Bunch
-  class CompileError < StandardError
-    def initialize(exception, filename)
-      @exception = exception
-      @filename = filename
-    end
-
-    def message
-      "#{@filename}: #{@exception.message}"
+  def self.load_default_config_if_possible
+    if ::File.exist?("config/bunch.rb")
+      load "config/bunch.rb"
     end
   end
-end
-
-class << Bunch
-  IGNORED_PATTERNS = []
 
-  def load_ignores(path='.')
-    fn = File.join(path, '.bunchignore')
-    if File.exist?(fn)
-      IGNORED_PATTERNS.concat File.readlines(fn).map { |f| Regexp.new(f.chomp) }
-      IGNORED_PATTERNS.uniq!
+  def self.load_config_files(config_files)
+    config_files.each do |config_file|
+      load config_file
     end
   end
 
-  def content_for(path, options = {})
-    tree_for(normalized_path(path), options).content
+  Pipeline.define :development do |config|
+    [Ignorer,
+     SimpleCache(Compiler),
+     Combiner]
   end
 
-  def tree_for(path, options)
-    node = case
-      when IGNORED_PATTERNS.any? { |p| File.basename(path) =~ p }
-        Bunch::NullNode.new(path)
-      when File.directory?(path)
-        Bunch::DirectoryNode.new(path)
-      when path =~ /\.coffee$/
-        Bunch::CoffeeNode.new(path)
-      when path =~ /\.s(a|c)ss$/
-        Bunch::SassNode.new(path)
-      when path =~ /\.ejs$/
-        Bunch::EJSNode.new(path)
-      when path =~ /\.jade/
-        Bunch::JadeNode.new(path)
-      else
-        Bunch::FileNode.new(path)
-      end
-    node.options = options
-    node
+  Pipeline.define :production do |config|
+    [Ignorer,
+     SimpleCache(Compiler),
+     Combiner,
+     FileCache(JsMinifier, config[:root]),
+     FileCache(CssMinifier, config[:root])]
   end
-
-  protected
-    def normalized_path(path)
-      case
-      when File.exist?(path)
-        path
-      when File.exist?(chopped_path = path.sub(%r(\.[^.]*$), ''))
-        chopped_path
-      when File.basename(path).start_with?('all.') && File.exist?(dir_path = File.dirname(path))
-        dir_path
-      when (path_w_different_extension = Dir["#{chopped_path}.*"].first)
-        path_w_different_extension
-      else
-        raise Errno::ENOENT, path.to_s
-      end
-    end
 end
-
-Bunch.load_ignores

data/lib/bunch/cli.rb

@@ -1,103 +1,69 @@
+# encoding: UTF-8
+
+require "optparse"
+
 module Bunch
   class CLI
-    def initialize(input, output, opts)
-      @input  = Pathname.new(input)
-      @output = output ? Pathname.new(output) : nil
-      @opts   = opts
-
-      if @opts[:server]
-        run_server
-      else
-        generate_files
-      end
+    def self.run!(args)
+      new(args).run!
     end
 
-    def run_server
-      require 'rack'
-      ::Rack::Handler::WEBrick.run(Bunch::Rack.new(@input), :Port => 3001)
-    rescue LoadError
-      $stderr.puts "ERROR: 'gem install rack' to run Bunch in server mode."
-      exit 1
+    def initialize(args, out = $stdout)
+      @args, @out = args, out
     end
 
-    def generate_files
-      Bunch.load_ignores(@input)
-      tree = Bunch.tree_for(@input.to_s, @opts.merge(:root => @input.to_s))
+    def run!
+      config = parse_options
 
-      if @output
-        FileUtils.mkdir_p(@output.to_s)
-      end
-
-      if @opts[:all]
-        if @output
-          tree.write_to_file(@output.join('all'))
-        else
-          puts tree.content
-        end
-      end
-
-      if @opts[:individual]
-        tree.children.each do |child|
-          child.write_to_dir(@output)
-        end
+      if config && config[:root] && config[:output_path]
+        pipeline = Pipeline.for_environment config
+        in_tree  = FileTree.from_path config[:root]
+        out_tree = pipeline.process in_tree
+        out_tree.write_to_path config[:output_path]
       end
     end
-  end
 
-  class << CLI
-    def process!
-      CLI.new(*parse_opts)
-    rescue => e
-      if ENV['BUNCH_DEBUG']
-        raise
-      else
-        $stderr.puts "ERROR: #{e.message}"
-        exit 1
-      end
-    end
+    private
 
-    def parse_opts
-      options = {:individual => true}
+    def parse_options
+      config = { environment: "production", config_files: [] }
 
       opts = OptionParser.new do |opts|
-        opts.banner = 'Usage: bunch [options] INPUT_PATH [OUTPUT_PATH]'
-
-        opts.on '-s', '--server', 'Instead of creating files, use WEBrick to serve files from INPUT_PATH.' do
-          options[:server] = true
-        end
-
-        opts.on '-i', '--[no-]individual', 'Create one output file for each file or directory in the input path (default).' do |i|
-          options[:individual] = i
-        end
+        opts.banner = "Usage: bunch [options] INPUT_PATH OUTPUT_PATH"
 
-        opts.on '-a', '--all', 'Create an all.[extension] file combining all inputs.' do
-          options[:all] = true
+        opts.on "-e", "--env [ENV]",
+            "Specify environment (default: \"production\")" do |env|
+          config[:environment] = env.strip
         end
 
-        opts.on '-r', '--recurse', 'Recursively generate one output file for every input file and directory.' do
-          options[:recurse] = true
+        opts.on "-c", "--config [FILE]",
+            "File to load (default: \"config/bunch.rb\")" do |f|
+          config[:config_files] << f.strip
         end
 
-        opts.on_tail '-h', '--help', 'Show this message.' do
-          puts opts
-          exit
+        opts.on_tail "-h", "--help", "Show this message" do
+          @out.puts opts
+          return
         end
       end
 
-      opts.parse!
+      opts.parse!(@args)
 
-      if ARGV.count < 1
-        raise "Must give an input path.\n\n#{opts}"
+      if @args.count != 2
+        raise "Must provide input and output paths!"
       end
 
-      if ARGV.count < 2 && options[:individual] && !options[:server]
-        raise "Must give an output path unless --no-individual or --server is provided."
+      if config[:config_files].any?
+        Bunch.load_config_files(config[:config_files])
+      else
+        Bunch.load_default_config_if_possible
       end
 
-      input  = ARGV.shift
-      output = ARGV.shift
-
-      [input, output, options]
+      config[:root], config[:output_path] = @args
+      config
+    rescue StandardError, LoadError => e
+      @out.puts "Error: #{e.message}\n\n"
+      @out.puts opts if opts
     end
   end
 end