bagger 0.2.1 → 0.3.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+# v 0.3.1
+
+ * Support for exclude_files and exclude_pattern. For times when you
+   don't want certain files to be processed by bagger
+
 ## v 0.2.1
 
  * Updating this particular roadmap

data/README.md

@@ -32,12 +32,11 @@ on the client side by using the following techniques:
 	target_dir = "/tmp/bundled_assets"
 	source_dir = "/applications/my_app/public"
   
-  # customize paths for file and cache manifest
-  manifest_path = File.join(target_dir, 'file_manifest.json') #defaults
-to manifest.json
+	# customize paths for file and cache manifest
+	manifest_path = File.join(target_dir, 'file_manifest.json') #defaults
+	to manifest.json
 
-  cache_manifest_path = 'cache/cache.manifest' # defaults to
-cache.manifest
+	cache_manifest_path = 'cache/cache.manifest' # defaults to cache.manifest
 	
 	# list the stylesheets and javascripts to be combined
 	# and minified. The order is important, because otherwhise
@@ -45,50 +44,52 @@ cache.manifest
 	stylesheets = ["css/style.css", "css/reset.css"]
 	javascripts = ["js/app.js", "js/utils.js"]
 
-  # define cache manifest bundles for different devices
-  # for convencien, the manfiest defined with `cache_manifest_path`
-  # will always contain all resources
-  ipad_resources = ["images/troll-big.png"]
-  iphone_retina_resources = ["images/troll-retina.png"]
-  desktop_browser_resources = ["images/troll.png"]
+	# define cache manifest bundles for directorfferent devices
+	# for convencien, the manfiest defined with `cache_manifest_path`
+	# will always contain all resources
+	ipad_resources = ["images/troll-big.png"]
+	iphone_retina_resources = ["images/troll-retina.png"]
+	desktop_browser_resources = ["images/troll.png"]
 	
 	# make sure the target directory exists
 	FileUtils.mkdir_p target_dir
 	
 	# define the options hash
 	options = {
-	  :source_dir => target_dir,
-	  :target_dir => source_dir,
-    :manifest_path => manifest_path,
-    :cache_manifest_path => cache_manifest_path,
-	  :combine => {
-	    :stylesheets => [
-        {
-          :target_path => 'css/all.css',
-          :files => stylesheets
-        }
-      ],
-	    :javascripts => [
-        {
-          :target_path => 'js/combined.js',
-          :files => javascripts
-        }
-      ]
-	  },
-    :cache_manifests => [
-      {
-        :target_path => 'cache/ipad-cache.manifest',
-        :files => ipad_resources
-      },
-      {
-        :target_path => 'cache/retina-cache.manifest',
-        :files => iphone_retina_resources
-      },
-      {
-        :target_path => 'cache/desktop.manifest',
-        :files => desktop_browser_resources
-      }
-    ]
+		:source_dir => target_dir,
+		:target_dir => source_dir,
+		:manifest_path => manifest_path,
+		:cache_manifest_path => cache_manifest_path,
+    :exclude_pattern => /.*\.less/,
+    :exclude_files => [ 'css/main.sass', 'css/style.sass' ]
+		:combine => {
+		 :stylesheets => [
+		    {
+		      :target_path => 'css/all.css',
+		      :files => stylesheets
+		    }
+		  ],
+		 :javascripts => [
+		    {
+		      :target_path => 'js/combined.js',
+		      :files => javascripts
+		    }
+		  ]
+		},
+		:cache_manifests => [
+		  {
+		    :target_path => 'cache/ipad-cache.manifest',
+		    :files => ipad_resources
+		  },
+		  {
+		    :target_path => 'cache/retina-cache.manifest',
+		    :files => iphone_retina_resources
+		  },
+		  {
+		    :target_path => 'cache/desktop.manifest',
+		    :files => desktop_browser_resources
+		  }
+		]
 	}
 	
 	# run it

data/lib/bagger/packager.rb

@@ -17,6 +17,8 @@ module Bagger
       @manifest_path = @options[:manifest_path] || File.join(@source_dir, 'manifest.json')
       @cache_manifest_path = @options[:cache_manifest_path] || 'cache.manifest'
       @path_prefix = @options[:path_prefix] || ''
+      @exclude_files = Array(@options[:exclude_files])
+      @exclude_pattern = @options[:exclude_pattern]
       @manifest = {}
     end
 
