gpm 0.1.9 → 0.3.0

data/bin/gpm

@@ -2,7 +2,7 @@
 #
 
 require "rubygems"
-$: << File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "gpm/cli"
 
 GpmCli.start

data/lib/gpm/cli.rb

@@ -4,11 +4,12 @@ require_relative 'packaging_task'
 
 class GpmCli < Thor
   def self.supported_sources
-    ["gem","bundler"]
+    ["gem","bundler", "war", "maven"]
   end
   def self.supported_targets
     ["deb"]
   end
+  INCLUDE_FILES_PARAM = "include-files".to_sym
   # gpm package -s <source type> -t <target type> [options]
   desc "package APP_DIRECTORY_OR_FILE", "Packages the app given in a specified source format to a desired target format"
   method_option :source, :type => :string, :aliases => "-s", :desc => "The input for creating the package (Currently supported: #{supported_sources.join(', ')})", :required => true
@@ -18,12 +19,13 @@ class GpmCli < Thor
   method_option :owner, :type => :string, :aliases => "-o", :desc => "The owning user for the destination path", :default => "root"
   method_option :group, :type => :string, :aliases => "-g", :desc => "The owning group for the destination path", :default => "root"
   method_option :buildnumber, :type => :string, :aliases => "-b", :desc => "The build number that is appended to the version", :required => false
+  method_option INCLUDE_FILES_PARAM, :type => :array, :aliases => "-i", :desc => "Glob(s) of files to include", :required => false
 
   def package(file_or_directory)
-    raise "Only gem or bundler source at the moment" unless self.class.supported_sources.include? options.source
+    raise "Only #{self.class.supported_sources.join(", ")} sources at the moment" unless self.class.supported_sources.include? options.source
     raise "Only deb target at the moment" unless self.class.supported_targets.include? options.target
     package_options = {}
-    {:workdir => :work_dir , :destination => :destination, :owner => :owner, :group => :group, :buildnumber => :build_number}.each do |in_field, out_field|
+    {:workdir => :work_dir , :destination => :destination, :owner => :owner, :group => :group, :buildnumber => :build_number, INCLUDE_FILES_PARAM => :include_files}.each do |in_field, out_field|
       package_options[out_field] = options[in_field] if options[in_field]
     end
 

data/lib/gpm/has_directories.rb

@@ -0,0 +1,7 @@
+module HasDirectories
+  def in_directory(directory_identifier)
+    ::Dir.chdir(directory_identifier) do
+      yield
+    end
+  end
+end

data/lib/gpm/has_option_methods.rb

@@ -0,0 +1,15 @@
+module HasOptionMethods
+
+  module ClassMethods
+    def option_method(name, default_value = nil)
+      define_method name do
+        options[name.to_sym] || default_value
+      end
+    end
+  end
+
+  attr_reader :options
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+end

data/lib/gpm/io_helpers.rb

@@ -18,7 +18,7 @@ end
 def read_file_contents(files,base_directory)
   file_contents = {}
   files.each do |f|
-    path = File.join(base_directory,f)
+    path = File.expand_path(File.join(base_directory,f))
     permissions = File.lstat(path).mode % 4096
     file_contents[FilePathAndPermissions.new(f,permissions)] = File.read(path) if File.file?(path)
   end

data/lib/gpm/packaging_task.rb

@@ -3,19 +3,19 @@ class PackagingTask
   def self.class_for_source(source_name)
     require_relative "source"
     require_relative "source/#{source_name}"
-    Kernel.const_get("Source").const_get(source_name.capitalize)
+    Source.const_get(source_name.capitalize)
   end
 
   def self.class_for_target(target_name)
     require_relative "target"
     require_relative "target/#{target_name}"
-    Kernel.const_get("Target").const_get(target_name.capitalize)
+    Target.const_get(target_name.capitalize)
   end
 
   def self.create(file_or_directory, source_name, target_name, options = {})
     options[:work_dir] ||= Dir.mktmpdir
     source_class = class_for_source(source_name)
-    source = source_class.create(file_or_directory, options)
+    source = source_class::Factory.new(file_or_directory, options).create
 
     target_class = class_for_target(target_name)
     target = target_class.new(options[:work_dir], options)

