ruboto 0.10.2 → 0.11.0.rc.0

data/Gemfile

@@ -1,4 +1,2 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'main'
+source 'https://rubygems.org/'
+gemspec

data/Gemfile.lock

@@ -1,21 +1,27 @@
+PATH
+  remote: .
+  specs:
+    ruboto (0.11.0.rc.0)
+      main (>= 4.7.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    arrayfields (4.7.4)
-    chronic (0.6.7)
+    arrayfields (4.9.0)
+    chronic (0.9.1)
     fattr (2.2.1)
-    main (5.0.1)
+    main (5.2.0)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
-    map (5.5.0)
-    rake (0.9.2.2)
+    map (6.3.0)
+    rake (10.0.4)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  main
   rake
+  ruboto!

data/README.md

@@ -154,11 +154,11 @@ You generate an app with the option `--activity FooActivity`, which means that r
 
     class FooActivity
       include Ruboto::Activity
-      def on_create(bundle)
+      def onCreate(bundle)
         Log.v 'MYAPPNAME', 'onCreate got called!'
       end
 
-      def on_pause
+      def onPause
         Log.v 'MYAPPNAME', 'onPause got called!'
       end
     end

data/assets/rakelib/ruboto.rake

@@ -163,7 +163,7 @@ end
 
 desc 'Start the emulator with larger disk'
 task :emulator do
-  sh "emulator -partition-size 1024 -avd Android_#{sdk_level_name}"
+  start_emulator
 end
 
 desc 'Start the application on the device/emulator.'
@@ -257,24 +257,40 @@ task :bundle => BUNDLE_JAR
 file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
+  require 'bundler'
+  require 'bundler/vendored_thor'
 
-  # Override RUBY_ENGINE (we can bundle from MRI for JRuby)
+  # Store original RubyGems/Bundler environment
   platforms = Gem.platforms
   ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE
+  gem_paths = {'GEM_HOME' => Gem.path, 'GEM_PATH' => Gem.dir}
+
+  # Override RUBY_ENGINE (we can bundle from MRI for JRuby)
   Gem.platforms = [Gem::Platform::RUBY, Gem::Platform.new('universal-java')]
-  Object.const_set('RUBY_ENGINE', 'jruby')
+  Gem.paths = {'GEM_HOME' => BUNDLE_PATH, 'GEM_PATH' => BUNDLE_PATH}
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  begin
+    Object.const_set('RUBY_ENGINE', 'jruby')
+  ensure
+    $VERBOSE = old_verbose
+  end
 
   ENV['BUNDLE_GEMFILE'] = GEM_FILE
-  require 'bundler'
+  Bundler.ui = Bundler::UI::Shell.new
   Bundler.bundle_path = Pathname.new BUNDLE_PATH
-
   definition = Bundler.definition
   definition.validate_ruby!
   Bundler::Installer.install(Bundler.root, definition)
 
   # Restore RUBY_ENGINE (limit the scope of this hack)
-  Object.const_set('RUBY_ENGINE', ruby_engine) if ruby_engine
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  begin
+    Object.const_set('RUBY_ENGINE', ruby_engine)
+  ensure
+    $VERBOSE = old_verbose
+  end
   Gem.platforms = platforms
+  Gem.paths = gem_paths
 
   gem_paths = Dir["#{BUNDLE_PATH}/gems"]
   raise 'Gem path not found' if gem_paths.empty?
@@ -284,7 +300,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
 
   if package != 'org.ruboto.core' && JRUBY_JARS.none? { |f| File.exists? f }
     Dir.chdir gem_path do
-      Dir['{activerecord-jdbc-adapter, jruby-openssl}-*'].each do |g|
+      Dir['{activerecord-jdbc-adapter,jruby-openssl}-*'].each do |g|
         puts "Removing #{g} gem since it is included in the RubotoCore platform apk."
         FileUtils.rm_rf g
       end
@@ -361,6 +377,10 @@ Java::arjdbc.jdbc.AdapterJavaService.new.basicLoad(JRuby.runtime)
             # FileUtils.rm_f(files)
             # ODOT
 
+            # FIXME(uwe): Extract files with case sensitive names for ARJDBC 1.2.7-1.3.x
+            puts `jar xf #{jar} arjdbc/mssql/MSSQLRubyJdbcConnection.class arjdbc/sqlite3/SQLite3RubyJdbcConnection.class`
+            # EMXIF
+
           elsif jar =~ /shared\/jopenssl.jar$/
             jar_load_code = <<-END_CODE
 require 'jruby'
@@ -625,3 +645,141 @@ def stop_app
   output = `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
   output !~ /Operation not permitted/
 end
+
+def start_emulator
+  STDOUT.sync = true
+  # FIXME(uwe):  Use RBConfig instead
+  if `uname -m`.chomp == 'x86_64'
+    emulator_cmd = 'emulator64-arm'
+  else
+    emulator_cmd = 'emulator-arm'
+  end
+  
+  emulator_opts = '-partition-size 256'
+  if ENV['DISPLAY'].nil?
+    emulator_opts << ' -no-window -no-audio'
+  end
+
+  avd_name = "Android_#{sdk_level_name}"
+  new_snapshot = false
+  loop do
+    `killall -0 #{emulator_cmd} 2> /dev/null`
+    if $? == 0
+      `killall #{emulator_cmd}`
+      10.times do |i|
+        `killall -0 #{emulator_cmd} 2> /dev/null`
+        if $? != 0
+          break
+        end
+        if i == 3
+          print 'Waiting for emulator to die: ...'
+        elsif i > 3
+          print '.'
+        end
+        sleep 1
+      end
+      puts
+      `killall -0 #{emulator_cmd} 2> /dev/null`
+      if $? == 0
+        puts 'Emulator still running.'
+        `killall -9 #{emulator_cmd}`
+        sleep 1
+      end
+    end
+
+    if [17, 16, 15, 13, 11].include? sdk_level
+      abi_opt = '--abi armeabi-v7a'
+    elsif sdk_level == 10
+      abi_opt = '--abi armeabi'
+    end
+
+    unless File.exists? "#{ENV['HOME']}/.android/avd/#{avd_name}.avd"
+      puts "Creating AVD #{avd_name}"
+      heap_size = File.read('AndroidManifest.xml') =~ 'largeHeap' ? 256 : 48
+      # FIXME(uwe):  Use Ruby instead.
+      # FIXME(uwe):  Only change the heap size to be larger.
+      # `sed -i.bak -e "s/vm.heapSize=[0-9]*/vm.heapSize=#{heap_size}/" #{ENV['ANDROID_HOME']}/platforms/*/*/*/hardware.ini`
+      `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA`
+      `sed -i.bak -e "s/vm.heapSize=[0-9]*/vm.heapSize=#{heap_size}/" #{ENV['HOME']}/.android/avd/#{avd_name}.avd/config.ini`
+      new_snapshot = true
+    end
+  
+    puts 'Start emulator'
+    system "emulator -avd #{avd_name} #{emulator_opts} &"
+  
+    3.times do |i|
+      sleep 1
+      `killall -0 #{emulator_cmd} 2> /dev/null`
+      if $? == 0
+        break
+      end
+      if i == 3
+        print 'Waiting for emulator: ...'
+      elsif i > 3
+          print '.'
+      end
+    end
+    puts
+    `killall -0 #{emulator_cmd} 2> /dev/null`
+    if $? != 0
+      puts 'Unable to start the emulator.  Retrying without loading snapshot.'
+      system "emulator -no-snapshot-load -avd #{avd_name} #{emulator_opts} &"
+      10.times do |i|
+        `killall -0 #{emulator_cmd} 2> /dev/null`
+        if $? == 0
+          new_snapshot = true
+          break
+        end
+        if i == 3
+          print 'Waiting for emulator: ...'
+        elsif i > 3
+            print '.'
+        end
+        sleep 1
+      end
+    end
+  
+    `killall -0 #{emulator_cmd} 2> /dev/null`
+    if $? == 0
+      print 'Emulator started: '
+      50.times do
+        if `adb get-state`.chomp == 'device'
+          break
+        end
+        print '.'
+        sleep 1
+      end
+      puts
+      if `adb get-state`.chomp == 'device'
+        break
+      end
+    end
+    puts 'Unable to start the emulator.'
+  end
+
+  if new_snapshot
+    puts 'Allow the emulator to calm down a bit.'
+    sleep 15
+  end
+  
+  system %Q{(
+    set +e
+    for i in 1 2 3 4 5 6 7 8 9 10 ; do
+      sleep 6
+      adb shell input keyevent 82 >/dev/null 2>&1
+      if [ "$?" == "0" ] ; then
+        set -e
+        adb shell input keyevent 82 >/dev/null 2>&1
+        adb shell input keyevent 4 >/dev/null 2>&1
+        exit 0
+      fi
+    done
+    echo "Failed to unlock screen"
+    set -e
+    exit 1
+  ) &}
+  
+  system "adb logcat > adb_logcat.log &"
+  
+  puts "Emulator #{avd_name} started OK."
+end

data/assets/samples/sample_activity.rb

@@ -6,7 +6,7 @@ ruboto_import_widgets :Button, :LinearLayout, :TextView
 # http://xkcd.com/378/
 
 class SampleActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title 'Domo arigato, Mr Ruboto!'
 

data/assets/samples/sample_activity_test.rb

@@ -11,11 +11,11 @@ setup do |activity|
 end
 
 test('initial setup') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
+  assert_equal 'What hath Matz wrought?', @text_view.text
 end
 
 test('button changes text') do |activity|
   button = activity.findViewById(43)
   button.performClick
-  assert_equal "What hath Matz wrought!", @text_view.text
+  assert_equal 'What hath Matz wrought!', @text_view.text
 end

data/assets/samples/sample_broadcast_receiver.rb

@@ -2,9 +2,9 @@ import android.util.Log
 
 class SampleBroadcastReceiver
   # will get called whenever the BroadcastReceiver receives an intent (whenever onReceive is called)
-  def on_receive(context, intent)
-    Log.v "SampleBroadcastReceiver", 'Broadcast received!'
-    Log.v "SampleBroadcastReceiver", intent.getExtras.to_s
+  def onReceive(context, intent)
+    Log.v 'SampleBroadcastReceiver', 'Broadcast received!'
+    Log.v 'SampleBroadcastReceiver', intent.getExtras.to_s
   rescue Exception
     Log.e "Exception processing broadcast: #{$!.message}\n#{$!.backtrace.join("\n")}"
   end

data/assets/samples/sample_broadcast_receiver_test.rb

@@ -27,7 +27,7 @@ test('broadcast changes title', :ui => false) do |activity|
         receiver_ready = true
         android.os.Looper.loop
       rescue
-        puts "Exception starting receiver"
+        puts 'Exception starting receiver'
         puts $!.message
         puts $!.backtrace.join("\n")
       end

data/assets/samples/sample_service.rb

@@ -7,8 +7,8 @@ require 'ruboto/util/toast'
 # online:
 # http://developer.android.com/reference/android/app/Service.html
 class SampleService
-  def on_start_command(intent, flags, startId)
-    toast "Hello from the service"
+  def onStartCommand(intent, flags, startId)
+    toast 'Hello from the service'
     android.app.Service::START_NOT_STICKY
   end
 end

data/assets/src/RubotoBroadcastReceiver.java

@@ -31,6 +31,9 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
     public void onReceive(android.content.Context context, android.content.Intent intent) {
         try {
             Log.d("onReceive: " + this);
+            if (ScriptLoader.isCalledFromJRuby()) {
+                return;
+            }
             if (!scriptLoaded) {
                 if (JRubyAdapter.setUpJRuby(context)) {
                     ScriptLoader.loadScript(this);
@@ -47,7 +50,13 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
     	        JRubyAdapter.put("$intent", intent);
                 JRubyAdapter.runScriptlet("$broadcast_receiver.on_receive($context, $intent)");
             } else if (JRubyAdapter.isJRubyOneSeven()) {
+            // FIXME(uwe):  Simplify when we stop support for snake case aliasing interface callback methods.
+            if ((Boolean)JRubyAdapter.runScriptlet(scriptInfo.getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :onReceive}")) {
+    	        JRubyAdapter.runRubyMethod(this, "onReceive", new Object[]{context, intent});
+            } else if ((Boolean)JRubyAdapter.runScriptlet(scriptInfo.getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :on_receive}")) {
     	        JRubyAdapter.runRubyMethod(this, "on_receive", new Object[]{context, intent});
+            }
+            // EMXIF
             } else {
                 throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
         	}

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

@@ -18,7 +18,10 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
     private ProgressDialog loadingDialog;
     private boolean dialogCancelled = false;
     private BroadcastReceiver receiver;
+
+    // FIXME(uwe):  Remove this field?  Duplicated by ScriptInfo.isLoaded() ?
     protected boolean appStarted = false;
+    // EMXIF
 
 	public void onCreate(Bundle bundle) {
         Log.d("onCreate: ");

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

@@ -250,7 +250,7 @@ public class JRubyAdapter {
             System.setProperty("jruby.objectspace.enabled", "false");
             System.setProperty("jruby.thread.pooling", "true");
             System.setProperty("jruby.native.enabled", "false");
-            // System.setProperty("jruby.compat.version", "RUBY1_8"); // RUBY1_9 is the default in JRuby 1.7
+            // System.setProperty("jruby.compat.version", "RUBY2_0"); // RUBY1_9 is the default in JRuby 1.7
             System.setProperty("jruby.ir.passes", "LocalOptimizationPass,DeadCodeElimination");
             System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
 
@@ -305,6 +305,59 @@ public class JRubyAdapter {
             }
 
             try {
+                //////////////////////////////////
+                //
+                // Set jruby.home
+                //
+
+                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);
+                // This needs to be set before the ScriptingContainer is initialized
+                System.setProperty("jruby.home", jrubyHome);
+
+                //////////////////////////////////
+                //
+                // Determine Output
+                //
+
+                if (out != null) {
+                  output = out;
+                }
+
+                //////////////////////////////////
+                //
+                // Disable rubygems
+                //
+
+                Class rubyClass = Class.forName("org.jruby.Ruby", true, scriptingContainerClass.getClassLoader());
+                Class rubyInstanceConfigClass = Class.forName("org.jruby.RubyInstanceConfig", true, scriptingContainerClass.getClassLoader());
+
+                Object config = rubyInstanceConfigClass.getConstructor().newInstance();
+                rubyInstanceConfigClass.getMethod("setDisableGems", boolean.class).invoke(config, true);
+                rubyInstanceConfigClass.getMethod("setLoader", ClassLoader.class).invoke(config, classLoader);
+
+                if (output != null) {
+                    rubyInstanceConfigClass.getMethod("setOutput", PrintStream.class).invoke(config, output);
+                    rubyInstanceConfigClass.getMethod("setError", PrintStream.class).invoke(config, output);
+                }
+
+                // This will become the global runtime and be used by our ScriptingContainer
+                rubyClass.getMethod("newInstance", rubyInstanceConfigClass).invoke(null, config);
+
+                //////////////////////////////////
+                //
+                // Create the ScriptingContainer
+                //
+
                 Class scopeClass = Class.forName("org.jruby.embed.LocalContextScope", true, scriptingContainerClass.getClassLoader());
                 Class behaviorClass = Class.forName("org.jruby.embed.LocalVariableBehavior", true, scriptingContainerClass.getClassLoader());
 
@@ -330,28 +383,8 @@ public class JRubyAdapter {
                     Log.e("Unable to find app files dir!");
                 }
 
-                if (out != null) {
-                  output = out;
-                  setOutputStream(out);
-                } else if (output != null) {
-                  setOutputStream(output);
-                }
-
-                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);
-
                 addLoadPath(scriptsDirName(appContext));
-    	        put("$package_name", appContext.getPackageName());
+    	          put("$package_name", appContext.getPackageName());
 
                 initialized = true;
             } catch (ClassNotFoundException e) {
@@ -443,7 +476,8 @@ public class JRubyAdapter {
 
     // FIXME(uwe):  Remove when we stop supporting Ruby 1.8
     @Deprecated public static boolean isRubyOneNine() {
-        return ((String)get("RUBY_VERSION")).startsWith("1.9.");
+    String rv = ((String)get("RUBY_VERSION"));
+        return rv.startsWith("2.0.") || rv.startsWith("1.9.");
     }
 
     static void printStackTrace(Throwable t) {

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

@@ -76,12 +76,15 @@ public class ScriptLoader {
                             }
                             System.out.println("Set class: " + rubyClass);
                             JRubyAdapter.put(component.getScriptInfo().getRubyClassName(), rubyClass);
-                            Thread t = new Thread(new Runnable(){
+                            // FIXME(uwe):  Collect these threads in a ThreadGroup ?
+                            Thread t = new Thread(null, new Runnable(){
                                 public void run() {
+                                    long loadStart = System.currentTimeMillis();
                                     JRubyAdapter.setScriptFilename(rubyScript.getAbsolutePath());
                                     JRubyAdapter.runScriptlet(script);
+                                    System.out.println("Script load took " + (System.currentTimeMillis() - loadStart) + "ms");
                                 }
-                            });
+                            }, "ScriptLoader for " + rubyClass, 128 * 1024);
                             try {
                                 t.start();
                                 t.join();

data/assets/src/ruboto/activity.rb

@@ -15,7 +15,7 @@ require 'ruboto/package'
 module Ruboto
   module Context
     def start_ruboto_dialog(remote_variable, theme=Java::android.R.style::Theme_Dialog, &block)
-      java_import "org.ruboto.RubotoDialog"
+      java_import 'org.ruboto.RubotoDialog'
       start_ruboto_activity(remote_variable, RubotoDialog, theme, &block)
     end
 
@@ -28,22 +28,21 @@ module Ruboto
         else
           options = {}
         end
-        global_variable_name = nil
       end
 
-      class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split("/").last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
-      if !Object.const_defined?(class_name)
-        Object.const_set(class_name, Class.new(&block))
-      else
+      class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split('/').last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
+      if Object.const_defined?(class_name)
         Object.const_get(class_name).class_eval(&block) if block_given?
+      else
+        Object.const_set(class_name, Class.new(&block))
       end
       b = Java::android.os.Bundle.new
-      b.putInt("Theme", theme) if theme
-      b.putString("ClassName", class_name)
-      b.putString("Script", options[:script]) if options[:script]
+      b.putInt('Theme', theme) if theme
+      b.putString('ClassName', class_name)
+      b.putString('Script', options[:script]) if options[:script]
       i = android.content.Intent.new
       i.setClass self, klass.java_class
-      i.putExtra("Ruboto Config", b)
+      i.putExtra('Ruboto Config', b)
       startActivity i
       self
     end
@@ -61,7 +60,7 @@ module Ruboto
 
 end
 
-java_import "android.content.Context"
+java_import 'android.content.Context'
 Context.class_eval do
   include Ruboto::Context
 end
@@ -85,7 +84,7 @@ def ruboto_configure_activity(klass)
   end
 end
 
-java_import "android.app.Activity"
-java_import "org.ruboto.RubotoActivity"
+java_import 'android.app.Activity'
+java_import 'org.ruboto.RubotoActivity'
 ruboto_configure_activity(RubotoActivity)
 

data/assets/src/ruboto/base.rb

@@ -21,5 +21,5 @@ module Kernel
   end
 end
 
-java_import "android.R"
-AndroidIds = JavaUtilities.get_proxy_class("android.R$id")
+java_import 'android.R'
+AndroidIds = JavaUtilities.get_proxy_class('android.R$id')

data/assets/src/ruboto/broadcast_receiver.rb

@@ -8,7 +8,7 @@
 
 require 'ruboto/base'
 
-java_import "org.ruboto.RubotoBroadcastReceiver"
+java_import 'org.ruboto.RubotoBroadcastReceiver'
 module Ruboto
   module BroadcastReceiver
   end

data/assets/src/ruboto/package.rb

@@ -1,10 +1,10 @@
-$package      = eval("Java::#{$package_name}")
+$package = eval("Java::#{$package_name}")
 
 module Ruboto
   java_import "#{$package_name}.R"
   begin
     Id = JavaUtilities.get_proxy_class("#{$package_name}.R$id")
   rescue NameError
-    Java::android.util.Log.d "RUBOTO", "no R$id"
+    Java::android.util.Log.d 'RUBOTO', 'no R$id'
   end
 end

data/assets/src/ruboto/preference.rb

@@ -8,9 +8,9 @@
 
 require 'ruboto/activity'
 
-java_import "android.preference.PreferenceScreen"
-java_import "android.preference.Preference"
-java_import "org.ruboto.RubotoPreferenceActivity"
+java_import 'android.preference.PreferenceScreen'
+java_import 'android.preference.Preference'
+java_import 'org.ruboto.RubotoPreferenceActivity'
 ruboto_configure_activity(RubotoPreferenceActivity)
 
 RubotoPreferenceActivity.class_eval do
@@ -49,7 +49,7 @@ def ruboto_import_preferences(*preferences)
   preferences.each { |i| ruboto_import_preference i }
 end
 
-def ruboto_import_preference(class_name, package_name="android.preference")
+def ruboto_import_preference(class_name, package_name='android.preference')
   klass = java_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
   return unless klass
 

data/assets/src/ruboto/service.rb

@@ -9,8 +9,8 @@ require 'ruboto/package'
 #
 #######################################################
 
-java_import "android.content.Context"
-java_import "org.ruboto.RubotoService"
+java_import 'android.content.Context'
+java_import 'org.ruboto.RubotoService'
 
 module Ruboto
   module Context
@@ -23,21 +23,20 @@ module Ruboto
         else
           options = {}
         end
-        global_variable_name = nil
       end
 
-      class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split("/").last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
-      if !Object.const_defined?(class_name)
-        Object.const_set(class_name, Class.new(&block))
-      else
+      class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split('/').last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
+      if Object.const_defined?(class_name)
         Object.const_get(class_name).class_eval(&block) if block_given?
+      else
+        Object.const_set(class_name, Class.new(&block))
       end
       b = Java::android.os.Bundle.new
-      b.putString("ClassName", class_name)
-      b.putString("Script", options[:script]) if options[:script]
+      b.putString('ClassName', class_name)
+      b.putString('Script', options[:script]) if options[:script]
       i = android.content.Intent.new
       i.setClass self, klass.java_class
-      i.putExtra("Ruboto Config", b)
+      i.putExtra('Ruboto Config', b)
       self.startService i
       self
     end