ruby-maven 3.0.4.1.3 → 3.0.4.1.4

data/bin/rmvn

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 require 'maven/ruby/cli'
-require 'maven/ruby/pom_magic'
 
 mvn = Maven::Ruby::Cli.new
-magic = Maven::Ruby::PomMagic.new
 
 args = ARGV.dup
 ARGV.clear # clean up in case another script gets executed it gets clear ARGV

data/lib/ruby/maven/ruby.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/ruby/maven/ruby/Mavenfile

@@ -0,0 +1,7 @@
+#-*- mode: ruby -*-
+
+# lock down versions
+properties['jruby.version'] = '1.7.3'
+properties['jruby.plugins.version'] = '0.29.4'
+
+# vim: syntax=Ruby

data/lib/ruby/maven/ruby/Mavenfile~

@@ -0,0 +1,7 @@
+#-*- mode: ruby -*-
+
+# lock down versions
+properties['jruby.version'] = '1.7.2'
+properties['jruby.plugins.version'] = '0.29.3'
+
+# vim: syntax=Ruby

data/lib/ruby/maven/ruby/cli.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -129,7 +129,7 @@ module Maven
       def setup(dir = '.', *args)
         log(args)
         args = command_line(args.dup.flatten)
-        args = magic_pom(dir, *args) unless options.delete('--no-pom')
+        args = magic_pom(dir, *args)
         args
       end
 
@@ -140,9 +140,7 @@ module Maven
       protected
       
       def magic_pom(dir = '.', *args)
-        file = PomMagic.new.generate_pom(File.expand_path(dir), *args)
-        args += ['-f', file] if file && !(args.member?("-f") || args.member?("--file"))  
-        args.flatten     
+        PomMagic.new.generate_pom(File.expand_path(dir), *args) 
       end
 
       public
@@ -160,4 +158,4 @@ module Maven
       end
     end
   end
-end
+end

data/lib/ruby/maven/ruby/maven.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -27,6 +27,7 @@ module Maven
     
     def self.new(*args)
       warn "deprecated: use Maven::Ruby::Cli or Maven::Ruby::Maven instead"
+      require 'maven/ruby/cli'
       ::Maven::Ruby::Cli.new(*args)
     end
   end
@@ -141,4 +142,4 @@ module Maven
     end
   end
 
-end
+end

data/lib/ruby/maven/ruby/pom_magic.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -25,72 +25,108 @@ require 'maven/ruby/version'
 module Maven
   module Ruby
     class PomMagic
-
-      def initialize(pom = '.pom.xml')
-        @pom = pom
-      end
-
-      def new_rails_project
-        ::Maven::Tools::RailsProject.new
+      
+      def initialize( default_pom = '.pom.xml' )
+        @default_pom = default_pom
       end
 
-      def pom_xml(dir = '.')
-        File.join(dir, @pom)
+      def dump_pom( dir = '.', force = false, file = 'pom.xml' )
+        if force || !File.exists?( file )
+          generate_pom( dir, '--pom', file )
+        end
       end
 
-      def generate_pom(dir = '.', *args)
-        pom = nil
+      def generate_pom( dir = '.', *args )
         dir = File.expand_path( dir )
         Dir.chdir(dir) do
+          skip_some_files = false
           if index = (args.index("-f") || args.index("--file"))
             filename = args[index + 1]
             if filename =~ /.gemspec$/
+              skip_some_files = true
               proj = ::Maven::Tools::GemProject.new
               proj.load_gemspec(filename)
             elsif filename =~ /Gemfile/
+              skip_some_files = true
               proj = ::Maven::Tools::GemProject.new
               proj.load_gemfile(filename)
             end
           else
-            gemfiles = Dir[File.join('.', "*Gemfile")]
-            gemfiles.delete_if {|g| g =~ /.pom/}
-            if gemfiles.size > 0
-              proj =
-                if File.exists? File.join( 'config', 'application.rb' )
-                  new_rails_project
-                else
-                  ::Maven::Tools::GemProject.new
-                end
-              filename = gemfiles[0]
-              proj.load_gemfile(filename)
-            else
-              gemspecs = Dir[File.join('.', "*.gemspec")]
-              gemspecs.delete_if {|g| g =~ /.pom/}
-              if gemspecs.size > 0
-                proj = ::Maven::Tools::GemProject.new
-                filename = File.basename(gemspecs[0])
-                proj.load_gemspec(filename)
+            proj =
+              if File.exists? File.join( 'config', 'application.rb' )
+                ::Maven::Tools::RailsProject.new
+              else
+                ::Maven::Tools::GemProject.new
               end
