ruboto 0.9.0.rc.1 → 0.9.0

data/Gemfile

@@ -2,4 +2,3 @@ source :rubygems
 
 gem 'rake'
 gem 'main'
-# gem 'jruby-jars'

data/Rakefile

@@ -79,6 +79,7 @@ end
 desc 'Generate release docs for a given milestone'
 task :release_docs do
   raise "\n    This task requires Ruby 1.9 or newer to parse JSON as YAML.\n\n" if RUBY_VERSION == '1.8.7'
+  puts 'GitHub login:'
   begin
     require 'rubygems'
     require 'highline/import'
@@ -86,7 +87,7 @@ task :release_docs do
     pass = ask('password: ') { |q| q.echo = '*' }
   rescue
     print 'user name: ' ; user = STDIN.gets.chomp
-    print 'password : ' ; pass = STDIN.gets.chomp
+    print ' password: ' ; pass = STDIN.gets.chomp
   end
   require 'uri'
   require 'net/http'
@@ -118,6 +119,7 @@ task :release_docs do
   res = https.start { |http| http.request(req) }
   issues = YAML.load(res.body).sort_by { |i| i['number'] }
   milestone_name = issues[0] ? issues[0]['milestone']['title'] : "No issues for milestone #{milestone}"
+  milestone_description = issues[0] ? issues[0]['milestone']['description'] : "No issues for milestone #{milestone}"
   categories = {'Features' => 'feature', 'Bugfixes' => 'bug', 'Internal' => 'internal', 'Support' => 'support', 'Documentation' => 'documentation', 'Pull requests' => nil, 'Other' => nil}
   grouped_issues = issues.group_by do |i|
     labels = i['labels'].map { |l| l['name']}
@@ -132,7 +134,17 @@ task :release_docs do
     cat ||= 'Other'
     cat
   end
