bunch 0.0.1 → 0.0.2

data/bunch.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = "bunch"
   s.version     = Bunch::VERSION
   s.authors     = ["Ryan Fitzgerald"]
-  s.email       = ["rwfitzge@gmail.com"]
-  s.homepage    = "http://rynftz.gr"
-  s.summary     = %q{Simple, directory-structure-based asset bundling.}
-  s.description = %q{Simple, directory-structure-based asset bundling.}
+  s.email       = ["rfitz@academia.edu"]
+  s.homepage    = ""
+  s.summary     = %q{Directory-structure-based asset bundling.}
+  s.description = %q{Directory-structure-based asset bundling.}
 
   s.rubyforge_project = "bunch"
 

data/lib/bunch/cli.rb

@@ -4,9 +4,23 @@ module Bunch
       @input  = Pathname.new(input)
       @output = output ? Pathname.new(output) : nil
       @opts   = opts
+
+      if @opts[:server]
+        run_server
+      else
+        generate_files
+      end
     end
 
-    def process!
+    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
+    end
+
+    def generate_files
       tree = Bunch::Tree(@input.to_s)
 
       if @output
@@ -15,7 +29,7 @@ module Bunch
 
       if @opts[:all]
         if @output
-          write(@output.join("all.#{tree.target_extension}"), tree.contents)
+          write("all.#{tree.target_extension}", tree.contents)
         else
           puts tree.contents
         end
@@ -23,14 +37,14 @@ module Bunch
 
       if @opts[:individual]
         tree.children.each do |child|
-          write(@output.join("#{child.name}.#{child.target_extension}"), child.contents)
+          write("#{child.name}.#{child.target_extension}", child.contents)
         end
       end
     end
 
     private
       def write(fn, contents)
-        File.open(fn, 'w') { |f| f.write(contents) }
+        File.open(@output.join(fn), 'w') { |f| f.write(contents) }
       end
   end
 
@@ -39,37 +53,36 @@ module Bunch
       opts = Slop.parse! do
         banner 'Usage: bunch [options] INPUT_PATH [OUTPUT_PATH]'
 
+        on :s, :server, 'Instead of creating files, use WEBrick to serve files from INPUT_PATH'
         on :i, :individual, 'Create one output file for each file or directory in the input path (default)', :default => true
         on :a, :all, 'Create an all.[extension] file combining all inputs'
         on :h, :help, 'Show this message' do
-          display_help = true
+          puts self
+          exit
         end
       end
 
       if ARGV.count < 1
-        $stderr.puts "ERROR: Must give an input path."
         display_help = true
+        raise "Must give an input path."
       end
 
-      if ARGV.count < 2 && opts[:individual]
-        $stderr.puts "ERROR: Must give an output path unless --no-individual is provided."
+      if ARGV.count < 2 && opts[:individual] && !opts[:server]
         display_help = true
-      end
-
-      if display_help
-        $stderr.puts "\n#{opts}"
-        exit
+        raise "Must give an output path unless --no-individual or --server is provided."
       end
 
       input  = ARGV.shift
       output = ARGV.shift
 
-      CLI.new(input, output, opts).process!
-    rescue Exception => e
+      CLI.new(input, output, opts)
+    rescue => e
       if ENV['BUNCH_DEBUG']
         raise
       else
         $stderr.puts "ERROR: #{e.message}"
+        $stderr.puts "\n#{opts}" if display_help
+        exit 1
       end
     end
   end

data/lib/bunch/coffee_node.rb

@@ -4,7 +4,7 @@ module Bunch
       require 'coffee-script'
       @filename = fn
     rescue LoadError
-      $stderr.puts "ERROR: 'gem install coffee-script' to compile .coffee files."
+      raise "'gem install coffee-script' to compile .coffee files."
     end
 
     def contents

data/lib/bunch/directory_node.rb

@@ -45,7 +45,7 @@ module Bunch
     end
 
     def inspect
-      "#<Node @root=#{@root.inspect} @children=#{children.inspect}>"
+      "#<DirectoryNode @root=#{@root.inspect} @children=#{children.inspect}>"
     end
   end
 end

data/lib/bunch/file_node.rb

@@ -5,7 +5,7 @@ module Bunch
     def initialize(fn)
       @filename = fn
 
-      if fn =~ %r(\.([^/]*?)$)
+      if fn =~ %r(\.([^.]*)$)
         @name = File.basename($`)
         @target_extension = $1
       else

data/lib/bunch/rack.rb

@@ -17,7 +17,7 @@ module Bunch
       def generate(path)
         if File.exist?(path)
           Bunch::Tree(path).contents
-        elsif File.exist?(chopped_path = path.sub(%r(\.[^/]*?$), ''))
+        elsif File.exist?(chopped_path = path.sub(%r(\.[^.]*$), ''))
           Bunch::Tree(chopped_path).contents
         elsif File.basename(path).start_with?('all.')
           Bunch::Tree(File.dirname(path)).contents

data/lib/bunch/sass_node.rb

@@ -4,7 +4,7 @@ module Bunch
       require 'sass'
       @filename = fn
     rescue LoadError
-      $stderr.puts "ERROR: 'gem install sass' to compile .coffee files."
+      raise "'gem install sass' to compile .sass and .scss files."
     end
 
     def contents

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module Bunch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70324537243860 !ruby/object:Gem::Requirement
+  requirement: &70119922351140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324537243860
+  version_requirements: *70119922351140
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70324537243440 !ruby/object:Gem::Requirement
+  requirement: &70119922350720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324537243440
-description: Simple, directory-structure-based asset bundling.
+  version_requirements: *70119922350720
+description: Directory-structure-based asset bundling.
 email:
-- rwfitzge@gmail.com
+- rfitz@academia.edu
 executables:
 - bunch
 extensions: []
@@ -72,7 +72,7 @@ files:
 - lib/bunch/rack.rb
 - lib/bunch/sass_node.rb
 - lib/bunch/version.rb
-homepage: http://rynftz.gr
+homepage: ''
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -95,6 +95,6 @@ rubyforge_project: bunch
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Simple, directory-structure-based asset bundling.
+summary: Directory-structure-based asset bundling.
 test_files: []
 has_rdoc: