Clean up jruby-jars gem to get a 1.3.1 release out.

jruby · Aug 25, 2009 · 9b8dd53ab5f9738e30c3b23fd099e0182c0672b4 · 9b8dd53
1 parent 2fd6c3d
commit 9b8dd53ab5f9738e30c3b23fd099e0182c0672b4
Unified Split

Showing with 54 additions and 17 deletions.

+6 −0 gem/DEV_INSTRUCTIONS

+2 −4 gem/History.txt

+3 −1 gem/Manifest.txt

+13 −8 gem/README.txt

+22 −1 gem/Rakefile

+5 −3 gem/lib/jruby-jars.rb

+3 −0 gem/lib/jruby-jars/version.rb
diff --git a/gem/DEV_INSTRUCTIONS b/gem/DEV_INSTRUCTIONS
@@ -0,0 +1,6 @@
+In order to build a new jruby-jars gem, here is the process:
+
+* Run 'rake update' to update the version.rb file and generate the jar files
+* Run 'rake gem' and other Hoe targets as normal
+
+The 'update' task will update version.rb and create the jar files. You may commit the contents of the version.rb file, but it is not a requirement. However update should always be run before building the gem to ensure the latest code is pulled in.
diff --git a/gem/History.txt b/gem/History.txt
@@ -1,6 +1,4 @@
-=== 1.0.0 / 2008-08-17
+=== 1.3.1 / 2009-08-24
 
-* 1 major enhancement
-
-  * Birthday!
+* JRuby 1.3.1 version, and initial gem release
 
diff --git a/gem/Manifest.txt b/gem/Manifest.txt
@@ -1,5 +1,7 @@
 History.txt
 Manifest.txt
 README.txt
-Rakefile
+lib/jruby-jars/version.rb
 lib/jruby-jars.rb
+lib/jruby-core-1.3.1.jar
+lib/jruby-stdlib-1.3.1.jar
diff --git a/gem/README.txt b/gem/README.txt
@@ -1,25 +1,30 @@
-= jruby
+= jruby-jars
 
 http://www.jruby.org
 
 == DESCRIPTION:
 
-JRuby is an implementation of the Ruby language atop the Java virtual machine.
+This gem includes the core JRuby code and the JRuby 1.8 stdlib as jar files.
+It provides a way to have other gems depend on JRuby without including (and
+freezing to) a specific jruby-complete jar version.
 
 == FEATURES/PROBLEMS:
 
-This is the initial release of JRuby as a gem. The version number does not yet
-reflect the actual JRuby version packaged for now, but it may in the future.
+* JRuby core and JRuby stdlib as jars
+* a jruby-jars.rb that provides the filesystem paths to those jars
 
 == SYNOPSIS:
 
-The gem installs a 'jruby' command that runs JRuby. Otherwise it acts like Ruby.
+To get the full path to the core and stdlib jars:
+
+  require 'jruby-jars'
+
+  puts JRubyJars.core_jar_path # => path to jruby-core-VERSION.jar
+  puts JRubyJars.stdlib_jar_path # => path to jruby-stdlib-VERSION.jar
 
 == REQUIREMENTS:
 
-The only requirement is that you have a JVM available on the system, and that
-either the JAVA_HOME env var points at that JVM installation or 'java' command
-is available in PATH.
+A Ruby implementation with working RubyGems.
 
 == INSTALL:
 
diff --git a/gem/Rakefile b/gem/Rakefile
@@ -15,7 +15,9 @@ file 'pkg/jruby-complete.jar' => "pkg" do
   end
 end
 
-task :prepare => ['pkg/jruby-complete.jar', "pkg/jruby-jars-#{JRUBY_VERSION}/lib"] do
+desc "Run to update jars and versions"
+task :update => ['pkg/jruby-complete.jar', "pkg/jruby-jars-#{JRUBY_VERSION}/lib"] do
+  rm_f 'lib/*.jar'
   %w(pkg/jruby-complete pkg/jruby-core).each {|d| rm_rf d; mkdir_p d }
   Dir.chdir("pkg/jruby-complete") do
     sh "jar xf ../jruby-complete.jar"
@@ -24,6 +26,25 @@ task :prepare => ['pkg/jruby-complete.jar', "pkg/jruby-jars-#{JRUBY_VERSION}/lib
   sh "jar cfm pkg/jruby-jars-#{JRUBY_VERSION}/lib/jruby-core-#{JRUBY_VERSION}.jar pkg/jruby-complete/META-INF/MANIFEST.MF -C pkg/jruby-core ."
   rm "pkg/jruby-complete/META-INF/MANIFEST.MF"
   sh "jar cf pkg/jruby-jars-#{JRUBY_VERSION}/lib/jruby-stdlib-#{JRUBY_VERSION}.jar -C pkg/jruby-complete ."
+  cp "pkg/jruby-jars-#{JRUBY_VERSION}/lib/jruby-core-#{JRUBY_VERSION}.jar", 'lib'
+  cp "pkg/jruby-jars-#{JRUBY_VERSION}/lib/jruby-stdlib-#{JRUBY_VERSION}.jar", 'lib'
+
+  mkdir_p 'lib/jruby-jars'
+  File.open('lib/jruby-jars/version.rb', 'w') do |file|
+    file.write("module JRubyJars\n  VERSION = '#{JRUBY_VERSION}'\nend")
+  end
+
+  File.open('Manifest.txt', 'w') do |file|
+    file.write <<EOS
+History.txt
+Manifest.txt
+README.txt
+lib/jruby-jars/version.rb
+lib/jruby-jars.rb
+lib/jruby-core-#{JRUBY_VERSION}.jar
+lib/jruby-stdlib-#{JRUBY_VERSION}.jar
+EOS
+  end
 end
 
 Hoe.new('jruby-jars', JRUBY_VERSION) do |p|
diff --git a/gem/lib/jruby-jars.rb b/gem/lib/jruby-jars.rb
@@ -1,11 +1,13 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'jruby-jars/version.rb')
+
 module JRubyJars
   PATH = File.expand_path(File.dirname(__FILE__))
 
-  def self.jruby_jar_path
-    PATH + "/jruby-#{JRUBY_VERSION}.jar"
+  def self.core_jar_path
+    PATH + "/jruby-core-#{VERSION}.jar"
   end
 
   def self.stdlib_jar_path
-    PATH + "/jruby-stdlib-#{JRUBY_VERSION}.jar"
+    PATH + "/jruby-stdlib-#{VERSION}.jar"
   end
 end
diff --git a/gem/lib/jruby-jars/version.rb b/gem/lib/jruby-jars/version.rb
@@ -0,0 +1,3 @@
+module JRubyJars
+  VERSION = '1.3.1'
+end