ruboto 1.1.2 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +5 -6
  3. data/RELEASE_CANDICATE_DOC.md +5 -3
  4. data/RELEASE_DOC.md +32 -11
  5. data/Rakefile +86 -36
  6. data/assets/rakelib/ruboto.rake +33 -14
  7. data/assets/rakelib/ruboto.stdlib.rake +1 -1
  8. data/assets/res/layout/get_ruboto_core.xml +1 -2
  9. data/assets/src/RubotoService.java +19 -2
  10. data/assets/src/org/ruboto/JRubyAdapter.java +4 -0
  11. data/assets/src/org/ruboto/SplashActivity.java +17 -17
  12. data/assets/src/ruboto/base.rb +13 -4
  13. data/assets/src/ruboto/package.rb +12 -3
  14. data/assets/src/ruboto/service.rb +45 -8
  15. data/assets/src/ruboto/widget.rb +82 -39
  16. data/assets/test/src/test_helper.rb +4 -0
  17. data/lib/ruboto/commands/base.rb +29 -17
  18. data/lib/ruboto/sdk_versions.rb +1 -1
  19. data/lib/ruboto/util/emulator.rb +49 -33
  20. data/lib/ruboto/util/setup.rb +5 -1
  21. data/lib/ruboto/util/update.rb +68 -22
  22. data/lib/ruboto/util/xml_element.rb +5 -3
  23. data/lib/ruboto/version.rb +1 -1
  24. data/test/activity/call_super_activity.rb +2 -2
  25. data/test/activity/constants_activity.rb +51 -0
  26. data/test/activity/constants_activity_test.rb +18 -0
  27. data/test/activity/margins_activity.rb +12 -7
  28. data/test/activity/margins_activity_test.rb +10 -6
  29. data/test/activity/padding_activity.rb +15 -0
  30. data/test/activity/padding_activity_test.rb +41 -0
  31. data/test/activity/rss_activity.rb +42 -0
  32. data/test/activity/rss_activity_test.rb +35 -0
  33. data/test/activity/spinner_activity.rb +5 -5
  34. data/test/activity/spinner_activity_test.rb +6 -6
  35. data/test/activity/stack_activity.rb +7 -8
  36. data/test/activity/stack_activity_test.rb +7 -5
  37. data/test/activity/subclass_activity.rb +5 -5
  38. data/test/activity/subclass_activity_test.rb +8 -6
  39. data/test/app_test_methods.rb +8 -0
  40. data/test/arjdbc_test.rb +1 -1
  41. data/test/minimal_app_test.rb +12 -10
  42. data/test/rake_test.rb +2 -4
  43. data/test/ruboto_gen_test.rb +11 -9
  44. data/test/service_block_test.rb +112 -0
  45. data/test/{service_test.rb → service_gen_class_test.rb} +9 -4
  46. data/test/service_infile_class_test.rb +114 -0
  47. data/test/sqldroid_test.rb +1 -1
  48. data/test/test_helper.rb +39 -21
  49. metadata +11 -7
@@ -38,7 +38,7 @@ class RubotoTestAppActivity
38
38
  super
39
39
  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "\#{s[0..0].upcase}\#{s[1..-1]}" }.join(' ')
40
40
 
41
- adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , AndroidIds::text1, ['Record one', 'Record two'])
41
+ adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , android.R.id.text1, ['Record one', 'Record two'])
42
42
 
43
43
  self.content_view =
44
44
  linear_layout :orientation => LinearLayout::VERTICAL do
data/test/test_helper.rb CHANGED
@@ -16,13 +16,16 @@ module RubotoTest
16
16
  PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
17
17
  $LOAD_PATH << PROJECT_DIR
18
18
 
19
- GEM_PATH = File.join PROJECT_DIR, 'tmp', 'gems'
20
- FileUtils.mkdir_p GEM_PATH
21
- ENV['GEM_HOME'] = GEM_PATH
22
- ENV['GEM_PATH'] = GEM_PATH
23
- ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
24
- Gem.paths = GEM_PATH
25
- Gem.refresh
19
+ unless File.writable?(ENV['GEM_HOME'])
20
+ GEM_PATH = File.join PROJECT_DIR, 'tmp', 'gems'
21
+ FileUtils.mkdir_p GEM_PATH
22
+ ENV['GEM_HOME'] = GEM_PATH
23
+ ENV['GEM_PATH'] = GEM_PATH
24
+ ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
25
+ Gem.paths = GEM_PATH
26
+ Gem.refresh
27
+ end
28
+
26
29
  `gem query -i -n bundler`
27
30
  system 'gem install bundler --no-ri --no-rdoc' unless $? == 0
28
31
  `bundle check`
@@ -36,7 +39,14 @@ module RubotoTest
36
39
  APP_NAME = 'RubotoTestApp'
37
40
  TMP_DIR = File.join PROJECT_DIR, 'tmp'
38
41
  APP_DIR = File.join TMP_DIR, APP_NAME
