sparrowhawk 0.9.3 → 0.9.4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.9.4 (31 December 2010)
+
+* Features
+
+  * Include a bundler config in the war to make sure only the correct gems are loaded by bundler (https://www.pivotaltracker.com/story/show/8048525)
+
+* Bugs
+
+  * Make sure the correct version of Bundler is available (https://www.pivotaltracker.com/story/show/8034021)
+
 ## 0.9.3 (29 December 2010)
 
 * Bugs

data/lib/sparrowhawk/bundler_artifact_mapper.rb

@@ -0,0 +1,58 @@
+module Sparrowhawk
+
+  class BundlerArtifactMapper
+    include Enumerable
+    
+    attr_reader :definition
+
+    def initialize
+      @definition = BundlerDefinition.new gemfile, lockfile
+    end
+
+    def each
+      entries.each { |entry| yield entry }
+    end
+
+    private
+
+    def entries
+      entries = []
+      entries << GemfileEntry.new
+      entries << LockfileEntry.new
+      entries << gems
+      unless groups.empty?
+        entries << bundler_configuration
+      end
+      entries.flatten
+    end
+
+    def gems
+      unless @gems
+        gem_finder = BundlerGemFinder.new definition
+        @gems = GemMapper.new(gem_finder).to_a.flatten
+      end
+      @gems
+    end
+
+    def groups
+      @groups ||= definition.groups or []
+    end
+
+    def bundler_configuration
+      @bundler_configuration ||= BundlerConfigurationEntry.new :without => excluded_groups
+    end
+
+    def excluded_groups
+      definition.excluded_groups
+    end
+
+    def gemfile
+      'Gemfile'
+    end
+
+    def lockfile
+      'Gemfile.lock'
+    end
+  end
+
+end

data/lib/sparrowhawk/bundler_configuration_entry.rb

@@ -0,0 +1,23 @@
+module Sparrowhawk
+
+  class BundlerConfigurationEntry
+    attr_reader :name
+    attr_reader :content
+
+    def initialize options = {}
+      @name = 'WEB-INF/.bundle/config'
+      @content = config_yaml options
+    end
+
+    private
+
+    def config_yaml options
+      config = {}
+      if options[:without]
+        config['BUNDLE_WITHOUT'] = options[:without].join(':')
+      end
+      config.to_yaml
+    end
+  end
+
+end

data/lib/sparrowhawk/bundler_definition.rb

@@ -3,8 +3,9 @@ require 'delegate'
 module Sparrowhawk
 
   class BundlerDefinition < DelegateClass(::Bundler::Definition)
-    def initialize
-      super ::Bundler::Definition.build('Gemfile', 'Gemfile.lock', nil)
+
+    def initialize gemfile, lockfile
+      super ::Bundler::Definition.build(gemfile, lockfile, nil)
     end
 
     # Filters dependencies based on what should be in the war at runtime
@@ -12,9 +13,17 @@ module Sparrowhawk
       dependencies.select do |dep|
         dep.type.to_sym == :runtime and
           (dep.platforms.empty? or dep.platforms.include?(:jruby)) and
-          !(dep.groups & [:default, :production]).empty?
+          !(dep.groups & production_groups).empty?
       end
     end
+
+    def excluded_groups
+      @excluded_groups ||= groups - production_groups
+    end
+
+    def production_groups
+      [:default, :production]
+    end
   end
 
 end

data/lib/sparrowhawk/bundler_gem_finder.rb

@@ -5,8 +5,8 @@ module Sparrowhawk
 
     attr_reader :definition
 
-    def initialize
-      @definition = BundlerDefinition.new
+    def initialize definition
+      @definition = definition 
     end
 
     def each

data/lib/sparrowhawk/configuration.rb

@@ -29,11 +29,7 @@ module Sparrowhawk
       war.entries << ApplicationFilesMapper.new(application_dirs).to_a
       war.entries << JRubyCoreJarEntry.new
       war.entries << JRubyStdLibJarEntry.new
-      war.entries << JRubyRackJarEntry.new
-      gem_finder = BundlerGemFinder.new
-      war.entries << GemMapper.new(gem_finder).to_a
-      war.entries << GemfileEntry.new
-      war.entries << LockfileEntry.new
+      war.entries << BundlerArtifactMapper.new.to_a
       other_files.each do |file|
         war.entries << FileEntry.new("WEB-INF/#{file}", file)
       end if other_files

data/lib/sparrowhawk.rb

@@ -1,28 +1,30 @@
 require 'bundler'
 
 module Sparrowhawk
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 
-  autoload :War                     ,'sparrowhawk/war'
-  autoload :Configuration           ,'sparrowhawk/configuration'
+  autoload :War                        ,'sparrowhawk/war'
+  autoload :Configuration              ,'sparrowhawk/configuration'
 
-  autoload :Entry                   ,'sparrowhawk/entry'
-  autoload :FileEntry               ,'sparrowhawk/file_entry'
-  autoload :WebXmlEntry             ,'sparrowhawk/web_xml_entry'
-  autoload :ManifestEntry           ,'sparrowhawk/manifest_entry'
-  autoload :JarEntry                ,'sparrowhawk/jar_entry'
-  autoload :JRubyCoreJarEntry       ,'sparrowhawk/jruby_core_jar_entry'
-  autoload :JRubyStdLibJarEntry     ,'sparrowhawk/jruby_stdlib_jar_entry'
-  autoload :JRubyRackJarEntry       ,'sparrowhawk/jruby_rack_jar_entry'
-  autoload :GemfileEntry            ,'sparrowhawk/gemfile_entry'
-  autoload :LockfileEntry           ,'sparrowhawk/lockfile_entry'
+  autoload :Entry                      ,'sparrowhawk/entry'
+  autoload :FileEntry                  ,'sparrowhawk/file_entry'
+  autoload :WebXmlEntry                ,'sparrowhawk/web_xml_entry'
+  autoload :ManifestEntry              ,'sparrowhawk/manifest_entry'
+  autoload :JarEntry                   ,'sparrowhawk/jar_entry'
+  autoload :JRubyCoreJarEntry          ,'sparrowhawk/jruby_core_jar_entry'
+  autoload :JRubyStdLibJarEntry        ,'sparrowhawk/jruby_stdlib_jar_entry'
+  autoload :JRubyRackJarEntry          ,'sparrowhawk/jruby_rack_jar_entry'
+  autoload :GemfileEntry               ,'sparrowhawk/gemfile_entry'
+  autoload :LockfileEntry              ,'sparrowhawk/lockfile_entry'
+  autoload :BundlerConfigurationEntry  ,'sparrowhawk/bundler_configuration_entry'
 
-  autoload :FileEntryMapper         ,'sparrowhawk/file_entry_mapper'
-  autoload :PublicDirMapper         ,'sparrowhawk/public_dir_mapper'
-  autoload :ApplicationFilesMapper  ,'sparrowhawk/application_files_mapper'
-  autoload :GemMapper               ,'sparrowhawk/gem_mapper'
+  autoload :FileEntryMapper            ,'sparrowhawk/file_entry_mapper'
+  autoload :PublicDirMapper            ,'sparrowhawk/public_dir_mapper'
+  autoload :ApplicationFilesMapper     ,'sparrowhawk/application_files_mapper'
+  autoload :GemMapper                  ,'sparrowhawk/gem_mapper'
+  autoload :BundlerArtifactMapper      ,'sparrowhawk/bundler_artifact_mapper'
 
-  autoload :BundlerGemFinder        ,'sparrowhawk/bundler_gem_finder'
-  autoload :BundlerDefinition       ,'sparrowhawk/bundler_definition'
-  autoload :Index                   ,'sparrowhawk/index'
+  autoload :BundlerGemFinder           ,'sparrowhawk/bundler_gem_finder'
+  autoload :BundlerDefinition          ,'sparrowhawk/bundler_definition'
+  autoload :Index                      ,'sparrowhawk/index'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sparrowhawk
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ryan L. Bell
@@ -15,12 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -05:00
+date: 2010-12-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 0
+        - 6
+        version: 1.0.6
+  requirement: *id001
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id002
   name: rubyzip
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id003
   name: jruby-jars
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id004
   name: jruby-rack
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id004
+  requirement: *id005
   name: rake
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  requirement: *id006
   name: rspec
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id007
   name: cucumber
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id007
+  requirement: *id008
   name: aruba
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,8 +144,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id008
+  requirement: *id009
   name: nokogiri
 description: Sparrowhawk uses bundler and vendor/cache to package rails applications into a war file, without executing Java or JRuby
 email: 
@@ -140,7 +156,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/sparrowhawk/bundler_configuration_entry.rb
 - lib/sparrowhawk/public_dir_mapper.rb
+- lib/sparrowhawk/bundler_artifact_mapper.rb
 - lib/sparrowhawk/war.rb
 - lib/sparrowhawk/jruby_stdlib_jar_entry.rb
 - lib/sparrowhawk/rake_task.rb