data/lib/gpm/source.rb

@@ -1,8 +1,43 @@
 require 'pathname'
 require_relative 'file_path_and_permissions'
+require_relative 'source/files_providers/files_from_directory_provider'
+require_relative 'has_option_methods'
 
 module Source
   class Base
+    class Factory
+      include HasOptionMethods
+      attr_reader :directory
+      option_method :include_files,[]
+      def initialize(directory, options = {})
+        @directory = directory
+        @options = options
+      end
+      def create
+        raise "Cannot instantiate source type base."
+      end
+      def files_provider
+        Source::CompositeFilesProvider.new(*files_providers)
+      end
+      GLOB_REGEXP = /(?:\(([^)]+)\))?(.*)/
+      def files_providers
+        base_providers = [Source::FilesFromDirectoryProvider.create_from_directory(File.join(directory, '_package_'), directory)]
+        include_files.each do |include_files_entry|
+          directory, glob = include_files_entry.match(GLOB_REGEXP).to_a[1..-1]
+          directory = File.expand_path(directory || "", self.directory)
+          base_providers << Source::FilesFromDirectoryProvider.create_from_glob(directory ,glob)
+        end
+        base_providers
+      end
+    end
+
+
+    def self.constant_field(name,value)
+      define_method(name) do
+        value
+      end
+    end
+
     DEFAULTS = {
       # Default version is 1.0 in case nobody told us a specific version.
       :version => "1.0",
@@ -26,10 +61,22 @@ module Source
       :description => "no description given"
     }
     DEFAULTS.each do |field, default_value|
-      define_method field do
-        default_value
-      end
+      constant_field field, default_value
     end
+
+    include HasOptionMethods
+    attr_reader :files_provider
+
+    def initialize(files_provider,options={})
+      @options=options
+      @files_provider=files_provider
+    end
+
+
+    %w(owner group destination build_number).each do |method|
+      option_method method
+    end
+
     def maintainer
       # Default maintainer if none given.
       if @maintainer.nil? or @maintainer.empty?
@@ -43,6 +90,7 @@ module Source
         else
           # TODO(sissel): Maybe support using 'git config' for a default as well?
           # git config --get user.name, etc can be useful.
+          # Maybe use 'whoami', in case we are not in a git repository?
           #
           # Otherwise default to user@currenthost
           @maintainer = "<#{ENV["USER"]}@#{Socket.gethostname}>"
@@ -54,5 +102,13 @@ module Source
       file_name = FilePathAndPermissions.new(file_name) unless file_name.kind_of? FilePathAndPermissions
       file_contents.include? file_name
     end
+
+    def file_contents
+    files_provider.nil? ? {} : files_provider.file_contents
+    end
+
+    def files
+      files_provider.files
+    end
   end
 end

data/lib/gpm/source/bundler.rb

@@ -2,25 +2,28 @@ require_relative 'gem'
 require_relative 'files_providers/files_from_bundler_directory_provider'
 module Source
   class Bundler < Source::Gem
-    def self.create(gemfile, options = {})
-      directory = File.absolute_path(File.dirname(gemfile))
-      gemspec = Dir[File.join(directory,'*.gemspec')].first
-      metadata = read_metadata(gemspec)
-  
-      bundler_provider = FilesFromBundlerDirectoryProvider.new(File.expand_path(gemfile), gemspec)
-      package_path = File.join(directory, '_package_')
-      package_scripts_provider = Source::FilesFromDirectoryProvider.new(package_path, directory)
-      new(metadata, Source::CompositeFilesProvider.new(bundler_provider, package_scripts_provider), options)
+
+    class Factory < Source::Gem::Factory
+      def directory
+        File.absolute_path(File.dirname(gem_file))
+      end
+      def gemspec
+        Dir[File.join(directory,'*.gemspec')].first
+      end
+      def create
+        Source::Bundler.new(metadata, files_provider, options)
+      end
+      def files_providers
+        super + [FilesFromBundlerDirectoryProvider.new(File.expand_path(gem_file), gemspec)]
+      end
     end
