sparrowhawk 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.9.1 (29 December 2010)
+
+* Features
+
+** Only include gems in war that are part of the :default or :production groups (https://www.pivotaltracker.com/story/show/7980329)
+
+* Bugs
+
+** Application filter incorrectly grabbing files from the root directory (https://www.pivotaltracker.com/story/show/8006537)
+
 ## 0.9.0 (28 December 2010)
 
 * Initial feature set.

data/lib/sparrowhawk/application_files_mapper.rb

@@ -5,7 +5,7 @@ module Sparrowhawk
 
     attr_reader :application_root, :application_dirs
 
-    def initialize *application_dirs
+    def initialize application_dirs=nil
       @application_root = expand_path '.'
       @excluded_path_patterns = [%r{/vendor/cache/}]
       @application_dirs = application_dirs || default_application_dirs

data/lib/sparrowhawk/bundler_definition.rb

@@ -7,10 +7,12 @@ module Sparrowhawk
       super ::Bundler::Definition.build('Gemfile', 'Gemfile.lock', nil)
     end
 
+    # Filters dependencies based on what should be in the war at runtime
     def runtime_dependencies
       dependencies.select do |dep|
         dep.type.to_sym == :runtime and
-          (dep.platforms.empty? or dep.platforms.include?(:jruby))
+          (dep.platforms.empty? or dep.platforms.include?(:jruby)) and
+          !(dep.groups & [:default, :production]).empty?
       end
     end
   end

data/lib/sparrowhawk/bundler_gem_finder.rb

@@ -33,8 +33,8 @@ module Sparrowhawk
       end
     end
 
-    def specs_for_dependencies_of thing
-      thing.runtime_dependencies.map do |dep|
+    def specs_for_dependencies_of def_or_dep
+      def_or_dep.runtime_dependencies.map do |dep|
         specs = vendor_cache.search(dep)
         specs.map { |s| specs_for_dependencies_of s } + specs
       end.flatten

data/lib/sparrowhawk/file_entry_mapper.rb

@@ -11,7 +11,7 @@ module Sparrowhawk
     end
 
     def file_entry_tuples
-      Dir.glob(file_pattern).map do |f|
+      Dir.glob(file_pattern).uniq.map do |f|
         [entry_name(f), expand_path(f)]
       end
     end

data/lib/sparrowhawk.rb

@@ -1,7 +1,7 @@
 require 'bundler'
 
 module Sparrowhawk
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 
   autoload :War                     ,'sparrowhawk/war'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sparrowhawk
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Ryan L. Bell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -05:00
+date: 2010-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency