ruboto 1.0.2 → 1.0.3

data/assets/rakelib/stdlib_dependencies.rb

@@ -0,0 +1,136 @@
+############################################################################
+#
+# Use to build dependencies within stdlib.
+#
+
+class StdlibDependencies
+  attr_reader :dependencies, :version
+
+  REQUIRE = %r{^\s*require[ (]['"]([a-zA-Z0-9/-_]+)["'][)]?\s*$}
+  REQUIRE_RELATIVE = %r{^\s*require_relative[ (]['"]([a-zA-Z0-9/-_]+)["'][)]?\s*$}
+
+  def self.[](key)
+    versions[key]
+  end
+
+  def self.versions
+    @@versions ||= {}
+  end
+
+  def self.collect(dir=".")
+    local = new("app")
+    Dir.chdir(dir) do 
+      local.check_dir(["ruboto"])
+    end
+    local
+  end
+
+  def self.generate(dir=".")
+    versions
+
+    Dir.chdir(dir) do
+      raise("Can't find shared directory") unless File.directory?("shared") 
+      Dir["*"].select{|d| File.directory?(d) && d != "shared"}.each do |d|
+        @@versions[d] = new(d).generate
+      end
+    end
+
+    versions
+  end
+
+  def self.dump(file)
+    require 'yaml'
+
+    all_dependencies = {}
+    versions.each{|k, v| all_dependencies[k] = v.dependencies}
+
+    File.open( file, 'w' ) do |out|
+      YAML.dump( all_dependencies, out )
+    end
+
+    versions
+  end
+
+  def self.load(file)
+    require 'yaml'
+
+    @@versions = {}
+    raise("Can't find #{file}") unless File.exists?(file) 
+
+    File.open(file) do |versions|
+      YAML.load(versions).each{|k,v| @@versions[k] = new(k, v)}
+    end
+
+    versions
+  end
+
+  def initialize(version, dependencies={})
+    @version = version
+    @dependencies = dependencies
+  end
+
+  def [](key)
+    @dependencies[key]
+  end
+
+  def generate
+    raise("Can't find shared directory") unless File.directory?("shared") 
+    raise("Can't find #{@version} directory") unless File.directory?(@version) 
+
+    Dir.chdir("shared"){check_dir}
+    Dir.chdir(@version){check_dir}
+
+    # Clean up dependencies
+    @dependencies.keys.sort.each do |i|
+      # remove duplicates
+      @dependencies[i] = @dependencies[i].uniq
+
+      # remove references to self 
+      @dependencies[i] = @dependencies[i] - [i]
+
+      # sort 
+      @dependencies[i] = @dependencies[i].sort
+    end
+
+    self
+  end
+
+  def depends_on(name, on=nil)
+    base = name[0..-4]
+    @dependencies[base] = (@dependencies[base] || [])
+    @dependencies[base] << on
+  end
+
+  def gather_dependencies(file)
+    f = IO.read(file)
+
+    ##################################
+    #
+    # Handle encoding problems under different rubies
+    #
+    if String.method_defined?(:encode)
+      f.encode!('UTF-8', 'UTF-8', :invalid => :replace)
+    else
+      require 'iconv'
+      f = Iconv.new('UTF-8', 'UTF-8//IGNORE').iconv(f)
+    end
+    #
+    #################################
+
+    f.scan(REQUIRE) do |j|
+      depends_on(file, j[0])
+    end
+
+    f.scan(REQUIRE_RELATIVE) do |j|
+      on = file.split('/')[0..-2] << j[0]
+      depends_on(file, on.join('/'))
+    end
+  end
+
+  def check_dir(exclude=[])
+    Dir["**/*.rb"].select{|rb| not exclude.include?(rb.split('/')[0])}.each do |i|
+      gather_dependencies(i)
+    end
+  end
+end
+

data/assets/ruboto.yml