-  
+
+
     def initialize(*args)
       super
     end
-    def architecture
-      "native"
-    end
-    def dependencies
-      ["libc6", "ruby"]
-    end
+
+    constant_field :architecture, "native"
+    constant_field :dependencies, ["libc6", "ruby"]
   end
 end

data/lib/gpm/source/files_providers/composite_files_provider.rb

@@ -1,23 +1,16 @@
 module Source
-  class CompositeFilesProvider
+  class CompositeFilesProvider < FilesProvider
     def initialize(*file_providers)
       @file_providers = file_providers
     end
 
-    def files
-      @file_providers.inject([]) do |merged, file_provider|
-        files = file_provider.files
-        raise "duplicate filename found in different file providers" unless (merged & files).empty?
-        merged + files
-      end
-    end
-
     def file_contents
       @file_providers.inject({}) do |merged, file_provider|
         contents = file_provider.file_contents
-        raise "duplicate filename found in different file providers: #{(merged.keys & contents.keys)}" unless (merged.keys & contents.keys).empty?
+        same_files_with_different_content = (merged.keys & contents.keys).find_all {|f| merged[f] != contents[f]}
+        raise "duplicate filenames with different content found in different file providers: #{same_files_with_different_content}" unless same_files_with_different_content.empty?
         merged.merge contents
       end
     end
   end
-end
+end

data/lib/gpm/source/files_providers/files_from_bundler_directory_provider.rb

@@ -1,29 +1,23 @@
-require_relative 'files_from_directory_provider'
-require_relative 'composite_files_provider'
-require_relative 'files_from_gem_directory_provider'
 require_relative 'vendored_gems_installer'
-require_relative '../gem'
+require_relative 'files_from_directory_provider'
 require 'bundler'
 
 module Source
-  class FilesFromBundlerDirectoryProvider < FilesFromGemDirectoryProvider
-    attr_reader :gemfile,:gemspec
+  class FilesFromBundlerDirectoryProvider < FilesFromDirectoryProvider
+
     def initialize(gemfile,gemspec,vendored_gems_installer = nil)
       raise "Must give me a Gemfile, not #{gemfile.inspect}" unless File.basename(gemfile)=="Gemfile"
-      metadata = Source::Gem.read_metadata(gemspec)
-      super(File.dirname(gemfile),metadata.files)
-      @gemfile = gemfile
-      @gemspec = gemspec
       @vendored_gems_installer = vendored_gems_installer || Source::VendoredGemsInstaller.new(gemfile)
       @installed = false
-    end
 
-    def bundled_files
-      files = nil
-      Dir.chdir(File.dirname(@gemfile)) do
-        files = Dir["vendor/bundle/**/*"]
+      super(File.dirname(gemfile), [File.basename(gemfile),File.basename(gemspec),'Gemfile.lock','.bundle/config'])
+    end
+    def files_to_provide
+      bundled_files = nil
+      Dir.chdir(directory) do
+        bundled_files = Dir["vendor/bundle/**/*"]
       end
-      files
+      super + bundled_files
     end
 
     def file_contents
@@ -31,10 +25,7 @@ module Source
         @vendored_gems_installer.install!
         @installed = true
       end
-      super_contents = super.merge(read_file_contents(bundled_files+[File.basename(gemfile),File.basename(gemspec),'Gemfile.lock','.bundle/config'], directory))
-      super_contents
+      super
     end
-
-
   end
 end

data/lib/gpm/source/files_providers/files_from_directory_provider.rb

@@ -2,15 +2,30 @@ require_relative 'files_provider'
 
 module Source
   class FilesFromDirectoryProvider < FilesProvider
-    def initialize(directory=".", base_directory=nil)
+    #This is a factory method that constructs a FilesFromDirectoryProvider that
+    #will provide all files below directory but strip their paths such that they
+    #appear as relative to the base_directory
+    def self.create_from_directory(directory=".", base_directory=nil)
+      return create_from_glob(directory, '**/*', base_directory)
+    end
+
+    def self.create_from_glob(directory=nil, glob='**/*', base_directory=nil)
+      directory ||= '.'
+      base_directory ||= directory
+      base_path = Pathname.new(base_directory)
+      files = Dir[File.join(directory, glob)].collect {|file| Pathname.new(file).relative_path_from(base_path).to_s }
+      new(base_directory, files)
+    end
+
+    attr_reader :directory, :files_to_provide
+
+    def initialize(directory,files_to_provide)
       @directory = directory
