jruby-jars 1.7.16.2 → 1.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a109f95a32740baca08b5894aeeaba3be9ea69d7
-  data.tar.gz: 4cff49ebef6bfabd1a31c3dd165e8bb4e08f633a
+  metadata.gz: 897c3a89232f237b0457d16e8d0ac4fecbfa0ab5
+  data.tar.gz: f5e2f7f9074a5ea74ab7f5e7d7f7637da240725e
 SHA512:
-  metadata.gz: b36d9050b8c4b69c0a01fda1596fa3e868ea7b3b6bb3b4e2cb0f345d9ad7cd57a02b8796103d05993be615d68e0fb772f3247c22501470e46a694b3ff6a74d8c
-  data.tar.gz: 0c5d6b77458210f7ae10cd3d4d30408b57c408453ab01fe17f39760930c57c7ea9e6bf67b743cd48b42b0ab93f3f771d8a0453231cab9d960437171ef582116a
+  metadata.gz: 43c8e4069ed9a45dc5d30eac16e3e35626ca2c42e456de310f1431bfa7c58a6e3fd980ab3e7cc84da068951bf622f43c29fb4e3c383cca3c0d3a69948867e151
+  data.tar.gz: bae4d0619ff57fa86831b8a95918f182d762562b3fffffc388e714584d065e156975fc733920a7623c3c3431ea39dc0b4d1fe04953a8c641930f3d2c1ef6b05a

data/Mavenfile

@@ -1,16 +1,19 @@
 #-*- mode: ruby -*-
+require 'fileutils'
+
 gemspec
 
-ruby_version = model.version
+version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
 
-inherit "org.jruby:jruby-artifacts:#{ruby_version.sub( /.dev$/, '-SNAPSHOT' )}"
+inherit "org.jruby:jruby-artifacts:#{version}"
+
+ruby_version = model.version
 
 model.version = nil
 
 name "JRuby Jars Gem"
 