@@ -64,11 +66,12 @@ module Bagger
 
     def version_files
       FileUtils.cd(@source_dir) do
-        Dir["**/*"].reject{ |f| f =~ /\.(css|js)$/ }.each do |path|
+        Dir["**/*"].reject{ |f| exclude_file?(f) }.each do |path|
           if File.directory? path
             FileUtils.mkdir_p(File.join(@target_dir, path))
             next
           end
+
           FileUtils.cp(path, File.join(@target_dir, path))
           to_manifest(path, false)
         end
@@ -200,5 +203,9 @@ module Bagger
     def raise_error(message)
       raise ValidationError.new(message)
     end
+
+    def exclude_file?(path)
+      path =~ /\.(css|js)$/ || @exclude_files.include?(path) || (@exclude_pattern && path =~ @exclude_pattern)
+    end
   end
 end

data/lib/bagger/version.rb

@@ -1,3 +1,3 @@
 module Bagger
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

data/test/bagger_test.rb

@@ -79,6 +79,18 @@ class BaggerTest < Test::Unit::TestCase
       Bagger.bagit!(default_options.merge(:manifest_path => manifest_path))
       assert File.exists?(manifest_path), 'custom manifest path not found'
     end
+
+    should 'support an exclude file list' do
+      write_file(File.join(@source_dir, 'test.txt'), 'foo')
+      Bagger.bagit!(default_options.merge(:exclude_files => 'test.txt'))
+      assert_nil manifest['/test.txt']
+    end
+
+    should 'support an exclude file pattern' do
+      write_file(File.join(@source_dir, 'test.txt'), 'foo')
+      Bagger.bagit!(default_options.merge(:exclude_pattern => /.*\.txt/))
+      assert_nil manifest['/test.txt']
+    end
   end
 
   context 'html 5 cache manifest' do
@@ -225,11 +237,15 @@ class BaggerTest < Test::Unit::TestCase
         #absoluteUrl {
             background: url('http://localhost/absolute.png') top center;
         }
+
+        #webkitSpecials {
+          -webkit-border-image: url("/images/dash.png") 8 0 8 0 repeat;
+        }
         EOF
         write_file(File.join(@css_dir, "urled.css"), css)
         @config[:stylesheets][0][:files] << 'css/urled.css'
         FileUtils.mkdir_p(File.join(@source_dir, 'images'))
-        %w(root relative multiple absolute).each do |type|
+        %w(root relative multiple absolute dash).each do |type|
           FileUtils.touch(File.join(@source_dir, 'images', "#{type}.png"))
         end
       end
@@ -265,6 +281,16 @@ class BaggerTest < Test::Unit::TestCase
         assert combined_css.include?(manifest['/images/multiple.png'])
       end
 
+      should 'rewrite directives that start with a -' do
+        Bagger.bagit!(
+          :source_dir => @source_dir,
+          :target_dir => @target_dir,
+          :combine => @config
+        )
+        combined_css = File.open(File.join(@target_dir, manifest['/css/combined.css'])){|f| f.read}
+        assert combined_css.include?(manifest['/images/dash.png'])
+      end
+
       should 'not rewrite absolute urls' do
         Bagger.bagit!(
           :source_dir => @source_dir,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bagger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000 Z
+date: 2011-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70289388150660 !ruby/object:Gem::Requirement
+  requirement: &70222468280260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289388150660
+  version_requirements: *70222468280260
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70289388150240 !ruby/object:Gem::Requirement
+  requirement: &70222468279480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289388150240
+  version_requirements: *70222468279480
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70289388149820 !ruby/object:Gem::Requirement
+  requirement: &70222468278640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289388149820
+  version_requirements: *70222468278640
 - !ruby/object:Gem::Dependency
   name: rainpress
-  requirement: &70289388149360 !ruby/object:Gem::Requirement
+  requirement: &70222468278220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289388149360
+  version_requirements: *70222468278220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70289388148940 !ruby/object:Gem::Requirement
+  requirement: &70222468277720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289388148940
+  version_requirements: *70222468277720
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70289388148520 !ruby/object:Gem::Requirement
+  requirement: &70222468277240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289388148520
+  version_requirements: *70222468277240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70289388148100 !ruby/object:Gem::Requirement
+  requirement: &70222468276800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289388148100
+  version_requirements: *70222468276800
 description: ! 'A framework agnostic packaging solution for your assets: version files,
   combine them, minify them and create a manifest'
 email: