Skip to content
This repository

Two issues fixed: ruby 1.9 compatibility fix and gemspecs failed to require files. #213

Closed
wants to merge 1 commit into from

3 participants

Jeremy Deininger Uwe Kubosch andredlight
Jeremy Deininger
Collaborator

These small fixes enable me to build ruboto using Ruby 1.9. I've seen others hit the same issue in irc.

Uwe Kubosch
Owner
donv commented July 15, 2012

Hi @jeremyd !

Thanks for the patch! I am starting work on getting it merged.

Can you tell me which tests failed before your fix? I have not tested with Ruby 1.9 myself. I will probably add tests configurations for Ruby 1.9 at http://ci.jruby.org/view/Ruboto in the future.

Also, I think adding a specific check for Ruby 1.9.1 will get cluttered when we later add more cases. I think you can just replace 1.8/1.9.1 with an asterisk (*). That will catch the JRuby 1.7 variant "shared" as well. Can you change that?

Jeremy Deininger
Collaborator

It failed when running rake gem to build the ruboto gem. "rake gem". I'll see if I can find a solution that covers all rubies.

Uwe Kubosch
Owner
donv commented July 23, 2012

I have started testing with multiple Rubies at http://ci.jruby.org/view/Ruboto As soon as the tests are running reliably, I'll merge and verify your changes.

Uwe Kubosch
Owner
donv commented July 23, 2012

@jeremyd could you pull the latest changes form master and refresh your pull request so it can be merged automatically?

Uwe Kubosch
Owner
donv commented July 25, 2012

@jeremyd I added all your changes to master. Check it out!

Uwe Kubosch donv closed this July 25, 2012
Uwe Kubosch
Owner
donv commented August 02, 2012

@jeremyd thanks for your contribution. Would you like to join the Ruboto project? Commit rights and glory await you!

andredlight

Sure! :) How do I join the project more than already?

Jeremy Deininger
Collaborator

Sure! :) How do I join the project more than already? (wrong account in previous comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Jul 08, 2012
Fix for ruby1.9 compatibility. Fix for require of relative files in g…
…emspecs.
48f670a
This page is out of date. Refresh to see the latest.
10  assets/rakelib/ruboto.rake
@@ -207,7 +207,15 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
207 207
 
208 208
   FileUtils.mkdir_p BUNDLE_PATH
209 209
   sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH}"
210  
-  gem_path = Dir["#{BUNDLE_PATH}/*ruby/1.8/gems"][0]
  210
+  
  211
+  if gem_path = Dir["#{BUNDLE_PATH}/*ruby/1.8/gems"][0]
  212
+    puts "Found gems for Ruby 1.8.  Using ruby 1.8."
  213
+  elsif gem_path = Dir["#{BUNDLE_PATH}/*ruby/1.9.1/gems"][0]
  214
+    puts "Found gems for Ruby 1.9.1.  Using ruby 1.9."
  215
+  else
  216
+    puts "FATAL: gem_path could not be found.  Exiting."
  217
+    exit 1
  218
+  end
211 219
 
212 220
   if package != 'org.ruboto.core' && JRUBY_JARS.none? { |f| File.exists? f }
213 221
     Dir.chdir gem_path do
2  ruboto-core.gemspec
... ...
@@ -1,5 +1,5 @@
1 1
 require 'rake'
2  
-require 'lib/ruboto/version'
  2
+require File.join(File.dirname(__FILE__), 'lib', 'ruboto', 'version')
3 3
 
4 4
 Gem::Specification.new do |s|
5 5
   s.name = %q{ruboto-core}
2  ruboto.gemspec
... ...
@@ -1,5 +1,5 @@
1 1
 require 'rake'
2  
-require 'lib/ruboto/version'
  2
+require File.join(File.dirname(__FILE__), 'lib', 'ruboto', 'version')
3 3
 
4 4
 Gem::Specification.new do |s|
5 5
   s.name = %q{ruboto}
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.