jbundle 0.0.12 → 0.1.0

data/Gemfile.lock

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

data/README.md

@@ -64,7 +64,7 @@ This will write the following files:
     'dist/1.6/file4.min.js'
     'dist/1.6/text.txt'
     
-Or you can build a single bundle/file dinamically (ie. for testing, or for serving and caching dinamically)
+Or you can build a single bundle/file dynamically (ie. for testing, or for serving and caching on first serve)
     
     JBundle.config_from_file './JFile'
     JBundle.build('foo.js').src
@@ -84,6 +84,29 @@ 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
+
+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
+      license 'license.txt'
+      file 'file3.js'
+      file 'file4.js'
+    end
+    
+That will produce:
+  
+    'dist/foo-1.6.1.js'
+    'dist/foo-1.6.1.min.js'
+    'dist/foo-1.6.js'
+    'dist/foo-1.6.min.js'
+    
+That works for single-file libraries too:
+
+    file 'jquery.lightbox.js' => 'jquery.lightbox-[:version].js'
+    
 ## Filters
 
 You can filter both minified and un-minified source and license content with the filter method

data/lib/jbundle.rb

@@ -43,7 +43,7 @@ module JBundle
       _dist = config.target_dir || './dist'
       clear_current_dist_dir(_dist)
       out = output.map do |compiler|
-        Writer.new(compiler, config.version, _dist).write
+        Writer.new(compiler, config, _dist).write
       end.flatten
       run_after_write unless config.after_write_blocks.empty?
       out

data/lib/jbundle/config.rb

@@ -9,21 +9,27 @@ module JBundle
       @files = []
       @filters = {:all => [], :min => [], :src => []}
       @after_write_blocks = []
+      @version_options = {:directory => true}
     end
     
-    def version(v = nil)
+    def versioned_directories?
+      @version_options[:directory]
+    end
+    
+    def version(v = nil, opts = {})
+      @version_options.merge! opts
       @version = JBundle::Version.new(v) if v
       @version
     end
     
     def src_dir(dir = nil)
       @src_dir = dir if dir
-      @src_dir
+      @src_dir || './'
     end
     
     def target_dir(dir = nil)
       @target_dir = dir if dir
-      @target_dir
+      @target_dir || './'
     end
     
     def bundle(name, &block)

data/lib/jbundle/version.rb

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

data/lib/jbundle/writer.rb

@@ -36,20 +36,39 @@ module JBundle
   end
   
   class Writer
+    # Interpolation tokens
+    TOKENS = {
+      :version  => '[:version]'
+    }
     
-    def initialize(compiler, version, target_dir)
-      @compiler, @version, @target_dir = compiler, version, target_dir
+    def initialize(compiler, config, target_dir)
+      @compiler, @config, @version, @target_dir = compiler, config, config.version, target_dir
       @out = []
     end
     
     def write
-      @version.releaseable.each do |version_dir|
-        versioned_target = ::File.join(@target_dir, version_dir)
-        if @compiler.buildable?
-          @out << write_file(@compiler.src, versioned_target, @compiler.dir, @compiler.name)
-          @out << write_file(@compiler.min, versioned_target, @compiler.dir, @compiler.min_name)
-        else
-          @out << copy_file(@compiler.src_path, versioned_target, @compiler.dir, @compiler.name)
+      release_targets do |versioned_target, version_string|
+        puts versioned_target.inspect
+        if @compiler.buildable? # versionable JS file
+          @out << write_file(
+            @compiler.src, 
+            versioned_target, 
+            @compiler.dir, 
+            interpolate(@compiler.name, TOKENS[:version] => version_string)
+          )
+          @out << write_file(
+            @compiler.min, 
+            versioned_target, 
+            @compiler.dir, 
+            interpolate(@compiler.min_name, TOKENS[:version] => version_string)
+          )
+        else # Other files (HTML, SWF, etc)
+          @out << copy_file(
+            @compiler.src_path, 
+            versioned_target, 
+            @compiler.dir, 
+            interpolate(@compiler.name, TOKENS[:version] => version_string)
+          )
         end
       end
       @out
@@ -57,6 +76,20 @@ module JBundle
     
     protected
     
+    def interpolate(string, tokens)
+      tokens.each do |key, value|
+        string = string.gsub(key, value)
+      end
+      string
+    end
+    
+    def release_targets(&block)
+      @version.releaseable.each do |version_string|
+        versioned_target = @config.versioned_directories? ? ::File.join(@target_dir, version_string) : @target_dir
+        yield versioned_target, version_string
+      end
+    end
+    
     def copy_file(src, target, subdir, name)
       sub = ::File.join([target, subdir].compact)
       FileUtils.mkdir_p sub

data/spec/jbundle_spec.rb

@@ -120,3 +120,49 @@ describe "JBundle" do
   end
   
 end
+
+describe 'JBundle', 'with no versioned directory and version in bundle name' do
+  
+  before do
+    JBundle.reset!.config do
+      version '0.0.1', :directory => nil
+      
+      src_dir ::File.dirname(__FILE__) + '/test_src'
+      target_dir DIST
+      
+      bundle 'foo-[:version].js' do
+        license 'license.txt'
+        file 'file3.js'
+      end
+      
+      file 'file3.js' => 'bar-[:version].js'
+    end
+    
+    @written_files = JBundle.write!
+  end
+  
+  it 'should create versioned files in dist dir, with no versioned directories' do
+    @written_files.should == [
+      DIST + '/foo-0.0.1.js',
+      DIST + '/foo-0.0.1.min.js',
+      DIST + '/foo-0.0.js',
+      DIST + '/foo-0.0.min.js',
+      DIST + '/bar-0.0.1.js',
+      DIST + '/bar-0.0.1.min.js',
+      DIST + '/bar-0.0.js',
+      DIST + '/bar-0.0.min.js'
+    ]
+  end
+  
+  it 'should create versioned files with no version directory' do
+    File.exist?(DIST + '/foo-0.0.1.js').should be_true
+    File.exist?(DIST + '/foo-0.0.1.min.js').should be_true
+    File.exist?(DIST + '/foo-0.0.js').should be_true
+    File.exist?(DIST + '/foo-0.0.min.js').should be_true
+    File.exist?(DIST + '/bar-0.0.1.js').should be_true
+    File.exist?(DIST + '/bar-0.0.1.min.js').should be_true
+    File.exist?(DIST + '/bar-0.0.js').should be_true
+    File.exist?(DIST + '/bar-0.0.min.js').should be_true
+  end
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: jbundle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ismael Celis