@@ -0,0 +1,62 @@
+###################################
+#
+# heap_alloc
+#   
+#    Forces the heap to grow by a number of megabytes.
+#    Can result in improved start-up performance because
+#      it prevents the heap from growing through smaller 
+#      increments.
+#
+# heap_alloc: 13
+
+###################################
+#
+# ruby_version
+#   
+#    Sets the jruby.compat.version property of JRuby
+#    If you include the jruby jars, this is used to
+#      trim away unused versions of the stdlib.
+#
+#ruby_version: 1.9
+
+###################################
+#
+# included_stdlibs
+#
+#    Specify parts of the stdlib that are needed.
+#    If you specify a list, all other components
+#    will be removed. If you specify "auto,"
+#    dependencies will be determined from
+#    auto_dependencies.yml. Running 
+#    "rake libs:check_dependencies' will build
+#    auto_dependencies.yml.
+#
+# included_stdlibs: auto
+#
+# included_stdlibs:
+# - fileutils
+
+###################################
+#
+# excluded_stdlibs
+#
+#    Remove unneeded files from stdlib.
+#    Note: If you specify included_stdlibs above,
+#    this information will be ingnored. 
+#
+#excluded_stdlibs:
+#- ant
+#- cgi
+#- drb
+#- erb
+#- gauntlet_rdoc
+#- minitest
+#- profiler
+#- rake
+#- rdoc
+#- shell
+#- test
+#- webrick
+#- win32
+#- Win32API
+

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

@@ -134,7 +134,9 @@ public class JRubyAdapter {
             Log.d("Setting up JRuby runtime (" + (isDebugBuild ? "DEBUG" : "RELEASE") + ")");
             System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
             System.setProperty("jruby.bytecode.version", "1.6");
-            // System.setProperty("jruby.compat.version", "RUBY2_0"); // RUBY1_9 is the default in JRuby 1.7
+            // BEGIN Ruboto RubyVersion
+            // System.setProperty("jruby.compat.version", "RUBY1_9"); // RUBY1_9 is the default in JRuby 1.7
+            // END Ruboto RubyVersion
             // System.setProperty("jruby.compile.backend", "DALVIK");
             System.setProperty("jruby.compile.mode", "OFF"); // OFF OFFIR JITIR? FORCE FORCEIR
             System.setProperty("jruby.interfaces.useProxy", "true");
@@ -377,14 +379,19 @@ public class JRubyAdapter {
         File storageDir = null;
         if (isDebugBuild()) {
             storageDir = context.getExternalFilesDir(null);
-            if (storageDir == null || (!storageDir.exists() && !storageDir.mkdirs())) {
+            if (storageDir == null) {
                 Log.e("Development mode active, but sdcard is not available.  Make sure you have added\n<uses-permission android:name='android.permission.WRITE_EXTERNAL_STORAGE' />\nto your AndroidManifest.xml file.");
                 storageDir = context.getFilesDir();
             }
         } else {
             storageDir = context.getFilesDir();
         }
-        return storageDir.getAbsolutePath() + "/scripts";
+        File scriptsDir = new File(storageDir, "scripts");
+        if ((!scriptsDir.exists() && !scriptsDir.mkdirs())) {
+            Log.e("Unable to create the scripts dir.");
+            scriptsDir = new File(context.getFilesDir(), "scripts");
+        }
+        return scriptsDir.getAbsolutePath();
     }
 
     private static void setDebugBuild(Context context) {

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

@@ -140,13 +140,21 @@ public class SplashActivity extends Activity {
                     }).start();
                 }
                 return;
+            } else {
+                Log.e("Permission missing for direct download: Internet: " +
+                        hasInternetPermission() + ", non-market install: " +
+                        canInstallFromUnknownSources());
             }
         } catch (Exception e) {
             Log.e("Exception in direct RubotoCore download: " + e);
+            e.printStackTrace();
         }
         try {
+            Log.i("Download RubotoCore using the market");
             startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("market://details?id=org.ruboto.core")));
         } catch (android.content.ActivityNotFoundException anfe) {
+            Log.e("Exception in market RubotoCore download: " + anfe);
+            Log.i("Download RubotoCore using the download manager");
             Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(RUBOTO_URL));
             startActivity(intent);
         }
@@ -347,18 +355,11 @@ public class SplashActivity extends Activity {
     }
 
     private boolean canInstallFromUnknownSources() {
-        Uri settingsUri = Settings.Secure.CONTENT_URI;
-        String[] projection = new String[]{Settings.System.VALUE};
-        String selection = Settings.Secure.NAME + " = ? AND " + Settings.Secure.VALUE + " = ?";
-
-        // FIXME(uwe): Use android.provider.Settings.Global.INSTALL_NON_MARKET_APPS
-        //             when we stop supporting Android api level < 17
-        String[] selectionArgs = {Settings.Secure.INSTALL_NON_MARKET_APPS, String.valueOf(1)};
+        // FIXME(uwe): Use Settings.Global when we stop supporting Android api level < 17
+        // return Settings.Global.getInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS, 0) == 1;
         // EMXIF
 
-        Cursor query = getContentResolver().query(settingsUri, projection,
-                                                  selection, selectionArgs, null);
-        return query.getCount() == 1;
+        return Settings.Secure.getInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS, 0) == 1;
     }
 
     // Get the downloaded percent