-  puts "\nNew in version #{milestone_name}:\n\n"
+  puts
+  puts "Subject: [ANN] Ruboto #{milestone_name} released!"
+  puts
+  puts "The Ruboto team is proud to announce the release of Ruboto #{milestone_name}."
+  puts
+  puts Ruboto::DESCRIPTION
+  puts
+  puts "New in version #{milestone_name}:\n"
+  puts
+  puts milestone_description
+  puts
   (categories.keys & grouped_issues.keys).each do |cat|
     puts "#{cat}:\n\n"
     grouped_issues[cat].each { |i| puts %Q{* Issue ##{i['number']} #{i['title']}} }
@@ -140,10 +152,39 @@ task :release_docs do
   end
   puts "You can find a complete list of issues here:\n\n"
   puts "* https://github.com/ruboto/ruboto/issues?state=closed&milestone=#{milestone}\n\n"
+  puts
+  puts <<EOF
+Installation:
+
+To use Ruboto, you need to install a Java JDK, the Android SDK, Apache ANT, and a Ruby implementation.  Then do (possibly as root)
+
+    gem install ruboto
+
+
+To create a project do
+
+    ruboto gen app --package <your.package.name>
+
+
+You can find an introductory tutorial at https://github.com/ruboto/ruboto/wiki/Getting-started-with-Ruboto
+
+If you have any problems or questions, come see us at http://ruboto.org/
+
+Enjoy!
+
+
+--
+The Ruboto Team
+http://ruboto.org/
+
+EOF
+
 end
 
 desc 'Fetch download stats form rubygems.org'
 task :stats do
+  require 'time'
+  require 'date'
   require 'rubygems'
   require 'uri'
   require 'net/http'
@@ -164,13 +205,14 @@ task :stats do
     req = Net::HTTP::Get.new(versions_uri.request_uri)
     res = https.start { |http| http.request(req) }
     versions = YAML.load(res.body).sort_by { |v| Gem::Version.new(v['number']) }
-    puts "\n#{gem}:\n#{versions.map { |v| "#{'%10s' % v['number']} #{v['downloads_count']}" }.join("\n")}"
+    puts "\n#{gem}:\n#{versions.map { |v| "#{Time.parse(v['built_at']).strftime('%Y-%m-%d')} #{'%10s' % v['number']} #{v['downloads_count']}" }.join("\n")}"
 
     versions.each do |v|
-      downloads_uri = URI("#{base_uri}/versions/#{gem}-#{v['number']}/downloads/search.yaml?from=2010-08-01&to=#{Date.today}")
+      downloads_uri = URI("#{base_uri}/versions/#{gem}-#{v['number']}/downloads/search.yaml?from=#{Time.parse(v['built_at']).strftime('%Y-%m-%d')}&to=#{Date.today}")
       req = Net::HTTP::Get.new(downloads_uri.request_uri)
       res = https.start { |http| http.request(req) }
       counts = YAML.load(res.body)
+      counts.delete_if{|date_str,count| count == 0}
       counts.each do |date_str, count|
         date = Date.parse(date_str)
         counts_per_month[date.year][date.month] += count
@@ -218,10 +260,10 @@ end
 
 desc "Push the gem to RubyGems"
 task :release => [:clean, :gem] do
-  output = `git status --porcelain`
-  raise "Workspace not clean!\n#{output}" unless output.empty?
-  sh "git tag #{Ruboto::VERSION}"
-  sh "git push --tags"
+  #output = `git status --porcelain`
+  #raise "Workspace not clean!\n#{output}" unless output.empty?
+  #sh "git tag #{Ruboto::VERSION}"
+  #sh "git push --tags"
   sh "gem push #{GEM_FILE}"
 
   examples_glob = "#{EXAMPLE_FILE.slice(/^.*?_\d+\.\d+\.\d+/)}*"
@@ -253,8 +295,8 @@ namespace :platform do
     sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} bin/ruboto gen app --package org.ruboto.core --name RubotoCore --with-jruby --path #{PLATFORM_PROJECT} --min-sdk #{Ruboto::SdkVersions::MINIMUM_SUPPORTED_SDK} --target #{Ruboto::SdkVersions::DEFAULT_TARGET_SDK}"
     Dir.chdir(PLATFORM_PROJECT) do
       manifest = REXML::Document.new(File.read(MANIFEST_FILE))
-      manifest.root.attributes['android:versionCode'] = '408'
-      manifest.root.attributes['android:versionName'] = '0.4.8'
+      manifest.root.attributes['android:versionCode'] = '409'
+      manifest.root.attributes['android:versionName'] = '0.4.9'
       manifest.root.attributes['android:installLocation'] = 'auto' # or 'preferExternal' ?
       File.open(MANIFEST_FILE, 'w') { |f| manifest.document.write(f, 4) }
       File.open('Gemfile.apk', 'w'){|f| f << "source :rubygems\n\ngem 'activerecord-jdbc-adapter'\n"}

data/assets/src/RubotoActivity.java

@@ -40,7 +40,7 @@ THE_CONSTANTS
 
     @Override
     public void onCreate(Bundle bundle) {
-        System.out.println("RubotoActivity onCreate(): " + getClass().getName());
+        System.out.println("THE_RUBOTO_CLASS onCreate(): " + getClass().getName());
         if (ScriptLoader.isCalledFromJRuby()) {
             super.onCreate(bundle);
             return;
@@ -55,14 +55,14 @@ THE_CONSTANTS
                 setTheme(configBundle.getInt("Theme"));
             }
             if (configBundle.containsKey("ClassName")) {
-                if (this.getClass().getName() == RubotoActivity.class.getName()) {
+                if (this.getClass().getName() == THE_RUBOTO_CLASS.class.getName()) {
                     scriptInfo.setRubyClassName(configBundle.getString("ClassName"));
                 } else {
                     throw new IllegalArgumentException("Only local Intents may set class name.");
                 }
             }
             if (configBundle.containsKey("Script")) {
-                if (this.getClass().getName() == RubotoActivity.class.getName()) {
+                if (this.getClass().getName() == THE_RUBOTO_CLASS.class.getName()) {
                     scriptInfo.setScriptName(configBundle.getString("Script"));
                 } else {
                     throw new IllegalArgumentException("Only local Intents may set script name.");

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -217,7 +217,11 @@ public class JRubyAdapter {
             throw new RuntimeException(iae);
         } catch (java.lang.reflect.InvocationTargetException ite) {
             if (isDebugBuild) {
-                throw ((RuntimeException) ite.getCause());
+                if (ite.getCause() instanceof RuntimeException) {
+                    throw ((RuntimeException) ite.getCause());
+                } else {
+                    throw ((Error) ite.getCause());
+                }
             } else {
                 return null;
             }
@@ -251,7 +255,7 @@ public class JRubyAdapter {
             System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
 
             // Uncomment these to debug/profile Ruby source loading
-            // System.setProperty("jruby.debug.loadService", "true");
+            System.setProperty("jruby.debug.loadService", "true");
             // System.setProperty("jruby.debug.loadService.timing", "true");
 
             // Used to enable JRuby to generate proxy classes
@@ -324,7 +328,16 @@ public class JRubyAdapter {
                   setOutputStream(output);
                 }
 
-                String jrubyHome = "file:" + apkName + "!";
+                String jrubyHome = "file:" + apkName + "!/jruby.home";
+
+                // FIXME(uwe): Remove when we stop supporting RubotoCore 0.4.7
+                Log.i("RUBOTO_CORE_VERSION_NAME: " + RUBOTO_CORE_VERSION_NAME);
+                if (RUBOTO_CORE_VERSION_NAME != null &&
+                        (RUBOTO_CORE_VERSION_NAME.equals("0.4.7") || RUBOTO_CORE_VERSION_NAME.equals("0.4.8"))) {
+                    jrubyHome = "file:" + apkName + "!";
+                }
+                // EMXIF
+
                 Log.i("Setting JRUBY_HOME: " + jrubyHome);
                 System.setProperty("jruby.home", jrubyHome);
 

data/assets/src/org/ruboto/Script.java

@@ -9,6 +9,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URL;
 
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -108,41 +109,30 @@ public class Script {
     }
 
     boolean exists() {
+        return getAbsolutePath() != null;
+    }
+
+    String getAbsolutePath() {
         for (String dir : scriptsDir) {
-            System.out.println("Checking file: " + dir + "/" + name);
-            if (new File(dir + "/" + name).exists()) {
-                return true;
+            String path = dir + "/" + name;
+            Log.d("Checking path: " + path);
+            if (new File(path).exists()) {
+                return "file:" + path;
             }
         }
-        try {
-            java.io.InputStream is = getClass().getClassLoader().getResourceAsStream(name);
-            System.out.println("Classpath resource: " + is);
-            if (is != null) {
-                is.close();
-                return true;
-            } else {
-                return false;
-            }
-        } catch (IOException ioex) {
-            System.out.println("Classpath resource exception: " + ioex);
-            return false;
+        URL url = getClass().getClassLoader().getResource(name);
+        Log.d("Classpath resource: " + url);
+        if (url != null) {
+            return url.toString();
         }
+        return null;
     }
 
     public String getContents() throws IOException {
         InputStream is = null;
         BufferedReader buffer = null;
         try {
-            for (String dir : scriptsDir) {
-                System.out.println("Checking file: " + dir + "/" + name);
-                if (new File(dir + "/" + name).exists()) {
-                    is = new java.io.FileInputStream(dir + "/" + name);
-                }
-            }
-            if (is == null) {
-                is = getClass().getClassLoader().getResourceAsStream(name);
-            }
-            buffer = new BufferedReader(new java.io.InputStreamReader(is), 8192);
+            buffer = new BufferedReader(new java.io.InputStreamReader(new URL(getAbsolutePath()).openStream()), 8192);
             StringBuilder source = new StringBuilder();
             while (true) {
                 String line = buffer.readLine();

data/assets/src/org/ruboto/ScriptLoader.java

@@ -11,7 +11,7 @@ public class ScriptLoader {
     */
     public static boolean isCalledFromJRuby() {
         StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-        int maxLookBack = Math.min(10, stackTraceElements.length);
+        int maxLookBack = Math.min(9, stackTraceElements.length);
         for(int i = 0; i < maxLookBack ; i++){
             if (stackTraceElements[i].getClassName().startsWith("org.jruby.javasupport.JavaMethod")) {
                 return true;
@@ -26,7 +26,7 @@ public class ScriptLoader {
                 System.out.println("Looking for Ruby class: " + component.getScriptInfo().getRubyClassName());
                 Object rubyClass = JRubyAdapter.get(component.getScriptInfo().getRubyClassName());
                 System.out.println("Found: " + rubyClass);
-                Script rubyScript = new Script(component.getScriptInfo().getScriptName());
+                final Script rubyScript = new Script(component.getScriptInfo().getScriptName());
                 Object rubyInstance;
                 if (rubyScript.exists()) {
                     rubyInstance = component;
@@ -61,7 +61,7 @@ public class ScriptLoader {
                             System.out.println("Set class: " + JRubyAdapter.get(component.getScriptInfo().getRubyClassName()));
                             Thread t = new Thread(new Runnable(){
                                 public void run() {
-                                    JRubyAdapter.setScriptFilename(component.getScriptInfo().getScriptName());
+                                    JRubyAdapter.setScriptFilename(rubyScript.getAbsolutePath());
                                     JRubyAdapter.runScriptlet(script);
                                 }
                             });
@@ -81,7 +81,7 @@ public class ScriptLoader {
                             }
                             JRubyAdapter.runScriptlet("$activity.instance_variable_set '@ruboto_java_class', '" + component.getScriptInfo().getRubyClassName() + "'");
                             JRubyAdapter.runScriptlet("puts %Q{$activity: #$activity}");
-                            JRubyAdapter.setScriptFilename(component.getScriptInfo().getScriptName());
+                            JRubyAdapter.setScriptFilename(rubyScript.getAbsolutePath());
                             JRubyAdapter.runScriptlet(script);
                         }
                     }

data/assets/src/ruboto/preference.rb

@@ -25,16 +25,6 @@ RubotoPreferenceActivity.class_eval do
       end
       rv
     end
-
-    def setup_preference_screen &block
-      @preference_screen_block = block
-    end
-
-    def on_create(bundle)
-      @parent = nil
-      setPreferenceScreen(instance_eval &@preference_screen_block) if @preference_screen_block
-      instance_eval { @finish_create_block.call } if @finish_create_block
-    end
 end
 
 Preference.class_eval do

data/lib/ruboto/commands/base.rb

@@ -58,16 +58,23 @@ module Ruboto
                 description "Generate the JRuby jars jar"
                 cast :boolean
               }
+              option('force') {
+                description 'Force creation of project even if the path exists'
+                cast :boolean
+              }
 
               def run
                 package = params['package'].value
                 name = params['name'].value || package.split('.').last.split('_').map{|s| s.capitalize}.join
+                name[0..0] = name[0..0].upcase
                 activity = params['activity'].value || "#{name}Activity"
                 path = params['path'].value || package.split('.').last
                 target = params['target'].value
                 min_sdk = params['min-sdk'].value || target
+                with_jruby = params['with-jruby'].value
+                force = params['force'].value
 
-                abort "Path (#{path}) must be to a directory that does not yet exist. It will be created." if File.exists?(path)
+                abort "Path (#{path}) must be to a directory that does not yet exist. It will be created." if !force && File.exists?(path)
                 abort "Target must match android-<number>: got #{target}" unless target =~ /^android-(\d+)$/
                 abort "Minimum Android api level is #{MINIMUM_SUPPORTED_SDK}: got #{target}" unless $1.to_i >= MINIMUM_SUPPORTED_SDK_LEVEL
 
@@ -96,9 +103,9 @@ module Ruboto
                   update_ruboto true
                   update_icons true
                   update_classes nil, true
-                  update_jruby true if params['with-jruby'].value
+                  update_jruby true if with_jruby
                   update_dx_jar true unless params['with-jruby'].value
-                  update_core_classes "exclude"
+                  update_core_classes 'include'
 
                   log_action("Generating the default Activity and script") do
                     generate_inheriting_file "Activity", activity, package
@@ -144,6 +151,7 @@ module Ruboto
 
               def run
                 name = params['name'].value
+                name[0..0] = name[0..0].upcase
                 script_name = params['script_name'].value || "#{underscore(name)}.rb"
                 klass = params['class'].value
 
@@ -346,12 +354,14 @@ module Ruboto
               when "app" then
                 force = params['force'].value
                 old_version = read_ruboto_version
-                if Gem::Version.new(old_version) < Gem::Version.new(Ruboto::UPDATE_VERSION_LIMIT)
+                if old_version && Gem::Version.new(old_version) < Gem::Version.new(Ruboto::UPDATE_VERSION_LIMIT)
                   puts "Detected old Ruboto version: #{old_version}"
                   puts "Will use Ruboto #{Ruboto::UPDATE_VERSION_LIMIT} to update it first."
                   `gem query -i -n ruboto -v #{Ruboto::UPDATE_VERSION_LIMIT}`
                   system "gem install ruboto -v #{Ruboto::UPDATE_VERSION_LIMIT}" unless $? == 0
+                  raise "Install of Ruboto #{Ruboto::UPDATE_VERSION_LIMIT} failed!" unless $? == 0
                   system "ruboto _#{Ruboto::UPDATE_VERSION_LIMIT}_ update app"
+                  raise "Ruboto update app to #{Ruboto::UPDATE_VERSION_LIMIT} failed!" unless $? == 0
                 end
                 update_android
                 update_test force
@@ -362,7 +372,7 @@ module Ruboto
                 update_jruby force
                 update_manifest nil, nil, force
                 update_icons force
-                update_core_classes "exclude"
+                update_core_classes 'include'
                 update_bundle
               when "jruby" then
                 update_jruby(params['force'].value, true) || abort

data/lib/ruboto/util/build.rb

@@ -37,7 +37,7 @@ module Ruboto
         unless force == "include"
           abort "#{klass} not available in minSdkVersion, added in #{element.attribute('api_added')}; use '--force include' to create it" if
             element.attribute('api_added') and element.attribute('api_added').to_i > verify_min_sdk.to_i
-          abort "#{klass} deprecated for targetSdkVersion, deprecatrd in #{element.attribute('deprecated')}; use '--force include' to create it" if
+          abort "#{klass} deprecated for targetSdkVersion, deprecated in #{element.attribute('deprecated')}; use '--force include' to create it" if
             element.attribute('deprecated') and element.attribute('deprecated').to_i <= verify_target_sdk.to_i
         end
 
@@ -55,9 +55,9 @@ module Ruboto
         target_api = verify_target_sdk.to_i
 
         # Remove methods changed outside of the scope of the sdk versions
-        methods = methods.select{|i| not i.attribute('api_added') or i.attribute('api_added').to_i <= target_api}
-        methods = methods.select{|i| not i.attribute('deprecated') or i.attribute('deprecated').to_i > min_api}
-        methods = methods.select{|i| not i.attribute('api_removed') or i.attribute('api_removed').to_i > min_api}
+        methods = methods.select{|i| !i.attribute('api_added') || (i.attribute('api_added').to_i <= target_api)}
+        methods = methods.select{|i| !i.attribute('deprecated') || (i.attribute('deprecated').to_i > min_api)}
+        methods = methods.select{|i| !i.attribute('api_removed') || (i.attribute('api_removed').to_i > min_api)}
 
         # Inform and remove methods that do not exist in one of the sdk versions
         methods = methods.select do |i|

data/lib/ruboto/util/update.rb

@@ -31,21 +31,24 @@ module Ruboto
 
       def update_test(force = nil)
         root = Dir.getwd
-        if !File.exists?("#{root}/test")
+        if !File.exists?("#{root}/test") || !File.exists?("#{root}/test/AndroidManifest.xml") || !File.exists?("#{root}/test/ant.properties")
           name = verify_strings.root.elements['string'].text.gsub(' ', '')
           puts "\nGenerating Android test project #{name} in #{root}..."
           system %Q{android create test-project -m "#{root.gsub('"', '\"')}" -n "#{name}Test" -p "#{root.gsub('"', '\"')}/test"}
           FileUtils.rm_rf File.join(root, 'test', 'src', verify_package.split('.'))
           puts "Done"
-        else
-          test_ant_properties_file = 'test/ant.properties'
-          test_ant_properties = File.read(test_ant_properties_file)
-          if test_ant_properties.gsub!(/^tested.project.dir=.*$/, 'tested.project.dir=../')
-            File.open(test_ant_properties_file, 'w') { |f| f << test_ant_properties }
-          end
         end
 
         Dir.chdir File.join(root, 'test') do
+          instrumentation_property = "test.runner=org.ruboto.test.InstrumentationTestRunner\n"
+          prop_file = 'ant.properties'
+          prop_lines = (prop_lines_org = File.read(prop_file)).dup
+          prop_lines.gsub!(/^tested.project.dir=.*$/, 'tested.project.dir=../')
+          prop_lines << instrumentation_property unless prop_lines.include? instrumentation_property
+          if prop_lines != prop_lines_org
+            File.open(prop_file, 'w') { |f| f << prop_lines }
+          end
+
           test_manifest = REXML::Document.new(File.read('AndroidManifest.xml')).root
           test_manifest.elements['application'].attributes['android:icon'] ||= '@drawable/ic_launcher'
           test_manifest.elements['instrumentation'].attributes['android:name'] = 'org.ruboto.test.InstrumentationTestRunner'
@@ -65,11 +68,6 @@ module Ruboto
           # end
 
           File.open("AndroidManifest.xml", 'w') { |f| test_manifest.document.write(f, 4) }
-          instrumentation_property = "test.runner=org.ruboto.test.InstrumentationTestRunner\n"
-
-          prop_file = 'ant.properties'
-          prop_lines = File.readlines(prop_file)
-          File.open(prop_file, 'a') { |f| f << instrumentation_property } unless prop_lines.include?(instrumentation_property)
 
           run_tests_override = <<-EOF
 <!-- BEGIN added by Ruboto -->
@@ -389,7 +387,7 @@ module Ruboto
               if jruby_core_version >= '1.7.0'
                 excluded_core_packages = [
                     'META-INF', 'cext',
-                    # 'com/headius', included since we are trying to use DexClient
+                    'com/headius', # included since we are trying to use DexClient
                     'com/headius/invokebinder',
                     'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware', 'ext', 'java',
                     'jline', 'jni',
@@ -415,18 +413,20 @@ module Ruboto
 
                     # FIXME(uwe):  IR is the future.  We should try using it.
                     # 'org/jruby/ir',
-                    # 'org/jruby/ir/dataflow',
+                    'org/jruby/ir/dataflow',
                     # 'org/jruby/ir/instructions',
                     # 'org/jruby/ir/interpreter',
                     # 'org/jruby/ir/operands',
                     # 'org/jruby/ir/passes',
-                    # 'org/jruby/ir/representations',
-                    # 'org/jruby/ir/targets',
-                    # 'org/jruby/ir/transformations',
-                    # 'org/jruby/ir/util',
+                    'org/jruby/ir/representations',
+                    'org/jruby/ir/targets',
+                    'org/jruby/ir/transformations',
+                    'org/jruby/ir/util',
 
                     'org/jruby/javasupport/bsf',
-                    'org/jruby/runtime/invokedynamic',
+                    # 'org/jruby/runtime/invokedynamic', # Should be excluded
+
+                    # 'org/jruby/management', # should be excluded
                 ]
 
                 # TODO(uwe): Remove when we stop supporting jruby-jars < 1.7.0
@@ -491,13 +491,12 @@ module Ruboto
             FileUtils.mkdir_p 'tmp'
             Dir.chdir 'tmp' do
               FileUtils.mkdir_p 'old'
-              FileUtils.mkdir_p 'new'
+              FileUtils.mkdir_p 'new/jruby.home'
               Dir.chdir 'old' do
                 `jar -xf ../../#{jruby_stdlib}`
               end
-              FileUtils.move 'old/META-INF/jruby.home/lib', 'new'
-
-              FileUtils.rm_rf 'new/lib/ruby/gems'
+              FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
+              FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
 
               if excluded_stdlibs.any?
 
@@ -513,7 +512,7 @@ module Ruboto
 
                 lib_dirs.each do |ld|
                   excluded_stdlibs.each do |d|
-                    dir = "new/lib/ruby/#{ld}/#{d}"
+                    dir = "new/jruby.home/lib/ruby/#{ld}/#{d}"
                     FileUtils.rm_rf dir if File.exists? dir
                     file = "#{dir}.rb"
                     FileUtils.rm_rf file if File.exists? file
@@ -524,9 +523,11 @@ module Ruboto
 
               Dir.chdir "new" do
                 # Uncomment this part to split the stdlib into one jar per directory
-                # Dir['*'].select{|f| File.directory? f}.each do |d|
-                #    `jar -cf ../jruby-stdlib-#{d}-#{JRubyJars::VERSION}.jar #{d}`
-                #    FileUtils.rm_rf d
+                # Dir['jruby.home/lib/ruby/*/*'].select { |f| File.directory? f }.each do |d|
+                #   file = "#{d}.rb"
+                #   `jar -cf ../../jruby-stdlib-#{d.gsub('/', '-')}-#{JRubyJars::VERSION}.jar #{d} #{file if File.exists?(file)}`
+                #   FileUtils.rm_rf d
+                #   FileUtils.rm_rf file if File.exists?(file)
                 # end
 
                 `jar -cf ../../#{jruby_stdlib} .`

data/lib/ruboto/version.rb

@@ -1,4 +1,10 @@
 module Ruboto
-  VERSION = '0.9.0.rc.1'
+  DESCRIPTION = <<EOF
+Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
+Android using the Ruby language and libraries.  It includes support libraries
+and generators for creating projects, classes, tests, and more.  The complete
+APIs of Android, Java, and Ruby is available to you using the Ruby language.
+EOF
+  VERSION = '0.9.0'
   UPDATE_VERSION_LIMIT = '0.5.2'
 end

data/test/activity/stack_activity_test.rb

@@ -11,8 +11,8 @@ setup do |activity|
 end
 
 # ANDROID: 10, PLATFORM: 0.4.7,     JRuby: 1.7.0.dev      '28334966'         expected, but got '28335067'
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0         '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 # ANDROID: 16, PLATFORM: 0.4.8.dev, JRuby: 1.7.0.preview2 '[29, 34, 47, 64]' expected, but got '[28, 33, 47, 64]'
-
 test('stack depth') do |activity|
   os_offset = {
       13 => [1]*4,
@@ -24,12 +24,13 @@ test('stack depth') do |activity|
         '0.4.7' => [0, 0, 0, 0],
         '0.4.8.dev' => [0, 0, -4, -4],
         '0.4.8' => [0, 0, -4, -4],
+        '0.4.9' => [0, 0, -4, -4],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.dev' => [1, 1, 1, 1],
-        '1.7.0.preview2' => [0, 0, -4, -4],
-        '1.7.0.RC1' => [0, 0, -4, -4],
+        '1.7.0' => [0, 0, -4, -4],
+        '1.7.1.dev' => [0, 0, -4, -4],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/app_test_methods.rb

@@ -4,10 +4,11 @@ module AppTestMethods
   include RubotoTest
 
   def test_activity_tests
+    assert_code 'Base64Loads', "require 'base64'"
     assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
     assert_code 'ReadSourceFile', 'File.read(__FILE__)'
     assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
-    assert_code 'RepeatRubotoImport', 'ruboto_import :TextView ; ruboto_import :TextView'
+    assert_code 'RepeatRubotoImportWidget', 'ruboto_import_widget :TextView ; ruboto_import_widget :TextView'
     run_activity_tests('activity')
   end
 
@@ -26,12 +27,12 @@ module AppTestMethods
   private
 
   def assert_code(activity_name, code)
-    snake_name = activity_name.scan(/[A-Z]+[a-z]+/).map { |s| s.downcase }.join('_')
+    snake_name = activity_name.scan(/[A-Z]+[a-z0-9]+/).map { |s| s.downcase }.join('_')
     filename   = "src/#{snake_name}_activity.rb"
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
       s = File.read(filename)
-      s.gsub!(/(require 'ruboto')/, "\\1\n#{code}")
+      raise "Code injection failed!" unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")
       File.open(filename, 'w') { |f| f << s }
     end
   end

data/test/block_def_activity/stack_activity_test.rb

@@ -10,6 +10,7 @@ setup do |activity|
   assert @text_view
 end
 
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0 '[44, 72, 62, 79]' expected, but got '[44, 71, 62, 79]'
 test('stack depth') do |activity|
   os_offset = {13 => 1, 15 => 1, 16 => 1}[android.os.Build::VERSION::SDK_INT].to_i
   if org.ruboto.JRubyAdapter.uses_platform_apk?
@@ -17,12 +18,14 @@ test('stack depth') do |activity|
         '0.4.7' => [0, 0, 0, 0],
         '0.4.8.dev' => [0, -1, 0, 0],
         '0.4.8' => [0, -1, 0, 0],
+        '0.4.9' => [0, -1, 0, 0],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.preview1' => [0, -1, -1, -1],
         '1.7.0.preview2' => [0, -1, 0, 0],
-        '1.7.0.RC1' => [0, -1, 0, 0],
+        '1.7.0' => [0, -1, 0, 0],
+        '1.7.1.dev' => [0, -1, 0, 0],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/handle_activity/stack_activity_test.rb

@@ -14,7 +14,7 @@ end
 # ANDROID: 15, PLATFORM: 0.4.8.dev,  JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
 # ANDROID: 10, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[43, 67, 76, 92]' expected, but got '[43, 66, 75, 91]'
 # ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
-
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0          '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
 test('stack depth') do |activity|
   os_offset = {13 => 1, 15 => 1, 16 => 1}[android.os.Build::VERSION::SDK_INT].to_i
   if org.ruboto.JRubyAdapter.uses_platform_apk?
@@ -22,13 +22,15 @@ test('stack depth') do |activity|
         '0.4.7'     => [0, 0, 0, 0],
         '0.4.8.dev' => [0, -1, -1, -1],
         '0.4.8' => [0, -1, -1, -1],
+        '0.4.9' => [0, -1, -1, -1],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.dev' => [1, 0, 0, 0],
         '1.7.0.preview1' => [0, -1, -1, -1],
         '1.7.0.preview2' => [0, -1, -1, -1],
-        '1.7.0.RC1' => [0, -1, -1, -1],
+        '1.7.0' => [0, -1, -1, -1],
+        '1.7.1.dev' => [0, -1, -1, -1],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/minimal_app_test.rb

@@ -17,6 +17,7 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     # APK was larger than 4.4MB: 4.7MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 10.
     # APK was larger than 3.2MB: 3.5MB.  JRuby: 1.6.7,          ANDROID_TARGET: 15.
     # APK was larger than 4.6MB: 4.9MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 15.
+    # APK was larger than 3.2MB: 4.7MB.  JRuby: 1.7.0,          ANDROID_TARGET: 15.
 
     def test_minimal_apk_is_less_than_3_mb
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
@@ -24,10 +25,9 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.6.7' => 3.5,
           '1.6.7.2' => 3.5,
           '1.6.8' => 3.5,
-          '1.7.0.preview1' => 4.6,
-          '1.7.0.preview2' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.0.rc1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-      }[JRUBY_JARS_VERSION.to_s] || 3.2
+          '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+          '1.7.1.dev' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+      }[JRUBY_JARS_VERSION.to_s] || 4.9
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
       assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"

data/test/ruboto_gen_test.rb

@@ -48,6 +48,7 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was smaller than 278.1KB:   67.2KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 15.
   # APK was larger than 5800.0KB: 5879.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.6.7.
   # APK was larger than 7308.0KB: 7558.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.preview2.
+  # APK was larger than 4200.0KB: 7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.
 
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
@@ -56,10 +57,9 @@ class RubotoGenTest < Test::Unit::TestCase
     if RUBOTO_PLATFORM == 'STANDALONE'
       upper_limit = {
           '1.6.7' => ANDROID_TARGET < 15 ? 5800.0 : 5900.0,
-          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 7400.0 : 7308.0,
-          '1.7.0.preview2' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
-          '1.7.0.rc1' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
-      }[JRUBY_JARS_VERSION.to_s] || 4200.0
+          '1.7.0' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
+          '1.7.1.dev' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
+      }[JRUBY_JARS_VERSION.to_s] || 7600.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
@@ -242,13 +242,23 @@ EOF
     run_app_tests
   end
 
+  def test_activity_with_first_letter_lower_case_in_name
+    Dir.chdir APP_DIR do
+      system "#{RUBOTO_CMD} gen class Activity --name appActivity"
+      assert_equal 0, $?.exitstatus
+      assert File.exists?('src/org/ruboto/test_app/AppActivity.java')
+      assert File.exists?('src/app_activity.rb')
+      assert File.exists?('test/src/app_activity_test.rb')
+    end
+  end
+
   if RUBOTO_PLATFORM == 'FROM_GEM'
     def test_gen_jruby
       Dir.chdir APP_DIR do
         system "#{RUBOTO_CMD} gen jruby"
         assert_equal 0, $?.exitstatus
-        assert File.exists?("libs/jruby-core-#{JRUBY_JARS_VERSION}.jar")
-        assert File.exists?("libs/jruby-stdlib-#{JRUBY_JARS_VERSION}.jar")
+        assert_equal ["libs/jruby-core-#{JRUBY_JARS_VERSION.to_s.downcase}.jar"], Dir["libs/jruby-core-*.jar"].map(&:downcase)
+        assert_equal ["libs/jruby-stdlib-#{JRUBY_JARS_VERSION.to_s.downcase}.jar"], Dir["libs/jruby-stdlib-*.jar"].map(&:downcase)
       end
     end
   end

data/test/sqldroid_test.rb

@@ -1,7 +1,9 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 
 # FIXME(uwe):  Remove check when we stop supporting JRuby older than 1.7.0.rc1
-if RubotoTest::JRUBY_JARS_VERSION >= Gem::Version.new('1.7.0.rc1')
+# FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
+if RubotoTest::JRUBY_JARS_VERSION >= Gem::Version.new('1.7.0.rc1') &&
+    (RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE')
 
 require 'bigdecimal'
 require 'test/app_test_methods'

data/test/test_helper.rb

@@ -117,7 +117,7 @@ module RubotoTest
   install_jruby_jars_gem
 
   if RUBOTO_PLATFORM == 'CURRENT'
-    JRUBY_JARS_VERSION = Gem::Version.new('1.7.0.dev')
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.1.dev')
   else
     # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
@@ -179,6 +179,7 @@ class Test::Unit::TestCase
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
     template_dir = "#{APP_DIR}_template_#{$$}"
     template_dir << "_example_#{example}" if example
+    template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
     template_dir << '_updated' if update
     template_dir << '_standalone' if standalone
     template_dir << "_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs

data/test/update_test_methods.rb

@@ -13,6 +13,22 @@ module UpdateTestMethods
     cleanup_app
   end
 
+  # FIXME(uwe):  We have no solution for legacy apps <= 0.9.0.rc1 and new RubotoCore >= 0.4.9.
+  unless Gem::Version.new(@old_ruboto_version) <= Gem::Version.new('0.9.0.rc.1')
+    def test_an_unchanged_app_succeeds_loading_stdlib
+      # FIXME(uwe): Remove when we stop supporting legacy Ruboto 0.9.0.rc.1 apps and older
+      if Gem::Version.new(@old_ruboto_version) <= Gem::Version.new('0.9.0.rc.1')
+        Dir.chdir "#{APP_DIR}/test" do
+          test_props = File.read('ant.properties')
+          test_props.gsub! /^tested.project.dir=.*$/, 'tested.project.dir=../'
+          File.open('ant.properties', 'w') { |f| f << test_props }
+        end
+      end
+      assert_code "require 'base64'"
+      run_app_tests
+    end
+  end
+
   def test_broadcast_receiver
     Dir.chdir APP_DIR do
       puts "Adding a broadcast receiver"
@@ -63,4 +79,15 @@ module UpdateTestMethods
     end
   end
 
+  private
+
+  def assert_code(code)
+    filename   = "src/ruboto_test_app_activity.rb"
+    Dir.chdir APP_DIR do
+      s = File.read(filename)
+      raise "Code injection failed!" unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")
+      File.open(filename, 'w') { |f| f << s }
+    end
+  end
+
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: -3487987620
-  prerelease: 6
+  hash: 59
+  prerelease: 
   segments: 
   - 0
   - 9
   - 0
-  - rc
-  - 1
-  version: 0.9.0.rc.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -20,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 Z
+date: 2012-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -45,9 +43,12 @@ dependencies:
         version: 4.7.2
   type: :runtime
   version_requirements: *id001
-description: |-
-  Ruboto - JRuby on Android
-  A generator and framework for developing full stand-alone apps for Android using the Ruby language and libraries.
+description: |
+  Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
+  Android using the Ruby language and libraries.  It includes support libraries
+  and generators for creating projects, classes, tests, and more.  The complete
+  APIs of Android, Java, and Ruby is available to you using the Ruby language.
+
 email: ruboto@googlegroups.com
 executables: 
 - ruboto
@@ -204,14 +205,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ruboto/ruboto