ruboto 0.5.3 → 0.5.4

data/Gemfile

@@ -1,4 +1,5 @@
 source :rubygems
 
+gem 'rake'
 gem 'main'
 gem 'jruby-jars'

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
       fattr (~> 2.2.0)
       map (~> 5.1.0)
     map (5.1.0)
+    rake (0.9.2.2)
 
 PLATFORMS
   java
@@ -19,3 +20,4 @@ PLATFORMS
 DEPENDENCIES
   jruby-jars
   main
+  rake

data/Rakefile

@@ -11,17 +11,6 @@ GEM_FILE_OLD = "ruboto-core-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
 GEM_SPEC_FILE_OLD = 'ruboto-core.gemspec'
 
-# FIXME(uwe):  Remove when we stop supporting JRuby 1.5.6
-if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
-  gem_spec = Gem::Specification.find_by_path 'jruby-jars'
-else
-  gem_spec = Gem.searcher.find('jruby-jars')
-end
-raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
-JRUBY_JARS_VERSION = gem_spec.version
-ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
-# FIXME end
-
 CLEAN.include('ruboto-*.gem', 'tmp')
 
 task :default => :gem

data/assets/src/RubotoActivity.java

@@ -73,7 +73,7 @@ THE_CONSTANTS
         }
     }
 
-    // This causes JRuby to initialize and takes while
+    // This causes JRuby to initialize and takes a while.
     protected void prepareJRuby() {
         Script.put("$context", this);
         Script.put("$activity", this);

data/lib/ruboto/commands/base.rb

@@ -320,7 +320,7 @@ module Ruboto
             }
 
             option("force") {
-              description "force and update even if the version hasn't changed"
+              description "force an update even if the version hasn't changed"
             }
 
             def run

data/lib/ruboto/util/update.rb

@@ -134,14 +134,23 @@ EOF
       def update_jruby(force=nil)
         jruby_core = Dir.glob("libs/jruby-core-*.jar")[0]
         jruby_stdlib = Dir.glob("libs/jruby-stdlib-*.jar")[0]
-        new_jruby_version = JRubyJars::VERSION
 
         unless force
           if !jruby_core || !jruby_stdlib
             puts "Cannot find existing jruby jars in libs. Make sure you're in the root directory of your app."
             return false
           end
+        end
+
+        begin
+          require 'jruby-jars'
+        rescue LoadError
+          puts "Could not find the jruby-jars gem.  You need it to include JRuby in your app.  Please install it using\n\n    gem install jruby-jars\n\n"
+          return false
+        end
+        new_jruby_version = JRubyJars::VERSION
 
+        unless force
           current_jruby_version = jruby_core ? jruby_core[16..-5] : "None"
           if current_jruby_version == new_jruby_version
             puts "JRuby is up to date at version #{new_jruby_version}. Make sure you 'gem update jruby-jars' if there is a new version."
@@ -179,7 +188,7 @@ EOF
           FileUtils.rm_rf old_scripts_dir
         end
         # FIXME end
-        
+
       end
 
       def update_icons(force = nil)
@@ -351,7 +360,7 @@ EOF
               #  `jar -cf ../jruby-core-#{dir.gsub('/', '.')}-#{jruby_core_version}.jar #{dir}`
               #  FileUtils.rm_rf dir
               #end
-              
+
               `jar -cf ../#{jruby_core} .`
             end
             FileUtils.remove_dir "tmp", true

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/ruboto.rb

@@ -5,7 +5,6 @@ Ruboto.enable_objectspace
 require 'main'
 require 'fileutils'
 require 'rexml/document'
-require 'jruby-jars'
 
 require 'ruboto/util/main_fix'
 

data/test/test_helper.rb