-      @base_directory = base_directory || directory
+      @files_to_provide = files_to_provide
     end
 
     def file_contents
-      base_path = Pathname.new(@base_directory)
-      files = Dir[File.join(@directory, '**', '*')].collect {|file| Pathname.new(file).relative_path_from(base_path).to_s }
-      read_file_contents(files, @base_directory)
+      read_file_contents files_to_provide, directory
     end
   end
 end

data/lib/gpm/source/files_providers/vendored_gems_installer.rb

@@ -22,7 +22,7 @@ module Source
           ENV["BUNDLE_GEMFILE"] = gemfile
           ENV["PWD"] = directory
           FileUtils.rm_rf('.bundle')
-          ["bundle install","bundle install --deployment --verbose"].each do |c| # --standalone
+          ["bundle install","bundle install --deployment --verbose --without development test"].each do |c| # --standalone
             command_result = `#{c}`
             raise "#{c.inspect} failed:\n#{command_result}" unless $?.success?
           end

data/lib/gpm/source/gem.rb

@@ -1,5 +1,6 @@
 require_relative '../source'
-require_relative 'files_providers/files_from_gem_directory_provider'
+require_relative 'files_providers/files_from_directory_provider'
+require_relative 'files_providers/composite_files_provider'
 require "rubygems/package"
 require "rubygems"
 require 'zlib'
@@ -51,27 +52,41 @@ class Gem < Base
     metadata
   end
 
-  def self.create(gem_file, options = {})
-    metadata = self.read_metadata(gem_file)
+  class Factory < Source::Base::Factory
+    attr_reader :gem_file, :options
+    def initialize(gem_file, options = {})
+      super(File.expand_path(File.dirname(gem_file)), options)
+      @gem_file = gem_file
+    end
+    def gemspec
+      @gem_file
+    end
+    def metadata
+      Source::Gem.read_metadata(gemspec)
+    end
+    def create
+      Source::Gem.new(metadata, files_provider, options)
+    end
 
-    files_provider = nil
-    Dir.chdir(File.dirname(gem_file)) do
-      if gem_file.end_with?('.gem')
-        File.open(gem_file, 'r') do |f|
-          files_provider = FilesFromGemProvider.new(f.read)
+    def files_providers
+      fp = nil
+      Dir.chdir(File.dirname(gem_file)) do
+        if gemspec.end_with?('.gem')
+          File.open(gem_file, 'r') do |f|
+            fp = FilesFromGemProvider.new(f.read)
+          end
+        elsif gemspec.end_with?('.gemspec')
+          fp = FilesFromDirectoryProvider.new(directory, metadata.files+[File.basename(gem_file)])
         end
-      elsif gem_file.end_with?('.gemspec')
-        files_provider = FilesFromGemDirectoryProvider.new(File.expand_path(File.dirname(gem_file)), metadata.files+[File.basename(gem_file)])
       end
+      super + [fp]
     end
-    new(metadata, files_provider, options)
   end
 
-  attr_reader :metadata, :files_provider
+  attr_reader :metadata
   def initialize(metadata, files_provider = nil, options = {})
     @metadata = metadata
-    @files_provider = files_provider
-    @options = options
+    super(files_provider, options)
   end
 
   %w(description license summary version).each do |method|
@@ -80,11 +95,6 @@ class Gem < Base
     end
   end
 
-  %w(owner group destination build_number).each do |method|
-    define_method method do
-      @options[method.to_sym]
-    end
-  end
   {:maintainer => :author, :url => :homepage}.each do |out_field, in_field|
     define_method out_field do
       metadata.send(in_field)
@@ -96,11 +106,9 @@ class Gem < Base
     "rubygem-#{name_provider.name}"
   end
 