39
- ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
42
+
43
+ # FIXME(uwe): Remove special case when Android L has been released.
44
+ if (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'] =~ /(?:android-)?L/)
45
+ ANDROID_TARGET = 'L'
46
+ else
47
+ ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
48
+ end
49
+ # EMXIF
40
50
 
41
51
  def self.version_from_device
42
52
  puts 'Reading OS version from device/emulator'
@@ -80,6 +90,11 @@ module RubotoTest
80
90
  puts RUBY_DESCRIPTION
81
91
 
82
92
  ANDROID_OS = (ENV['ANDROID_OS'] || version_from_device).slice(/\d+/).to_i
93
+
94
+ # FIXME(uwe): Remove when Android L has been released
95
+ ANDROID_OS = 21 if ANDROID_OS == 0
96
+ # EMXIF
97
+
83
98
  puts "ANDROID_OS: #{ANDROID_OS}"
84
99
  puts "ANDROID_TARGET: #{ANDROID_TARGET}"
85
100
 
@@ -229,16 +244,19 @@ class Test::Unit::TestCase
229
244
  File.write('AndroidManifest.xml',
230
245
  File.read('AndroidManifest.xml').sub(%r{</manifest>},
231
246
  " <uses-permission android:name='android.permission.INTERNET'/>\n</manifest>"))
247
+ File.write('res/layout/dummy_layout.xml', <<-EOF)
248
+ <?xml version="1.0" encoding="utf-8"?>
249
+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
250
+ android:id="@+id/my_text"
251
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
252
+ android:text="This is a dummy layout to generate layout and id constants." />
253
+ EOF
232
254
  if update
233
255
  update_app
234
256
  end
235
257
  if update || !example
236
- system 'rake patch_dex' # Ensure dx heap space is sufficient.
258
+ system 'rake --trace debug' # Ensure dx heap space is sufficient.
237
259
  assert_equal 0, $?
238
- Dir.chdir 'test' do
239
- system 'ant instrument' # This will also build the main project.
240
- assert_equal 0, $?
241
- end
242
260
  end
243
261
  end
244
262
  puts "Storing app as template #{template_dir}"
@@ -259,14 +277,14 @@ class Test::Unit::TestCase
259
277
  check_platform_installation
260
278
  test_completed = false
261
279
  Thread.start do
262
- loop do
263
- sleep 60
280
+ 4.times do
281
+ sleep 600
264
282
  break if test_completed
265
- print '-'
283
+ puts '...'
266
284
  end
267
285
  end
268
286
  Dir.chdir APP_DIR do
269
- system 'rake test:quick'
287
+ system 'rake --trace test:quick'
270
288
  assert_equal 0, $?, "tests failed with return code #$?"
271
289
  end
272
290
  test_completed = true
@@ -290,10 +308,10 @@ class Test::Unit::TestCase
290
308
 
291
309
  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
292
310
  yml = YAML.dump({'included_stdlibs' => included_stdlibs,
293
- 'excluded_stdlibs' => excluded_stdlibs,
294
- # 'ruby_version' => ruby_version,
295
- 'heap_alloc' => heap_alloc,
296
- })
311
+ 'excluded_stdlibs' => excluded_stdlibs,
312
+ # 'ruby_version' => ruby_version,
313
+ 'heap_alloc' => heap_alloc,
314
+ })
297
315
  puts "Adding ruboto.yml:\n#{yml}"
298
316
  File.open('ruboto.yml', 'w') { |f| f << yml }
299
317
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruboto
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2014-07-09 00:00:00.000000000 Z
14
+ date: 2014-10-13 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: main
@@ -73,7 +73,6 @@ files:
73
73
  - RELEASE_CANDICATE_DOC.md
74
74
  - RELEASE_DOC.md
75
75
  - Rakefile
76
- - assets/.DS_Store
77
76
  - assets/.gitignore
78
77
  - assets/Rakefile
79
78
  - assets/libs/dx.jar
@@ -81,12 +80,9 @@ files:
81
80
  - assets/rakelib/ruboto.stdlib.rake
82
81
  - assets/rakelib/ruboto.stdlib.rb
83
82
  - assets/rakelib/ruboto.stdlib.yml
84
- - assets/res/.DS_Store
85
- - assets/res/drawable-hdpi/.DS_Store
86
83
  - assets/res/drawable-hdpi/ic_launcher.png
87
84
  - assets/res/drawable-ldpi/ic_launcher.png
88
85
  - assets/res/drawable-mdpi/ic_launcher.png
89
- - assets/res/drawable/.DS_Store
90
86
  - assets/res/drawable/get_ruboto_core.png
91
87
  - assets/res/layout/get_ruboto_core.xml
92
88
  - assets/ruboto.yml
@@ -159,6 +155,8 @@ files:
159
155
  - lib/ruboto/version.rb
160
156
  - test/activity/call_super_activity.rb
161
157
  - test/activity/call_super_activity_test.rb
158
+ - test/activity/constants_activity.rb
159
+ - test/activity/constants_activity_test.rb
162
160
  - test/activity/dialog_fragment_activity.rb
163
161
  - test/activity/dialog_fragment_activity_test.rb
164
162
  - test/activity/dir_and_file_activity.rb
@@ -181,8 +179,12 @@ files:
181
179
  - test/activity/no_on_create_activity_test.rb
182
180
  - test/activity/option_menu_activity.rb
183
181
  - test/activity/option_menu_activity_test.rb
182
+ - test/activity/padding_activity.rb
183
+ - test/activity/padding_activity_test.rb
184
184
  - test/activity/psych_activity.rb
185
185
  - test/activity/psych_activity_test.rb
186
+ - test/activity/rss_activity.rb
187
+ - test/activity/rss_activity_test.rb
186
188
  - test/activity/ruby_file_activity.rb
187
189
  - test/activity/spinner_activity.rb
188
190
  - test/activity/spinner_activity_test.rb
@@ -208,7 +210,9 @@ files:
208
210
  - test/ruboto_setup_test.rb
209
211
  - test/ruboto_update_test.rb
210
212
  - test/sample_broadcast_receiver_test.rb
211
- - test/service_test.rb
213
+ - test/service_block_test.rb
214
+ - test/service_gen_class_test.rb
215
+ - test/service_infile_class_test.rb
212
216
  - test/splash_test.rb
213
217
  - test/sqldroid_test.rb
214
218
  - test/test_helper.rb