sparrowhawk 0.9.1 → 0.9.2

data/CHANGELOG.md

@@ -1,12 +1,18 @@
+## 0.9.2 (29 December 2010)
+
+* Features
+
+  * Refactor Configuration object out of Rake task (https://www.pivotaltracker.com/story/show/8013593)
+
 ## 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)
+  * 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)
+  * Application filter incorrectly grabbing files from the root directory (https://www.pivotaltracker.com/story/show/8006537)
 
 ## 0.9.0 (28 December 2010)
 

data/lib/sparrowhawk/configuration.rb

@@ -0,0 +1,58 @@
+module Sparrowhawk
+
+  class Configuration
+
+    #Sets the name/file path of the war file. Ex: ../distro/example.war
+    attr_accessor :war_file
+
+    #Sets the base directories that will be scanned for application
+    #files (not static content). Some directories will always be
+    #excluded implicitly (e.g. vendor/cache)
+    attr_accessor :application_dirs
+
+    #The min and max runtimes that will be used to service
+    #requests. Accepts a range.
+    attr_accessor :runtimes
+
+    #Which environment to use when running the application
+    attr_accessor :environment
+
+    #Other files to include in the application code (LICENSE, README, etc.)
+    attr_accessor :other_files
+
+    #Returns an object instance that can be used to build a war
+    def war
+      war = War.new war_file
+      war.entries << PublicDirMapper.new.to_a
+      war.entries << WebXmlEntry.new(web_xml_options)
+      war.entries << ManifestEntry.new
+      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
+      other_files.each do |file|
+        war.entries << FileEntry.new("WEB-INF/#{file}", file)
+      end if other_files
+      war
+    end
+
+    def initialize
+      yield self if block_given?
+    end
+
+    private
+
+    def web_xml_options
+      options = {}
+      options[:runtimes] = runtimes if runtimes
+      options[:environment] = environment if environment
+      options
+    end
+
+  end
+
+end

data/lib/sparrowhawk/rake_task.rb

@@ -5,52 +5,14 @@ module Sparrowhawk
 
   class RakeTask < ::Rake::TaskLib
 
-    attr_accessor :war_file
-
-    attr_accessor :application_dirs
-
-    attr_accessor :runtimes
-
-    attr_accessor :environment
-
-    attr_accessor :other_files
-
-    def initialize task_name=:war
-      yield self if block_given?
+    def initialize task_name=:war, &block
+      @configuration = Configuration.new &block
 
       task task_name do
-        war.build
+        @configuration.war.build
       end
     end
 
-    private
-
-    def war
-      war = War.new war_file
-      war.entries << PublicDirMapper.new.to_a
-      war.entries << WebXmlEntry.new(web_xml_options)
-      war.entries << ManifestEntry.new
-      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
-      other_files.each do |file|
-        war.entries << FileEntry.new("WEB-INF/#{file}", file)
-      end if other_files
-      war
-    end
-
-    def web_xml_options
-      options = {}
-      options[:runtimes] = runtimes if runtimes
-      options[:environment] = environment if environment
-      options
-    end
-
   end
 
 end

data/lib/sparrowhawk.rb

@@ -1,9 +1,10 @@
 require 'bundler'
 
 module Sparrowhawk
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 
   autoload :War                     ,'sparrowhawk/war'
+  autoload :Configuration           ,'sparrowhawk/configuration'
 
   autoload :Entry                   ,'sparrowhawk/entry'
   autoload :FileEntry               ,'sparrowhawk/file_entry'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sparrowhawk
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ryan L. Bell
@@ -152,6 +152,7 @@ files:
 - lib/sparrowhawk/file_entry_mapper.rb
 - lib/sparrowhawk/application_files_mapper.rb
 - lib/sparrowhawk/jruby_rack_jar_entry.rb
+- lib/sparrowhawk/configuration.rb
 - lib/sparrowhawk/gemfile_entry.rb
 - lib/sparrowhawk/gem_mapper.rb
 - lib/sparrowhawk/lockfile_entry.rb