-  def category
-    # TODO: this will be different for different
-    # package managers.  Need to decide how to handle this.
-    'Languages/Development/Ruby'
-  end
+  # TODO: this will be different for different
+  # package managers.  Need to decide how to handle this.
+  constant_field :category, 'Languages/Development/Ruby'
 
   def email
     result = metadata.email
@@ -134,11 +142,5 @@ class Gem < Base
     end
     return dependencies + ["libc6", "ruby"]
   end
-  def file_contents
-    files_provider.nil? ? {} : files_provider.file_contents
-  end
-  def files
-    files_provider.files
-  end
 end
 end

data/lib/gpm/source/maven.rb

@@ -0,0 +1,106 @@
+require_relative '../has_option_methods'
+require_relative '../has_directories'
+require_relative 'files_providers/composite_files_provider'
+require 'xmlsimple'
+
+module Source
+  class PomFileReader
+    include HasDirectories
+    include HasOptionMethods
+    def initialize(pomfile,options)
+      @logger = create_logger
+      @options = options
+      @pomfile = pomfile
+    end
+
+    option_method :work_dir
+
+    def read
+      in_directory work_dir do
+        XmlSimple.xml_in(effective_pom)
+      end
+    end
+    
+    def raw_pom
+      @pomfile
+    end
+
+    def effective_pom
+      result = tempfile
+      extracted_pom = raw_pom
+      @logger.info "Invoking maven to generate effective POM in : mvn help:effective-pom -Doutput=#{result} -f #{extracted_pom}"
+      mvn_output = `mvn help:effective-pom -Doutput=#{File.join(File.expand_path(Dir.getwd),result)} -f #{extracted_pom}`
+      exit_code = $?
+      unless exit_code.to_i == 0
+        @logger.error "Maven failed with exit status #{exit_code}."
+        @logger.error "Maven output was:\n==========\n#{mvn_output}"
+        raise "Failed to invoke maven to generate effective pom."
+      end
+      result
+    end
+
+    def tempfile
+      "effective_pom.xml"
+    end
+  end
+
+  class Maven < Base
+    class Factory < Source::Base::Factory
+      def initialize(pomfile, options={})
+        @pomfile = File.expand_path(pomfile)
+        @effective_pom_file_reader = effective_pom_file_reader_class.new(@pomfile, options)
+        super(File.dirname(@pomfile),options)
+      end
+
+      def effective_pom_file_reader_class
+        PomFileReader
+      end
+
+      def create
+        Maven.new(files_provider,options,@effective_pom_file_reader)
+      end
+
+      def files_providers
+        super + [FilesFromDirectoryProvider.new(directory, [File.basename(@pomfile)])]
+      end
+    end
+
+    def self.from_pom(method_name,*path_in_pom)
+      define_method(method_name) do
+        self.class.recursive_lookup(effective_pom,*path_in_pom) || Source::Base::DEFAULTS[method_name]
+      end
+    end
+
+    def initialize(files_provider,options,effective_pom_reader)
+      @effective_pom_reader = effective_pom_reader
+      super(files_provider, options)
+    end
+
+    from_pom :name, "artifactId", 0
+    from_pom :version, "version", 0
+    from_pom :maintainer, "developers", 0, "developer", 0, "name", 0
+    from_pom :email, "developers", 0, "developer", 0, "email", 0
+    from_pom :description, "description", 0
+    from_pom :license, "licenses", 0, "license", 0, "name", 0
+    from_pom :url, "url", 0
+    constant_field :category, "Languages/Development/Java"
+    constant_field :architecture, "all"
+
+    private
+    def effective_pom
+      @effective_pom ||= @effective_pom_reader.read
+      @effective_pom
+    end
+
+    def self.recursive_lookup(target,*path)
+      if path.nil? || path.empty?
+        return target
+      elsif target.respond_to? :[]
+        first,*other=path
+        recursive_lookup(target[first],*other)
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/gpm/source/war.rb