-            end
           end
           if proj
-            proj.load_jarfile(File.join(File.dirname(filename), 'Jarfile'))
-            proj.load_gemfile(File.join(File.dirname(filename), 'Mavenfile'))
-            proj.add_defaults( :jruby_plugins => JRUBY_MAVEN_PLUGINS_VERSION )
-            pom = pom_xml(dir)
-            File.open(pom, 'w') do |f|
-              f.puts proj.to_xml
+
+            ensure_mavenfile( dir )
+
+            load_standard_files( dir, proj, skip_some_files )
+
+            pom_xml( dir, proj, args )
+
+          end
+        end
+      end
+
+      protected
+
+      def load_standard_files( dir, proj, skip_some_files = false )
+        gemspec = first_gemspec( dir ) unless skip_some_files
+        proj.load_gemspec( gemspec ) if gemspec
+        proj.load_gemfile( file( 'Gemfile', dir ) ) unless skip_some_files
+        proj.load_jarfile( file( 'Jarfile', dir ) )
+        proj.load_mavenfile( file( 'Mavenfile', dir ) )
+        proj.add_defaults
+      end
+
+      def ensure_mavenfile( dir, source = File.dirname( __FILE__ ), filter_map = {} )
+        mavenfile = File.join( dir, 'Mavenfile' )
+        unless File.exists?( mavenfile )
+          content = File.read( File.join( source, 'Mavenfile' ) )
+          File.open( mavenfile, 'w' ) do |f|
+            filter_map.each do |k,v|
+              content.gsub!( /#{k}/, v )
             end
+            f.puts content
           end
+          warn "created Mavenfile with some locked down versions."
+        end
+      end
+
+      def file( name, dir = '.' )
+        File.expand_path( File.join( dir, name ) )
+      end
+
+      def pom_xml( dir, proj, args )
+        dir ||= '.'
+        #index = args.index( '-f' ) || args.index( '--file' )
+        index = args.index( '--pom' )
+        name = args[ index + 1 ] if index
+        pom = File.join( dir, name || @default_pom )
+        File.open(pom, 'w') do |f|
+          f.puts proj.to_xml
+        end
+        f_index = args.index( '-f' ) || args.index( '--file' )
+        if f_index
+          args[ f_index + 1 ] = pom
+        elsif index
+          args[ index ] = '-f'
+        else
+          args += ['-f', pom]
         end
-        pom
+        args
       end
 
-      def dump_pom(dir = '.', force = false, file = 'pom.xml')
-        if force || !File.exists?(file)
-          FileUtils.cp(generate_pom(dir), file)
+      def first_gemspec( dir = '.' )
+        gemspecs = Dir[ File.join( dir, "*.gemspec" ) ]
+        if gemspecs.size > 0
+          File.expand_path( gemspecs[ 0 ] )
         end
       end
+
     end
   end
-end
+end

data/lib/ruby/maven/ruby/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -20,10 +20,13 @@
 #
 module Maven
   module Ruby
-    VERSION = '3.0.4.1.3'
+
+    VERSION = '3.0.4.1.4'
+
     # allow to overwrite the default from maven-tools
     # since jruby-maven-plugins depend on maven-tools and
     # default version in maven-tools is often behind
-    JRUBY_MAVEN_PLUGINS_VERSION = '0.29.3'
+    JRUBY_MAVEN_PLUGINS_VERSION = '0.29.4'
+
   end
 end

data/lib/ruby/ruby-maven.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/ruby/ruby_maven.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 mkristian
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

metadata

@@ -2,14 +2,14 @@
 name: ruby-maven
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 3.0.4.1.3
+  version: 3.0.4.1.4
 platform: ruby
 authors:
-- mkristian
+- Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -41,13 +41,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.3
     none: false
   prerelease: false
   type: :runtime
@@ -146,12 +146,14 @@ files:
 - lib/ruby/maven/ruby.rb
 - lib/ruby/maven/pom_magic.rb~
 - lib/ruby/maven/ruby/pom_magic.rb
+- lib/ruby/maven/ruby/Mavenfile~
 - lib/ruby/maven/ruby/cli.rb~
 - lib/ruby/maven/ruby/version.rb
 - lib/ruby/maven/ruby/cli.rb
 - lib/ruby/maven/ruby/pom_magic.rb~
 - lib/ruby/maven/ruby/version.rb~
 - lib/ruby/maven/ruby/maven.rb
+- lib/ruby/maven/ruby/Mavenfile
 - lib/ruby/maven/ruby/maven.rb~
 - MIT-LICENSE
 homepage: http://github.com/mkristian/ruby-maven