@@ -7,31 +7,24 @@ module RubotoTest
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
-  # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
-  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
-    gem_spec = Gem::Specification.find_by_path 'jruby-jars'
-  else
-    gem_spec = Gem.searcher.find('jruby-jars')
-  end
-  # FIXME end
-  
-  raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
-  JRUBY_JARS_VERSION = gem_spec.version
-
-  # FIXME(uwe): Remove when we stop supporting JRuby 1.5.6
-  ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
-
-  PACKAGE = 'org.ruboto.test_app'
-  APP_NAME = 'RubotoTestApp'
-  TMP_DIR = File.join PROJECT_DIR, 'tmp'
-  APP_DIR = File.join TMP_DIR, APP_NAME
+  GEM_PATH = File.join PROJECT_DIR, 'tmp', 'gems'
+  FileUtils.mkdir_p GEM_PATH
+  ENV['GEM_HOME'] = GEM_PATH
+  ENV['GEM_PATH'] = GEM_PATH
+  system 'gem install bundler'
+  system 'bundle'
+
+  PACKAGE        = 'org.ruboto.test_app'
+  APP_NAME       = 'RubotoTestApp'
+  TMP_DIR        = File.join PROJECT_DIR, 'tmp'
+  APP_DIR        = File.join TMP_DIR, APP_NAME
   ANDROID_TARGET = ENV['ANDROID_TARGET'] || 'android-7'
 
   VERSION_TO_API_LEVEL = {
-      '2.1' => 'android-7', '2.1-update1' => 'android-7', '2.2' => 'android-8',
-      '2.3' => 'android-9', '2.3.1' => 'android-9', '2.3.2' => 'android-9',
+      '2.1'   => 'android-7', '2.1-update1' => 'android-7', '2.2' => 'android-8',
+      '2.3'   => 'android-9', '2.3.1' => 'android-9', '2.3.2' => 'android-9',
       '2.3.3' => 'android-10', '2.3.4' => 'android-10',
-      '3.0' => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
+      '3.0'   => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
       '4.0.1' => 'android-14', '4.0.3' => 'android-15',
   }
 
@@ -41,7 +34,7 @@ module RubotoTest
     start = Time.now
     IO.popen('adb bugreport').each_line do |line|
       if line =~ /sdk-eng (.*?) .*? .*? test-keys/
-        version = $1
+        version   = $1
         api_level = VERSION_TO_API_LEVEL[version]
         raise "Unknown version: #{version}" if api_level.nil?
         puts "Getting version from device/emulator took #{(Time.now - start).to_i}s"
@@ -54,6 +47,12 @@ module RubotoTest
     raise "Unable to read device/emulator apilevel"
   end
 
+  def install_jruby_jars_gem
+    system "gem install jruby-jars #{"-v #{ENV['JRUBY_JARS_VERSION']}" if ENV['JRUBY_JARS_VERSION']}"
+    raise "install of jruby-jars failed with return code #$?" unless $? == 0
+    system %Q{gem uninstall jruby-jars --all -v "!=#{ENV['JRUBY_JARS_VERSION']}"} if ENV['JRUBY_JARS_VERSION']
+  end
+
   ANDROID_OS = ENV['ANDROID_OS'] || version_from_device
   RUBOTO_CMD = "ruby -rubygems -I #{PROJECT_DIR}/lib #{PROJECT_DIR}/bin/ruboto"
 
@@ -62,6 +61,24 @@ end
 
 class Test::Unit::TestCase
   include RubotoTest
+  extend RubotoTest
+
+  install_jruby_jars_gem
+
+  # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
+    gem_spec = Gem::Specification.find_by_path 'jruby-jars'
+  else
+    gem_spec = Gem.searcher.find('jruby-jars')
+  end
+  # FIXME end
+
+  raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
+  JRUBY_JARS_VERSION  = gem_spec.version
+
+  # FIXME(uwe): Remove when we stop supporting JRuby 1.5.6
+  ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
+
   alias old_run run
 
   def run(*args, &block)
@@ -91,7 +108,7 @@ class Test::Unit::TestCase
   end
 
   def generate_app(options = {})
-    update = options.delete(:update) || false
+    update           = options.delete(:update) || false
     excluded_stdlibs = options.delete(:excluded_stdlibs)
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
@@ -107,11 +124,13 @@ class Test::Unit::TestCase
     end
 
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
-    template_dir = "#{APP_DIR}_template_#{$$}#{'_updated' if update}#{"_without_#{excluded_stdlibs.map{|ed| ed.gsub(/[.\/]/, '_')}.join('_')}" if excluded_stdlibs}"
+    template_dir = "#{APP_DIR}_template_#{$$}#{'_updated' if update}#{"_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs}"
     if File.exists?(template_dir)
       puts "Copying app from template #{template_dir}"
       FileUtils.cp_r template_dir, APP_DIR, :preserve => true
     else
+      install_jruby_jars_gem
+
       if update
         Dir.chdir TMP_DIR do
           system "tar xzf #{PROJECT_DIR}/examples/RubotoTestApp_0.1.0_jruby_1.6.3.dev.tgz"
@@ -129,6 +148,10 @@ class Test::Unit::TestCase
           assert_equal 0, $?, "update app failed with return code #$?"
         end
       else
+        unless excluded_stdlibs
+          system 'gem uninstall jruby-jars --all'
+          assert_equal 0, $?, "uninstall of jruby-jars failed with return code #$?"
+        end
         puts "Generating app #{APP_DIR}"
         system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target #{ANDROID_TARGET}"
         if $? != 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main