@@ -0,0 +1,53 @@
+require_relative '../source'
+require_relative 'maven'
+
+require 'archive/zip'
+module Source
+
+  class PomFromWarFileReader < PomFileReader
+    POM_FILE_NAME = %r{^META-INF/maven/.*/pom\.xml$}
+
+    def initialize(warfile,options)
+      super(nil,options)
+      @warfile=warfile
+    end
+
+    def raw_pom
+      @logger.info "Extracting raw pom from #{warfile}..."
+      Archive::Zip.open(warfile) do |f|
+        #inspect war file to find pom.xml
+        pom_file_entries = f.select { |entry| entry.ftype == :file && entry.zip_path =~ POM_FILE_NAME }
+        raise "Wrong number of POM files (#{pom_file_entries.size}):\n #{pom_file_entries.join("\n")}" unless pom_file_entries.size == 1
+        #Write it to temporary file to maven can use it
+        extract_target = Tempfile.new("from_pom", work_dir).path
+        pom_file_entries.first.extract(:file_path => extract_target)
+        #Return the name of the temporary file
+        extract_target
+      end
+    end
+    private
+    attr_reader :warfile
+  end
+
+  module War
+    class Factory < Source::Base::Factory
+      def initialize(warfile, options={})
+        @warfile = File.expand_path(warfile)
+        @effective_pom_file_reader = effective_pom_file_reader_class.new(@warfile, options)
+        super(File.dirname(@warfile),options)
+      end
+
+      def effective_pom_file_reader_class
+        PomFromWarFileReader
+      end
+
+      def create
+        Maven.new(files_provider,options,@effective_pom_file_reader)
+      end
+
+      def files_providers
+        super + [FilesFromDirectoryProvider.new(directory, [File.basename(@warfile)])]
+      end
+    end
+  end
+end

data/lib/gpm/target.rb

@@ -4,12 +4,17 @@ require 'logger'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/class'
 require_relative 'file_path_and_permissions'
+require_relative 'has_directories'
+require_relative 'has_option_methods'
 
 require_relative 'target/generate_from_templates'
 require_relative 'target/zip_directories'
 require_relative 'io_helpers'
 module Target
   class Base
+    include HasDirectories
+    include HasOptionMethods
+
     PHASES = [:file_creation, :packaging]
     def self.phase_steps_names
       PHASES.collect {|p| field_name_for_steps p }
@@ -44,7 +49,7 @@ module Target
     def create_package(source)
       @origin_dir = Dir.getwd
       FileUtils.mkdir_p package_dir
-      ::Dir.chdir(package_dir) do
+      in_directory package_dir do
         self.class.phase_steps_names.each do |phase_name|
           steps_for_phase = self.class.send(phase_name)
           steps_for_phase.each do |step, description|

data/lib/gpm/target/deb.rb

@@ -45,19 +45,21 @@ class Target::Deb < Target::Base
     end
     def clean_package_name(name)
       if name =~ /[A-Z]/
