add sdcard property to yaml

moshea · Sep 3, 2015 · 8720b71 · 8720b71
1 parent 103bd3e
commit 8720b71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ devices:
   - name: bar
     target: android-22
     skin: WVGA800
+    sdcard: 20M
 ```
 
 #### Configuration

diff --git a/lib/mobo.rb b/lib/mobo.rb
@@ -61,7 +61,7 @@ def device_config(device)
         "abi"         => "x86_64",
         "height"      => "1200",
         "width"       => "720",
-        "sdcard_size" => "20M" }
+        "sdcard"      => "20M" }
       device = defaults.merge(device)
     end
 

diff --git a/lib/mobo/android.rb b/lib/mobo/android.rb
@@ -166,12 +166,12 @@ def find_open_port
       end
 
       def create_sdcard
-        @device["sdcard"] = "#{@device["name"]}_sdcard.img"
-        Mobo.cmd("mksdcard -l e #{@device["sdcard_size"]} #{@device["sdcard"]}")
+        @device["sdcard_img"] = "#{@device["name"]}_sdcard.img"
+        Mobo.cmd("mksdcard -l e #{@device["sdcard"]} #{@device["sdcard_img"]}")
       end
 
       def destroy_sdcard
-        Mobo.cmd("rm -f #{@device["sdcard"]}")
+        Mobo.cmd("rm -f #{@device["sdcard_img"]}")
       end
 
       def create_cache
@@ -189,7 +189,7 @@ def start
 
         cmd ="emulator @#{@device["name"]} \
           -port #{@device["port"]} \
-          -sdcard #{@device["sdcard"]} \
+          -sdcard #{@device["sdcard_img"]} \
           -cache #{@device["cache"]}"
         pid = Process.fork {
           Mobo.cmd(cmd)