mobo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec492a01d8e2c5e073f564253929c3de1bea2e14
-  data.tar.gz: 847a8263a0f14aa1d8bbf6e36279788853d5d5c6
+  metadata.gz: 71137bc9522c5c48582848734659b0f57d8e97fb
+  data.tar.gz: 283d8f1f33151de0dfd6a89ba35f9f522b9db44c
 SHA512:
-  metadata.gz: 371938188360908000aa6eb0415c35b955c1a4be1495627a40804f65528eb068db216d668a3d832c29acdbd7c2aa7dea738dc475b4f6215231503349c10338a7
-  data.tar.gz: 343f1fb59c6b9ea4a68b1af77b3b530446c0c81fa97aa4dd92d9bec3c686f20cedc7aeae3a8c51aa3a6466055e2794c11a480bb012ef0d818b554ad1b5857434
+  metadata.gz: 189e323da8cf03c47ad23580989e3ae52bb2be0357ff05feef8ec8cb293695035921a6db7c9db463556e5932da00425f1f1b0f08439e1ca63adc3081a8f23c6e
+  data.tar.gz: 356ecc17cdf44f30c863880042dd0290341163c1fbf6a247fa59ab43be5d716cb1d88608a6d65675b8e259799be3835d1e5825b1747f92feb8a32ba36ee73305

data/lib/mobo.rb

@@ -22,6 +22,10 @@ module Mobo
       @home_dir + '/android-sdk'
     end
 
+    def avd_home
+      @home_dir + '/avd'
+    end
+
     def cmd(command)
       log.debug(command)
       system(command)
@@ -57,7 +61,7 @@ module Mobo
         "abi"         => "x86_64",
         "height"      => "1200",
         "width"       => "720",
-        "sdcard_size" => "20M" }
+        "sdcard"      => "20M" }
       device = defaults.merge(device)
     end
 

data/lib/mobo/android.rb

@@ -43,6 +43,25 @@ module Mobo
       def install_package(package)
         Mobo.cmd("echo y | android update sdk --no-ui --all --filter #{package}")
       end
+
+      def haxm_installed?
+        if SystemCheck.osx?
+          Mobo.cmd("kextstat | grep intel")
+        end
+      end
+
+      def install_haxm
+        if SystemCheck.osx?
+          install_package("extra-intel-Hardware_Accelerated_Execution_Manager")
+          Mobo.cmd("hdiutil attach #{Mobo.android_home}/extras/intel/Hardware_Accelerated_Execution_Manager/IntelHAXM.dmg")
+          Mobo.log.info("Using the sudo command to install haxm - Intel Hardware Accelerated Execution Manager")
+          haxm_mount_point = Dir["/Volumes/IntelHAXM*"].first
+          Mobo.cmd("sudo installer -pkg #{haxm_mount_point}/*.mpkg -target /")
+          Mobo.cmd("hdiutil detach #{haxm_mount_point}")
+        else
+          raise "Platform not supported for haxm installation yet"
+        end
+      end
     end
 
     module Targets
@@ -87,6 +106,7 @@ module Mobo
             --name #{device["name"]} \
             --target #{device["target"]} \
             --abi #{device["abi"]} \
+            --path #{Mobo.avd_home}/#{device["name"]} \
             --force"
           emulator_cmd += " --skin #{device["skin"]}" if device["skin"]
           Mobo.cmd(emulator_cmd)
@@ -146,12 +166,12 @@ module Mobo
       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
@@ -169,7 +189,7 @@ module Mobo
 
         cmd ="emulator @#{@device["name"]} \
           -port #{@device["port"]} \
-          -sdcard #{@device["sdcard"]} \
+          -sdcard #{@device["sdcard_img"]} \
           -cache #{@device["cache"]}"
         pid = Process.fork {
           Mobo.cmd(cmd)

data/lib/mobo/system_setup.rb

@@ -5,6 +5,8 @@ module Mobo
       def base_libraries
         if SystemCheck.ubuntu?
           Mobo.cmd("sudo apt-get install -y libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
+        elsif SystemCheck.osx?
+          Android.install_haxm unless Android.haxm_installed?
         end
       end
 
@@ -12,6 +14,7 @@ module Mobo
         Mobo.home_dir = File.expand_path("~/.mobo")
         Mobo.log.info("Using #{Mobo.home_dir} as home directory. Android will be installed here")
         Dir.mkdir(Mobo.home_dir) unless File.exists?(Mobo.home_dir)
+        Dir.mkdir(Mobo.avd_home) unless File.exists?(Mobo.avd_home)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark O'Shea