jruby-launcher 1.0.7-java → 1.0.8-java

data/Rakefile

@@ -2,12 +2,14 @@ require 'rake/gempackagetask'
 require 'date'
 
 begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new
+  gem 'rspec'
+  require 'rspec/core/rake_task'
+  desc "Runs Java Integration Specs"
+  RSpec::Core::RakeTask.new
   task :default => :spec
 rescue LoadError
   task :default do
-    puts "rspec 1.3.0 or higher is not installed; skipping jruby-launcher specs"
+    puts "rspec 2.0.0 or higher is not installed; skipping jruby-launcher specs"
   end
 end
 

data/argparser.cpp

@@ -226,6 +226,9 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
         javaOptions.push_back("-Dfile.encoding=UTF-8");
     }
 #endif
+    if (getenv("VERIFY_JRUBY") != NULL) {
+        noBootClassPath = true;
+    }
 
     addToArgList(args, argc, argv);
 
@@ -356,11 +359,7 @@ void ArgParser::prepareOptions() {
 #ifdef WIN32
     option += "cmd.exe";
 #else
-    const char* shell = getenv("SHELL");
-    if (shell == NULL) {
-        shell = "/bin/sh";
-    }
-    option += shell;
+    option += "/bin/sh";
 #endif
     javaOptions.push_back(option);
 

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/launcher_spec.rb

@@ -179,6 +179,13 @@ describe "JRuby native launcher" do
     args.grep(/Xbootclasspath/).should be_empty
   end
 
+  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
+    with_environment "VERIFY_JRUBY" => "true" do
+      args = jruby_launcher_args("-e true")
+      args.grep(/Xbootclasspath/).should be_empty
+    end
+  end
+
   # JRUBY-4709
   it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
     jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 require 'rbconfig'
 require 'fileutils'
 
@@ -60,7 +60,7 @@ module JRubyLauncherHelper
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
     JRubyLauncherHelper.check_executable_built
     # clear environment for better control

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.7"
+#define JRUBY_LAUNCHER_VERSION "1.0.8"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,68 +1,64 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-launcher
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
+  prerelease: 
+  version: 1.0.8
 platform: java
 authors: 
-- Nick Sieger
-- Vladimir Sizikov
+  - Nick Sieger
+  - Vladimir Sizikov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -06:00
+date: 2011-08-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: Builds and installs a native launcher for JRuby on your system
 email: 
-- nick@nicksieger.com
-- vsizikov@gmail.com
+  - nick@nicksieger.com
+  - vsizikov@gmail.com
 executables: []
 
 extensions: 
-- extconf.rb
+  - extconf.rb
 extra_rdoc_files: []
 
 files: 
-- COPYING
-- README.txt
-- Makefile
-- Rakefile
-- ng.c
-- strlcpy.c
-- argparser.cpp
-- jruby.cpp
-- jrubyexe.cpp
-- jvmlauncher.cpp
-- platformlauncher.cpp
-- unixlauncher.cpp
-- utilsfuncs.cpp
-- utilsfuncswin.cpp
-- argnames.h
-- argparser.h
-- jvmlauncher.h
-- nbexecloader.h
-- platformlauncher.h
-- rb_w32_cmdvector.h
-- unixlauncher.h
-- utilsfuncs.h
-- version.h
-- inc/Makefile-conf.mk
-- inc/Makefile-impl.mk
-- inc/Makefile-rules.mk
-- extconf.rb
-- lib/jruby-launcher.rb
-- lib/rubygems/defaults/jruby_native.rb
-- spec/launcher_spec.rb
-- spec/spec_helper.rb
-- resources/jruby.ico
-- resources/jruby.rc
+  - COPYING
+  - README.txt
+  - Makefile
+  - Rakefile
+  - ng.c
+  - strlcpy.c
+  - argparser.cpp
+  - jruby.cpp
+  - jrubyexe.cpp
+  - jvmlauncher.cpp
+  - platformlauncher.cpp
+  - unixlauncher.cpp
+  - utilsfuncs.cpp
+  - utilsfuncswin.cpp
+  - argnames.h
+  - argparser.h
+  - jvmlauncher.h
+  - nbexecloader.h
+  - platformlauncher.h
+  - rb_w32_cmdvector.h
+  - unixlauncher.h
+  - utilsfuncs.h
+  - version.h
+  - inc/Makefile-conf.mk
+  - inc/Makefile-impl.mk
+  - inc/Makefile-rules.mk
+  - extconf.rb
+  - lib/jruby-launcher.rb
+  - lib/rubygems/defaults/jruby_native.rb
+  - spec/launcher_spec.rb
+  - spec/spec_helper.rb
+  - resources/jruby.ico
+  - resources/jruby.rc
 has_rdoc: true
 homepage: http://jruby.org
 licenses: []
@@ -71,25 +67,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Native launcher for JRuby