jbundle 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundle (0.0.5)
+    jbundle (0.0.7)
       closure-compiler
 
 GEM

data/README.md

@@ -114,6 +114,16 @@ You can run arbitrary code after writing all versioned files by registering an a
     end
     
 config.version.releaseble returns an array with with all created versions (ie. ['1.6.1', '1.6'] or just ['1.6.1-pre'] for prereleases).
+
+Files in subdirectories in the src directory will keep the local directory tree, so
+
+    file 'foo/text.txt'
+    
+Ends up as ./dist/1.6/foo/text.txt and ./dist/1.6.1/foo/text.txt
+
+You can also copy to a different file name in the target directory using hash notation
+
+    file 'foo/text.txt' => 'bar.txt'
     
 ## Pre-releases
 

data/jbundle.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Ismael Celis']
   s.email       = ['ismaelct@gmail.com']
   s.homepage    = "http://github.com/ismasan/jbundle"
-  s.summary     = "Writes versioned, bundled and minified javascript files and dependencies"
-  s.description = "Good for releasing javascript libraries composed of many files. Writes files apt for deploying to CDNs."
+  s.description     = "Writes versioned, bundled and minified javascript files and dependencies"
+  s.summary = "Good for releasing javascript libraries composed of many files. Writes files apt for deploying to CDNs."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "jbundle"

data/lib/jbundle/builder.rb

@@ -6,10 +6,11 @@ module JBundle
     
     BUILDABLE_FILES = ['.js']
     
-    attr_reader :name, :src_dir
+    attr_reader :name, :src_dir, :dir
     
     def initialize(name, file_list, src_dir = 'src')
-      @name, @file_list, @src_dir = name.to_s, file_list, src_dir
+      @file_list, @src_dir = file_list, src_dir
+      @name, @dir = parse_name(name)
     end
     
     def buildable?
@@ -18,7 +19,7 @@ module JBundle
     
     # This only makes sense for one-file objects
     def src_path
-      ::File.join(@src_dir, name)
+      ::File.join(@src_dir, @file_list.original_name)
     end
     
     def src
@@ -58,6 +59,12 @@ module JBundle
       end
     end
     
+    def parse_name(name)
+      n = ::File.basename(name)
+      d = ::File.dirname(name) if name =~ /\//
+      [n,d]
+    end
+    
   end
   
   

data/lib/jbundle/bundle.rb

@@ -4,10 +4,10 @@ module JBundle
     
     include Enumerable
     
-    attr_reader :name, :licenses
+    attr_reader :name, :original_name, :licenses
 
     def initialize(name)
-      @name = name.to_s
+      @name = @original_name = name.to_s
       @files = []
       @licenses = []
     end

data/lib/jbundle/file.rb

@@ -4,14 +4,24 @@ module JBundle
     
     include Enumerable
     
-    attr_reader :name
+    attr_reader :name, :original_name
     
     def initialize(name)
-      @name = name.to_s
+      @original_name, @name = parse_name(name)
     end
     
     def each(&block)
-      yield name
+      yield original_name
+    end
+    
+    protected
+    
+    def parse_name(name)
+      if name.is_a?(Hash)
+        name.first
+      else
+        [name, name]
+      end
     end
     
   end

data/lib/jbundle/version.rb

@@ -1,3 +1,3 @@
 module JBundle
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/jbundle/writer.rb

@@ -44,11 +44,12 @@ module JBundle
     
     def write
       @version.releaseable.each do |version_dir|
+        versioned_target = ::File.join(@target_dir, version_dir)
         if @compiler.buildable?
-          @out << write_file(@compiler.src, ::File.join(@target_dir, version_dir), @compiler.name)
-          @out << write_file(@compiler.min, ::File.join(@target_dir, version_dir), @compiler.min_name)
+          @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, ::File.join(@target_dir, version_dir, @compiler.name))
+          @out << copy_file(@compiler.src_path, versioned_target, @compiler.dir, @compiler.name)
         end
       end
       @out