data/assets/src/ruboto/activity/reload.rb

@@ -42,10 +42,10 @@ module Ruboto::Activity::Reload
       Log.d "Got reload intent: #{reload_intent.inspect}"
       file_string = reload_intent.get_string_extra('reload')
       if file_string
-        files = file_string.split(/(?<!&);/).map { |f| f.gsub(/&(.)/) { |m| m[1] } }
+        scripts_dir = @activity.getExternalFilesDir(nil).absolute_path + '/scripts'
         files.each do |file|
-          Log.d "load file: #{file.inspect}"
-          load file
+          Log.d "load file: #{scripts_dir}/#{file}"
+          load "#{scripts_dir}/#{file}"
         end
         Log.d 'restart activity'
         if @activity.intent.action == android.content.Intent::ACTION_MAIN ||
@@ -55,8 +55,8 @@ module Ruboto::Activity::Reload
         else
           restart_intent = @activity.intent
         end
-        @activity.startActivity(restart_intent)
         @activity.finish
+        @activity.startActivity(restart_intent)
         Log.d 'activity restarted'
       end
       Log.d 'reload complete.'

data/assets/src/ruboto/widget.rb

@@ -76,7 +76,10 @@ View.class_eval do
     end
 
     params.each do |k, v|
-      method_name = self.respond_to?("#{k}=") ? "#{k}=" : k
+      setter_method = "set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}"
+      assign_method = "#{k}="
+      method_name = self.respond_to?(assign_method) ? assign_method :
+          (self.respond_to?(setter_method) ? setter_method : k)
       invoke_with_converted_arguments(self, method_name, v)
     end
   end

data/lib/ruboto/commands/base.rb

@@ -61,6 +61,12 @@ module Ruboto
                 description 'Generate the JRuby jars jar'
                 cast :boolean
               }
