jbundle 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundle (0.1.0)
+    jbundle (0.1.1)
       closure-compiler
       rack
       thor

data/README.md

@@ -84,13 +84,13 @@ You can bundle licenses in bundles. Licenses will not be minified even though th
     
 All defined filters will run on the src for all these cases.
 
-## Versiones file names, jQuery style
+## Versioned file names, jQuery style
 
 All of the examples above bundle to versioned directories in the "dist" directory. If you want jQuery-style file names, where there's no version directory and the version number is part of the file name, you can do this:
 
     version '1.6.1', :directory => false
     
-    bundle 'foo2-[:version].js' do
+    bundle 'foo.js' => 'foo2-[:version].js' do
       license 'license.txt'
       file 'file3.js'
       file 'file4.js'

data/lib/jbundle.rb

@@ -1,10 +1,10 @@
 require 'fileutils'
 require 'jbundle/config'
+require 'jbundle/bundle_utils'
 require 'jbundle/file'
 require 'jbundle/bundle'
 require 'jbundle/builder'
 require 'jbundle/writer'
-require 'jbundle/command_line'
 require 'jbundle/server'
 require 'jbundle/version'
 
@@ -76,3 +76,5 @@ module JBundle
   self.logger = lambda {|msg| puts "#{msg}\n"}
   
 end
+
+require 'jbundle/command_line'

data/lib/jbundle/bundle.rb

@@ -3,11 +3,12 @@ module JBundle
   class Bundle
     
     include Enumerable
+    include JBundle::BundleUtils
     
     attr_reader :name, :original_name, :licenses
 
     def initialize(name)
-      @name = @original_name = name.to_s
+      @original_name, @name = parse_name(name)
       @files = []
       @licenses = []
     end

data/lib/jbundle/bundle_utils.rb

@@ -0,0 +1,17 @@
+module JBundle
+  
+  module BundleUtils
+    
+    protected
+    
+    def parse_name(name)
+      if name.is_a?(Hash)
+        name.first
+      else
+        [name, name]
+      end
+    end
+    
+  end
+  
+end

data/lib/jbundle/command_line.rb

@@ -11,9 +11,10 @@ module JBundle
     map "-v" => :version
 
     desc "bundle", "Minify and bundle bundle declarations into dist directory"
+    method_option :jfile, :default => JBundle::JFILE, :aliases => "-j"
     def bundle
       begin
-        JBundle.config_from_file(JBundle::JFILE)
+        JBundle.config_from_file(options[:jfile])
         JBundle.write!
       rescue JBundle::NoJFileError => boom
         puts boom.message
@@ -22,12 +23,13 @@ module JBundle
     
     desc 'server', 'Start test rack server on port 5555'
     method_option :port, :default => "5555", :aliases => "-p"
+    method_option :jfile, :default => JBundle::JFILE, :aliases => "-j"
     def server
       require 'rack'
-      JBundle.config_from_file(JBundle::JFILE)
-      puts "Starting test server on http://localhost:#{options[:port]}. Available bundles:"
+      JBundle.config_from_file(options[:jfile])
+      say "Starting test server on http://localhost:#{options[:port]}. Available bundles:", :yellow
       JBundle.config.bundles_and_files.each do |f|
-        puts "- /#{f.name}"
+        say "- /#{f.name}", :green
       end
 
       handler = Rack::Handler.default
@@ -38,7 +40,7 @@ module JBundle
           downward = true
           handler.shutdown if handler.respond_to?(:shutdown)
           Process.wait rescue nil
-          puts 'Shutting down test server'
+          say 'Shutting down test server', :yellow
           exit!
         end
       end
@@ -47,7 +49,7 @@ module JBundle
     
     desc 'version', 'Print installed JBundle version'
     def version
-      puts JBundle::VERSION
+      say JBundle::VERSION, :green
     end
     
     def self.source_root

data/lib/jbundle/config.rb

@@ -32,13 +32,13 @@ module JBundle
       @target_dir || './'
     end
     
-    def bundle(name, &block)
-      name = name.to_sym
+    def bundle(names, &block)
+      name = (names.is_a?(Hash) ? names.keys.first : names).to_sym
       if !b = @bundles.detect{|a| a.name == name}
-        b = Bundle.new(name)
+        b = Bundle.new(names)
         @bundles << b
       end
-      b.instance_eval &block
+      b.instance_eval &block if block_given?
       b
     end
     

data/lib/jbundle/file.rb

@@ -3,6 +3,7 @@ module JBundle
   class File
     
     include Enumerable
+    include JBundle::BundleUtils
     
     attr_reader :name, :original_name
     
@@ -14,16 +15,6 @@ module JBundle
       yield original_name
     end
     
-    protected
-    
-    def parse_name(name)
-      if name.is_a?(Hash)
-        name.first
-      else
-        [name, name]
-      end
-    end
-    
   end
   
 end

data/lib/jbundle/version.rb

@@ -1,3 +1,3 @@
 module JBundle
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/jbundle/writer.rb

@@ -48,7 +48,6 @@ module JBundle
     
     def write
       release_targets do |versioned_target, version_string|
-        puts versioned_target.inspect
         if @compiler.buildable? # versionable JS file
           @out << write_file(
             @compiler.src, 

data/spec/jbundle_spec.rb

@@ -130,7 +130,7 @@ describe 'JBundle', 'with no versioned directory and version in bundle name' do
       src_dir ::File.dirname(__FILE__) + '/test_src'
       target_dir DIST
       
-      bundle 'foo-[:version].js' do
+      bundle 'foo.js' => 'foo-[:version].js' do
         license 'license.txt'
         file 'file3.js'
       end

metadata

@@ -2,7 +2,7 @@
 name: jbundle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ismael Celis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +01:00
+date: 2011-06-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - lib/jbundle.rb
 - lib/jbundle/builder.rb
 - lib/jbundle/bundle.rb
+- lib/jbundle/bundle_utils.rb
 - lib/jbundle/command_line.rb
 - lib/jbundle/config.rb
 - lib/jbundle/file.rb