mobo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769b5307fcef24c8fd89ae3812977029429d9aa3
-  data.tar.gz: 03bb960b0e2aa5bec20a8d9605d0dece15504896
+  metadata.gz: 8f77e20cff1a1e98f80bf8f37403cea15cffcbc5
+  data.tar.gz: b25b6714a1b911f45d20461c8472777fa34d5b8e
 SHA512:
-  metadata.gz: 17af1fe2a87d0929d89cdc1d4b8762939a32300845fb0099279d7d638fd4047f3b9cbf2e8c1e11a11f240a67b02e08dd042f110dda9aa8a524b45f1c14ca4348
-  data.tar.gz: 7e8831e69051b35a96797f5b31817a35ddc3eea5358cca8ac10e3afd7e2cd7deb4c20c2ef0dcf2d95ed785e0efaf05158ba4a532d69ba4859f8e7817dfdd4db2
+  metadata.gz: d55e7bf129fbec48f552aa2613072b9e49db8de1ad4defa88747914cd4d0b37499dfb3c20bb3b1ce84cda0bcc4957d6b4453ebc7d213c9986243be753aa9cef2
+  data.tar.gz: b1ee9d312f2b2b32247c3cbd27228a379e7156d3bb3e5ecbed1eaad10c90a879444a2267de3dbbafc97f342c6d7d87a460390c41bc17611936a669ebf064c4f0

data/lib/mobo/android.rb

@@ -4,33 +4,49 @@ module Mobo
 
     class << self
       def exists?
-        add_to_path
-        Mobo.cmd("which android")
+        if Mobo.cmd("which android")
+          return true
+        # if exists? isn't true straight away, check if ANDROID_HOME is set, and try and
+        # fix the issue
+        elsif ENV['ANDROID_HOME'] and File.exists?(ENV['ANDROID_HOME'] + '/tools/android')
+          add_to_path(ENV['ANDROID_HOME'])
+          Mobo.cmd("which android")
+        end
       end
 
       def install
-         Mobo.cmd("curl -O http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz")
-         Mobo.cmd("sudo tar -xf android-sdk_r24.3.4-linux.tgz -C /usr/local/")
-         Mobo.cmd("sudo chown -R $(whoami) /usr/local/android-sdk-linux")
-         add_to_path
+        if SystemCheck.ubuntu?
+          Mobo.cmd("curl -O http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz")
+          Mobo.cmd("sudo tar -xf android-sdk_r24.3.4-linux.tgz -C /usr/local/")
+          Mobo.cmd("sudo chown -R $(whoami) /usr/local/android-sdk-linux")
+          add_to_path("/usr/local/android-sdk-linux")
+        elsif SystemCheck.osx?
+          Mobo.cmd("curl -O http://dl.google.com/android/android-sdk_r24.3.4-macosx.zip")
+          Mobo.cmd("sudo unzip android-sdk_r24.3.4-macosx.zip -d /usr/local/")
+          Mobo.cmd("sudo chown -R $(whoami) /usr/local/android-sdk-macosx")
+          add_to_path("/usr/local/android-sdk-macosx")
+        else
+          Mobo.log.error("Platform not yet supported! Please raise a request with the project to support it.")
+        end
       end
  
       # setting env variables in the bash profile and trying to reload them isn't easy,
       # as the variables are only set in the sub process the bash_profile is executed in
       # so we can set env variables, which take effect here, and also set them in bash_profile
       # for the user to use later on