@@ -56,15 +57,19 @@ module JBundle
     
     protected
     
-    def copy_file(src, target)
+    def copy_file(src, target, subdir, name)
+      sub = ::File.join([target, subdir].compact)
+      FileUtils.mkdir_p sub
+      target = ::File.join(sub, name)
       JBundle.log("Copying to #{target}")
       FileUtils.cp src, target
       target
     end
     
-    def write_file(content, dir_name, file_name)
-      FileUtils.mkdir_p dir_name
-      target = ::File.join(dir_name, file_name)
+    def write_file(content, dir_name, subdir, file_name)
+      sub = ::File.join([dir_name, subdir].compact)
+      FileUtils.mkdir_p sub
+      target = ::File.join(sub, file_name)
       JBundle.log("Writing to #{target}")
       ::File.open(target, 'w') do |f|
         f.write content

data/spec/JFile

@@ -18,6 +18,10 @@ file 'file4.js'
 
 file 'text.txt'
 
+file 'nested/foo.txt'
+
+file 'nested/foo.txt' => 'flat_foo.txt'
+
 filter do |src, config|
   src.gsub!(/<VERSION>/, config.version.full)
 end

data/spec/jbundle_spec.rb

@@ -26,7 +26,7 @@ describe "JBundle" do
     end
     
     it 'should bundle bundles' do
-      JBundle.output.size.should == 4
+      JBundle.output.size.should == 6
       JBundle.output[0].name.should == 'foo.js'
       JBundle.output[0].src.should == "var VERSION = '1.6.1';\nvar a1 = 1;\nvar a2 = 2;\n"
       JBundle.output[0].min.should == "var VERSION=\"1.6.1\",a1=1,a2=2;\n"
@@ -71,6 +71,16 @@ describe "JBundle" do
       File.exist?(DIST + '/1.6/foo.txt').should be_true
     end
     
+    it 'should copy files in subdirectories' do
+      File.exist?(DIST + '/1.6.1/nested/foo.txt').should be_true
+      File.exist?(DIST + '/1.6/nested/foo.txt').should be_true
+    end
+    
+    it 'should copy files to new names if hash given' do
+      File.exist?(DIST + '/1.6.1/flat_foo.txt').should be_true
+      File.exist?(DIST + '/1.6/flat_foo.txt').should be_true
+    end
+    
     it 'should return a list of files written' do
       @written_files.should == [
         DIST + '/1.6.1/foo.js',
@@ -89,7 +99,13 @@ describe "JBundle" do
         DIST + '/1.6/file4.min.js',
         
         DIST + '/1.6.1/text.txt',
-        DIST + '/1.6/text.txt'
+        DIST + '/1.6/text.txt',
+        
+        DIST + '/1.6.1/nested/foo.txt',
+        DIST + '/1.6/nested/foo.txt',
+        
+        DIST + '/1.6.1/flat_foo.txt',
+        DIST + '/1.6/flat_foo.txt'
       ]
     end
     

data/spec/test_src/nested/foo.txt

@@ -0,0 +1 @@
+This file is in a nested subdirectory

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jbundle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ismael Celis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -03:00
+date: 2011-01-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: Good for releasing javascript libraries composed of many files. Writes files apt for deploying to CDNs.
+description: Writes versioned, bundled and minified javascript files and dependencies
 email: 
 - ismaelct@gmail.com
 executables: 
@@ -98,6 +98,7 @@ files:
 - spec/test_src/file4.js
 - spec/test_src/foo.txt
 - spec/test_src/license.txt
+- spec/test_src/nested/foo.txt
 - spec/test_src/text.txt
 has_rdoc: true
 homepage: http://github.com/ismasan/jbundle
@@ -134,6 +135,6 @@ rubyforge_project: jbundle
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Writes versioned, bundled and minified javascript files and dependencies
+summary: Good for releasing javascript libraries composed of many files. Writes files apt for deploying to CDNs.
 test_files: []