+              option('ruby-version') {
+                description 'Using what version of Ruby? (e.g., 1.8, 1.9, 2.0)'
+                argument :required
+                cast :float
+                validate {|rv| [1.8, 1.9, 2.0].include?(rv)}
+              }
               option('force') {
                 description 'Force creation of project even if the path exists'
                 cast :boolean
@@ -75,6 +81,7 @@ module Ruboto
                 target = params['target'].value
                 min_sdk = params['min-sdk'].value || target
                 with_jruby = params['with-jruby'].value
+                ruby_version = params['ruby-version'].value
                 force = params['force'].value
 
                 abort "Path (#{path}) must be to a directory that does not yet exist. It will be created." if !force && File.exists?(path)
@@ -103,6 +110,13 @@ module Ruboto
                   update_manifest min_sdk[/\d+/], target[/\d+/], true
                   update_test true
                   update_assets
+
+                  if ruby_version
+                    source = File.read('ruboto.yml')
+                    pattern = %r{^#? ?ruby_version: 1.9$}
+                    File.open('ruboto.yml', 'w') { |f| f << source.sub(pattern, "ruby_version: #{ruby_version}") }
+                  end
+
                   update_ruboto true
                   update_icons true
                   update_classes nil, 'exclude'
@@ -394,7 +408,7 @@ module Ruboto
             option('target', 't') {
               extend Ruboto::Util::Emulator
               description 'sets the target Android API level for the emulator'
-              examples Ruboto::Util::Emulator::API_LEVEL_TO_VERSION.keys.join(', ')
+              examples Ruboto::SdkVersions::API_LEVEL_TO_VERSION.keys.join(', ')
               required unless api_level
               argument :required
               default(api_level) if api_level

data/lib/ruboto/sdk_versions.rb

@@ -3,16 +3,19 @@ require 'pathname'
 module Ruboto
   module SdkVersions
     VERSION_TO_API_LEVEL = {
-        '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',
-        '4.0.1' => 'android-14', '4.0.3' => 'android-15', '4.0.4' => 'android-15',
-        '4.1' => 'android-16', '4.1.1' => 'android-16', '4.1.2' => 'android-16',
-        '4.2' => 'android-17', '4.2.2' => 'android-17',
+        '2.3' => 9, '2.3.1' => 9, '2.3.2' => 9, '2.3.3' => 10, '2.3.4' => 10,
+        '3.0' => 11, '3.1' => 12, '3.2' => 13, '4.0.1' => 14, '4.0.3' => 15,
+        '4.0.4' => 15, '4.1' => 16, '4.1.1' => 16, '4.1.2' => 16, '4.2' => 17,
+        '4.2.2' => 17, '4.3' => 18, '4.4.2' => 19,
     }
+    API_LEVEL_TO_VERSION = {
+        10 => '2.3.3', 11 => '3.0', 12 => '3.1', 13 => '3.2', 14 => '4.0',
+        15 => '4.0.3', 16 => '4.1.2', 17 => '4.2.2', 18 => '4.3', 19 => '4.4.2',
+    }
+
     MINIMUM_SUPPORTED_SDK_LEVEL = 10
     MINIMUM_SUPPORTED_SDK = "android-#{MINIMUM_SUPPORTED_SDK_LEVEL}"
-    DEFAULT_TARGET_SDK_LEVEL = 10
+    DEFAULT_TARGET_SDK_LEVEL = 15
     DEFAULT_TARGET_SDK = "android-#{DEFAULT_TARGET_SDK_LEVEL}"
   end
 end

data/lib/ruboto/util/emulator.rb

@@ -1,4 +1,5 @@
 require 'net/telnet'
+require 'ruboto/sdk_versions'
 
 module Ruboto
   module Util
@@ -6,13 +7,8 @@ module Ruboto
       ON_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i)
       ON_MAC_OS_X = RbConfig::CONFIG['host_os'] =~ /^darwin(.*)/
 
-      API_LEVEL_TO_VERSION = {
-          10 => '2.3.3', 11 => '3.0', 12 => '3.1', 13 => '3.2', 14 => '4.0',
-          15 => '4.0.3', 16 => '4.1.2', 17 => '4.2.2', 18 => '4.3', 19 => '4.4',
-      }
-
       def sdk_level_name(sdk_level)
-        API_LEVEL_TO_VERSION[sdk_level] || "api_#{sdk_level}"
+        Ruboto::SdkVersions::API_LEVEL_TO_VERSION[sdk_level] || "api_#{sdk_level}"
       end
 
       def start_emulator(sdk_level)
@@ -123,21 +119,10 @@ module Ruboto
             manifest_file = 'AndroidManifest.xml'
             heap_size = (File.exists?(manifest_file) && File.read(manifest_file) =~ /largeHeap/) ? 256 : 48
             new_avd_config = old_avd_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
-            unless new_avd_config =~ /^hw.device.manufacturer=/
-              device_manufacturer_prop = 'hw.device.manufacturer=Generic'
-              new_avd_config << "#{device_manufacturer_prop}\n"
-              puts "Added #{device_manufacturer_prop} property"
-            end
-            unless new_avd_config =~ /^hw.device.name=/
-              device_name_prop = 'hw.device.name=3.2in HVGA slider (ADP1)'
-              new_avd_config << "#{device_name_prop}\n"
-              puts "Added #{device_name_prop} property"
-            end
-            unless new_avd_config =~ /^hw.mainKeys=/
-              main_keys_prop = 'hw.mainKeys=yes'
-              new_avd_config << "#{main_keys_prop}\n"
-              puts "Added #{main_keys_prop} property"
-            end
+            add_property(new_avd_config, 'hw.device.manufacturer', 'Generic')
+            add_property(new_avd_config, 'hw.device.name', '3.2" HVGA slider (ADP1)')
+            add_property(new_avd_config, 'hw.mainKeys', 'yes')
+            add_property(new_avd_config, 'hw.sdCard', 'yes')
 
             File.write(avd_config_file_name, new_avd_config) if new_avd_config != old_avd_config
             new_snapshot = true
@@ -183,16 +168,12 @@ module Ruboto
           if $? == 0
             print 'Emulator started: '
             50.times do
-              if `adb get-state`.chomp == 'device'
-                break
-              end
+              break if device_ready?
               print '.'
               sleep 1
             end
             puts
-            if `adb get-state`.chomp == 'device'
-              break
-            end
+            break if device_ready?
           end
           puts 'Unable to start the emulator.'
         end
@@ -224,6 +205,22 @@ EOF
 
         puts "Emulator #{avd_name} started OK."
       end
+
+      def device_ready?
+        `adb get-state`.gsub(/^WARNING:.*$/, '').chomp == 'device'
+      end
+
+      def add_property(new_avd_config, property_name, value)
+        pattern = /^#{property_name}=.*$/
+        property = "#{property_name}=#{value}"
+        if new_avd_config =~ pattern
+          new_avd_config.gsub! pattern, property
+          puts "Changed property: #{property}"
+        else
+          new_avd_config << "#{property}\n"
+          puts "Added property: #{property}"
+        end
+      end
     end
   end
 end