-      def add_to_path
-        android_home = "/usr/local/android-sdk-linux"
-        
-        if !ENV['PATH'].match(/#{android_home}/)
+      def add_to_path(android_home)
+        android_tools = android_home + '/tools'
+        unless ENV['PATH'].match(/#{android_home}/)
           ENV['ANDROID_HOME'] = android_home
-          ENV['PATH'] += ":#{ENV['ANDROID_HOME']}/tools"
-          Mobo.cmd("echo \"export ANDROID_HOME=#{ENV['ANDROID_HOME']}\" >> ~/.bash_profile")
-          Mobo.cmd("echo \"export PATH=#{ENV['PATH']}\" >> ~/.bash_profile")
+          ENV['PATH'] += ":#{android_tools}"
+        end
+        unless Mobo.cmd("grep -i ANDROID_HOME ~/.bash_profile")
+          Mobo.cmd("echo 'export ANDROID_HOME=#{android_home}' >> ~/.bash_profile")
+          Mobo.cmd("echo 'export PATH=\$PATH:#{android_tools}' >> ~/.bash_profile")
           Mobo.log.info("ANDROID_HOME and PATH env variables have been updated. 
             Start a new terminal session for them to take effect")
-          raise "Setting ANDROID_HOME and PATH failed" unless self.exists?
         end
+        raise "Setting ANDROID_HOME and PATH failed" unless self.exists?
       end
 
       def package_exists?(package)
@@ -74,7 +90,7 @@ module Mobo
     module Avd
       class << self
         def create(device)
-          SystemCheck.target_exists(device["target"])
+          SystemCheck.target_exists?(device["target"])
           SystemCheck.abi_exists?(device["target"], device["abi"])
           SystemCheck.skin_exists?(device["target"], device["skin"])
           emulator_cmd =
@@ -97,7 +113,7 @@ module Mobo
         def add_to_path
           if !ENV['PATH'].match(/platform-tools/)
             ENV['PATH'] += ":#{ENV['ANDROID_HOME']}/platform-tools"
-            Mobo.cmd("echo \"export PATH=#{ENV['PATH']}\" >> ~/.bash_profile")
+            Mobo.cmd("echo 'export PATH=\$PATH:#{ENV['ANDROID_HOME']}/platform-tools' >> ~/.bash_profile")
             Mobo.log.debug("ENV['PATH'] set to #{ENV['PATH']}")
             Mobo.log.info("PATH env variables has been updated. 
             Start a new terminal session for it to take effect")
@@ -105,7 +121,6 @@ module Mobo
         end
 
         def exists?
-          add_to_path
           Mobo.cmd("which adb")
         end
 
@@ -171,6 +186,7 @@ module Mobo
           Mobo.cmd(cmd)
           Mobo.log.info("Emulator #{@device["name"]} has stopped")
         }
+        Process.detach(pid)
 
         @device["pid"] = pid
         @device["id"] = "emulator-#{@device["port"]}"
@@ -186,8 +202,12 @@ module Mobo
             elsif !running?
               Mobo.log.error("Emulator #{@device["name"]} has stopped")
               break
+            elsif booting?
+              Mobo.log.info("waiting for #{@device["id"]} to boot...")
+              sleep(BOOT_SLEEP)
             else
-              Mobo.log.debug("waiting for #{@device["id"]} to boot...")
+              # adb does not always recgnoise new emulators booted up, so it needs to be restarted
+              Mobo.cmd('adb kill-server')
               sleep(BOOT_SLEEP)
             end
           end
@@ -209,11 +229,12 @@ module Mobo
 
       def booted?
         bootanim = Mobo.cmd_out("adb -s #{@device["id"]} shell 'getprop init.svc.bootanim'")
-        if bootanim.match(/stopped/)
-          return true
-        else
-          return false
-        end
+        bootanim.match(/stopped/)
+      end
+
+      def booting?
+        bootanim = Mobo.cmd_out("adb -s #{@device["id"]} shell 'getprop init.svc.bootanim'")
+        bootanim.match(/running/)
       end
 
       def unlock

data/lib/mobo/system_check.rb

@@ -7,19 +7,25 @@ module Mobo
         raise error unless $?.success?
       end
 
-      def android
-        Android.exists?
+      def android?
+        Android.install unless Android.exists?
       end
 
-      def target_exists(target)
+      def adb?
+        Android::Adb.install unless Android::Adb.exists?
+      end
+
+      def target_exists?(target)
         unless Android::Targets.exists?(target)
-          SystemSetup.install_target(target)
+          Android.install_package(target) if Android.package_exists?(target)
         end
       end
 
       def abi_exists?(target, abi)
         unless Android::Targets.has_abi?(target, abi)
-          SystemSetup.install_abi(target, abi)
+          package_name = Android::Targets.abi_package(target, abi)
+          Android.install_package(package_name) if Android.package_exists?(package_name)
+          raise "Cannot install abi: #{abi} for #{target}" unless $?.success?
         end
       end
 
@@ -27,15 +33,17 @@ module Mobo
         Android::Targets.has_skin?(target, abi)
       end
 
-      def adb
-        unless Android::Adb.exists?
-          SystemSetup.install_adb
-        end
-      end
-
       def device_file_exists?(filename)
         File.exists?(filename)
       end
+
+      def ubuntu?
+        RUBY_PLATFORM.match(/linux/) and Mobo.cmd("which apt-get")
+      end
+
+      def osx?
+        RUBY_PLATFORM.match(/darwin/)
+      end
     end
   end
 end

data/lib/mobo/system_setup.rb

@@ -3,30 +3,11 @@ module Mobo
     class << self
 
       def base_libraries
-        #if ubuntu
-        if(Mobo.cmd("which apt-get"))
+        if SystemCheck.ubuntu?
           Mobo.cmd("sudo apt-get install -y libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
         end
       end
 
-      def install_android
-        Android.install
-      end
-
-      def install_target(target)
-        Android.install_package(target) if Android.package_exists?(target)
-        raise "Cannot install target: #{target}" unless $?.success?
-      end
-
-      def install_abi(target, abi)
-        package_name = Android::Targets.abi_package(target, abi)
-        Android.install_package(package_name) if Android.package_exists?(package_name)
-        raise "Cannot install abi: #{abi} for #{target}" unless $?.success?
-      end
-
-      def install_adb
-        Android::Adb.install unless Android::Adb.exists?
-      end
     end
   end
 end

data/lib/mobo.rb

@@ -60,8 +60,8 @@ module Mobo
 
     def system_checks
       SystemSetup.base_libraries
-      SystemCheck.android
-      SystemCheck.adb
+      SystemCheck.android?
+      SystemCheck.adb?
     end
 
     def up(filename)
@@ -83,7 +83,7 @@ module Mobo
       File.open(MOBO_DEVICES_CACHE_FILE, "w") do |file|
         file.write Mobo.devices.to_yaml
       end
-      Process.waitall
+      Process.wait
     end
 
     def status(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark O'Shea
@@ -17,7 +17,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- mobo.rb
 - lib/mobo/android.rb
 - lib/mobo/system_check.rb
 - lib/mobo/system_setup.rb
@@ -43,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Mobo - android emulator abstraction

data/mobo.rb

@@ -1,80 +0,0 @@
-#!/usr/bin/env ruby
-require 'yaml'
-require 'pp'
-require 'logger'
-require_relative 'lib/mobo/android'
-require_relative 'lib/mobo/system_check'
-
-module Mobo
-  class << self
-    attr_accessor :log, :data, :devices
-
-    def log
-      @log || @log = Logger.new(STDOUT)
-    end
-
-    def cmd(command)
-      log.debug(command)
-      system(command)
-    end
-
-    def cmd_out(command)
-      log.debug(command)
-      `#{command}`
-    end
-
-    def start_process(cmd)
-      pid = Process.spawn(cmd)
-        Process.detach(pid)
-        pid
-      end
-
-    def devices
-      @devices = @devices.nil? ? {} : @devices
-    end
-
-    def device_config(device)
-      defaults = {
-        "name"        => "default",
-        "target"      => "android-22",
-        "abi"         => "default/x86_64",
-        "height"      => "1200",
-        "width"       => "720",
-        "sdcard_size" => "20M" }
-      defaults.merge(device)
-    end
-
-    def up
-      # retrive settings for one of each device
-      Mobo.data["devices"].each do |device|
-        device = device_config(device)
-        Mobo.devices[device["name"]] = device
-      end
-
-      # build and boot devices
-      Mobo.devices.each_pair do |name, device|
-        Mobo::Android::Avd.create(device)
-        emulator = Android::Emulator.new(device)
-        emulator.start
-        emulator.unlock_when_booted
-      end
-      File.open(MOBO_DEVICES_FILE, "w") do |file|
-        file.write Mobo.devices.to_yaml
-      end
-    end
-
-    def status
-      Mobo.data.each_pair do |name, device|
-        Mobo::Android::Emulator.new(device).status
-      end
-    end
-
-    def destroy
-      Mobo.data.each_pair do |name, device|
-        Mobo::Android::Emulator.new(device).destroy
-      end
-    end
-
-  end
-
-end