-        @logger.warn("Debian tools (dpkg/apt) don't do well with packages " \
+        @logger.info("Debian tools (dpkg/apt) don't do well with packages " \
           "that use capital letters in the name. In some cases it will " \
           "automatically downcase them, in others it will not. It is confusing." \
           "Best to not use any capital letters at all.")
         name = name.downcase
       end
 
-      if name.include?("_")
-        @logger.debug("Package name '#{name}' includes underscores, converting" \
+      to_dash = /[._\s]/
+      if name =~ (to_dash)
+        @logger.info("Package name '#{name}' includes strange characters, (underscores or whitespace, e.g.) converting" \
                      " to dashes")
-        name = name.gsub(/[_]/, "-")
+        name = name.gsub(to_dash, "-")
       end
 
+
       return name
     end
     def architecture

data/lib/gpm/target/generate_from_templates.rb

@@ -1,5 +1,6 @@
 require_relative 'step_plugin'
 require_relative '../file_path_and_permissions'
+require 'zlib'
 module GenerateFromTemplates
   include StepPlugin
   def self.included(base)
@@ -50,7 +51,7 @@ module GenerateFromTemplates
     contents = template.result(source.instance_eval{ binding() })
     if file.end_with?(".gz")
       zipped = ""
-      gz = Zlib::GzipWriter.new(StringIO.new(zipped))
+      gz = ::Zlib::GzipWriter.new(StringIO.new(zipped))
       gz.write contents
       gz.close
       contents = zipped

data/templates/deb/control.tar.gz.dir/control.erb

@@ -1,7 +1,7 @@
 Package: <%= name %>
 Version: <%= "#{epoch}:" if epoch %><%= version %><%= build_number && '-b'+build_number.to_s %>
 Architecture: <%= architecture %>
-Maintainer: <%= maintainer or "<unknown>" %><%= " <#{email}>".gsub(" <>","") %>
+Maintainer: <%= maintainer.to_s.empty? ? "unknown" : maintainer %><%= email.to_s.empty? ? " <unknown@unknown.com>" : " <#{email}>" %>
 <% if !dependencies.empty? -%>
 <%   properdeps = dependencies.collect { |d| fix_dependency(d) }.flatten -%>
 Depends: <%= properdeps.flatten.join(", ") %>

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: gpm
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
-- Martin Mauch
+- crealytics GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &73079020 !ruby/object:Gem::Requirement
+  requirement: &70850580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73079020
+  version_requirements: *70850580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &73078640 !ruby/object:Gem::Requirement
+  requirement: &70850210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *73078640
+  version_requirements: *70850210
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &73078380 !ruby/object:Gem::Requirement
+  requirement: &70849950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73078380
+  version_requirements: *70849950
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &70849700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70849700
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: &70849460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70849460
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &73078180 !ruby/object:Gem::Requirement
+  requirement: &70835610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73078180
+  version_requirements: *70835610
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &73077900 !ruby/object:Gem::Requirement
+  requirement: &70835320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +87,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *73077900
+  version_requirements: *70835320
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &73077650 !ruby/object:Gem::Requirement
+  requirement: &70835050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +98,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *73077650
+  version_requirements: *70835050
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &73077420 !ruby/object:Gem::Requirement
+  requirement: &70834760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +109,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *73077420
+  version_requirements: *70834760
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &73077180 !ruby/object:Gem::Requirement
+  requirement: &70834470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +120,10 @@ dependencies:
         version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *73077180
+  version_requirements: *70834470
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &73076950 !ruby/object:Gem::Requirement
+  requirement: &70834170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +131,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *73076950
+  version_requirements: *70834170
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &73076710 !ruby/object:Gem::Requirement
+  requirement: &70833840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +142,10 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *73076710
+  version_requirements: *70833840
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &73076480 !ruby/object:Gem::Requirement
+  requirement: &70833470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +153,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *73076480
+  version_requirements: *70833470
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &73076230 !ruby/object:Gem::Requirement
+  requirement: &70833180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,19 +164,20 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *73076230
+  version_requirements: *70833180
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!
-email: mauch@crealytics.de
+email: info@crealytics.de
 executables:
 - gpm
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/gpm/cli.rb
+- lib/gpm/source/war.rb
+- lib/gpm/source/maven.rb
 - lib/gpm/source/files_providers/composite_files_provider.rb
-- lib/gpm/source/files_providers/files_from_gem_directory_provider.rb
 - lib/gpm/source/files_providers/overrides_permissions.rb
 - lib/gpm/source/files_providers/vendored_gems_installer.rb
 - lib/gpm/source/files_providers/files_from_bundler_directory_provider.rb
@@ -165,7 +188,9 @@ files:
 - lib/gpm/packaging_task.rb
 - lib/gpm/gpm_logging.rb
 - lib/gpm/file_path_and_permissions.rb
+- lib/gpm/has_option_methods.rb
 - lib/gpm/target.rb
+- lib/gpm/has_directories.rb
 - lib/gpm/source.rb
 - lib/gpm/io_helpers.rb
 - lib/gpm/target/generate_from_templates.rb

data/lib/gpm/source/files_providers/files_from_gem_directory_provider.rb

@@ -1,13 +0,0 @@
-require_relative 'files_provider'
-module Source
-  class FilesFromGemDirectoryProvider < FilesProvider
-    attr_reader :directory
-    def initialize(directory,files)
-      @directory = directory
-      @files = files
-    end
-    def file_contents
-      read_file_contents @files, @directory
-    end
-  end
-end