-jar 'org.jruby:jruby-core-complete', '${project.parent.version}'
-jar 'org.jruby:jruby-stdlib-complete', '${project.parent.version}'
+jar 'org.jruby:jruby-stdlib', '${project.parent.version}'
 
 plugin( :clean, '2.5' ) do
   execute_goals( :clean,
@@ -22,11 +25,27 @@ plugin( :clean, '2.5' ) do
 end
 
 properties( 'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readOnly' => true,
+            'tesla.dump.readonly' => true,
+            'jruby.plugins.version' => '1.0.7',
+            # we share the already installed gems
+            'gem.home' => '${jruby.home}/lib/ruby/gems/shared',
             'jruby.home' => '${basedir}/../../' )
 
+execute 'copy jruby.jar', 'prepare-package' do |ctx|
+  FileUtils.cp( File.join( ctx.project.properties[ 'jruby.home' ],
+                           'lib',
+                           'jruby.jar' ),
+                File.join( ctx.project.basedir.to_s, 
+                           'lib',
+                           "jruby-core-#{ctx.project.version}.jar" ) )
+end
+
+# do not push the gem during deploy phase
+# the bang reuses the plugin declaration which is already in place and
+# adds the extra execute_goal to it
 jruby_plugin!( :gem,
                :gemspec => 'jruby-jars.gemspec',
+               # tell maven to include the jar files into gem
                :includeDependencies => true ) do
   execute_goals :id => 'default-push', :skip => true
 end
@@ -35,21 +54,6 @@ build do
   final_name "${project.artifactId}-#{ruby_version}"
 end
 
-# TODO remove once gem-maven-plugin honors the final_name
-plugin :install, :skip => true
-execute 'rename gem file', :verify do |ctx|
-  require 'fileutils'
-  FileUtils.rm_rf(Dir["#{ctx.project.build.directory}/*.gem"])
-  FileUtils.mv(Dir["#{ctx.project.basedir}/*.gem"], ctx.project.build.directory)
-end
+plugin :invoker, :properties => { 'ruby.version' => ruby_version, 'gem.home' => '${project.build.directory}/rubygems', 'gem.path' => '${project.build.directory}/rubygems' }
 
-plugin( :invoker,
-        :projectsDirectory => 'src/it',
-        :cloneProjectsTo => '${project.build.directory}/it',
-        :postBuildHookScript => 'verify.bsh',
-        :streamLogs => true ) do
-  execute_goals( :install, :run )
-#  :settingsFile => '${basedir}/src/it/settings.xml', 
-#  :localRepositoryPath => '${project.build.directory}/local-repo' )
-end
 # vim: syntax=Ruby

data/jruby-jars.gemspec

@@ -0,0 +1,34 @@
+#-*- mode: ruby -*-
+
+require 'rake'
+require 'rexml/document'
+require 'rexml/xpath'
+
+version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
+
+# this regexp can be refined to work with pre, rc1, rc2 and such cases
+ruby_version = version.sub( /-SNAPSHOT$/, '.dev' )
+
+File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|
+  f.print <<EOF
+module JRubyJars
+  VERSION = '#{ruby_version}'
+  MAVEN_VERSION = '#{version}'
+end
+EOF
+end
+
+Gem::Specification.new do |s|
+  s.name = 'jruby-jars'
+  s.version = ruby_version
+  s.authors = ['Charles Oliver Nutter']
+  s.email = 'headius@headius.com'
+  s.summary = 'The core JRuby code and the JRuby stdlib as jar files.'
+  s.homepage = 'http://github.com/jruby/jruby/tree/master/gem/jruby-jars'
+  s.description = File.read('README.txt', encoding: 'UTF-8').split(/\n{2,}/)[3]
+  s.rubyforge_project = 'jruby/jruby'
+  s.licenses = %w(EPL-1.0 GPL-2.0 LGPL-2.1)
+  s.files = Dir['[A-Z]*'] + Dir['lib/**/*.rb'] + Dir[ "lib/jruby-*-#{version}*.jar" ] + Dir[ 'test/**/*'] + [ 'jruby-jars.gemspec' ]
+end
+
+# vim: syntax=Ruby

data/lib/jruby-jars.rb

@@ -4,10 +4,10 @@ module JRubyJars
   PATH = File.expand_path(File.dirname(__FILE__))
 
   def self.core_jar_path
-    "#{PATH}/jruby-core-complete-#{JRubyJars::MAVEN_VERSION}.jar"
+    "#{PATH}/jruby-core-#{JRubyJars::MAVEN_VERSION}.jar"
   end
 
   def self.stdlib_jar_path
-    "#{PATH }/jruby-stdlib-complete-#{JRubyJars::MAVEN_VERSION}.jar"
+    "#{PATH }/jruby-stdlib-#{JRubyJars::MAVEN_VERSION}.jar"
   end
 end

data/lib/jruby-jars/version.rb

@@ -1,5 +1,4 @@
 module JRubyJars
-  MAVEN_VERSION = Dir[File.expand_path(File.dirname(File.dirname(__FILE__))) + '/jruby-core-complete-*jar' ].
-      first.gsub(/^.*jruby-core-complete-|.jar$/, '')
-  VERSION = MAVEN_VERSION.sub('-SNAPSHOT', '.dev').gsub('-', '.')
+  VERSION = '1.7.17'
+  MAVEN_VERSION = '1.7.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-jars
 version: !ruby/object:Gem::Version
-  version: 1.7.16.2
+  version: 1.7.17
 platform: ruby
 authors:
 - Charles Oliver Nutter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies: []
 description: |-
   This gem includes the core JRuby code and the JRuby 1.8/1.9 stdlib as jar files.
@@ -24,8 +24,9 @@ files:
 - README.txt
 - lib/jruby-jars.rb
 - lib/jruby-jars/version.rb
-- lib/jruby-core-complete-1.7.16.2.jar
-- lib/jruby-stdlib-complete-1.7.16.2.jar
+- lib/jruby-core-1.7.17.jar
+- lib/jruby-stdlib-1.7.17.jar
+- jruby-jars.gemspec
 homepage: http://github.com/jruby/jruby/tree/master/gem/jruby-jars
 licenses:
 - EPL-1.0