mobo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cb76d7425338870e1922afcda730786204c9881
-  data.tar.gz: c212948730a6331afd4c35db61842e79c9f2655a
+  metadata.gz: ec492a01d8e2c5e073f564253929c3de1bea2e14
+  data.tar.gz: 847a8263a0f14aa1d8bbf6e36279788853d5d5c6
 SHA512:
-  metadata.gz: cdf7ad5905136253b76e31e8e09c414a11ea76fb27b8156177363daac969d306c3d4d2c8db47637c908a6905b2fe353c464f325baea52f1f92172b6460e61e99
-  data.tar.gz: 9565d3808d4f3ecf5d9a7a27ccfd7cf87ad6c4312d490b92125e62d7107a9374493ceba75ad9bd6da9e13b7233d900f7913cb7ce3e0673ff65da6789ade5d4f4
+  metadata.gz: 371938188360908000aa6eb0415c35b955c1a4be1495627a40804f65528eb068db216d668a3d832c29acdbd7c2aa7dea738dc475b4f6215231503349c10338a7
+  data.tar.gz: 343f1fb59c6b9ea4a68b1af77b3b530446c0c81fa97aa4dd92d9bec3c686f20cedc7aeae3a8c51aa3a6466055e2794c11a480bb012ef0d818b554ad1b5857434

data/lib/mobo/android.rb

@@ -4,57 +4,44 @@ module Mobo
 
     class << self
       def exists?
-        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")
+        if Dir.exists?(Mobo.home_dir) and not Dir["#{Mobo.home_dir}/**/tools/android"].empty?
+          add_to_path
         end
+        Mobo.cmd("which android | grep #{Mobo.home_dir}")
       end
 
+      # as a default, install in ~/.mobo
       def install
-        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.")
+        unless File.exists?(Mobo.android_home)
+          if SystemCheck.ubuntu?
+            Mobo.cmd("curl -o #{path}/android-sdk_r24.3.4-linux.tgz http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz")
+            Mobo.cmd("tar -xf #{path}/android-sdk_r24.3.4-linux.tgz -C #{path}")
+            Mobo.cmd("mv #{path}/android-sdk-linux #{Mobo.android_home}")
+          elsif SystemCheck.osx?
+            Mobo.cmd("curl -o #{path}/android-sdk_r24.3.4-macosx.zip http://dl.google.com/android/android-sdk_r24.3.4-macosx.zip")
+            Mobo.cmd("unzip #{path}/android-sdk_r24.3.4-macosx.zip -d #{path}")
+            Mobo.cmd("mv #{path}/android-sdk-macosx #{Mobo.android_home}")
+          else
+            Mobo.log.error("Platform not yet supported! Please raise a request with the project to support it.")
+          end
         end
+        add_to_path
       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)
-        android_tools = android_home + '/tools'
-        unless ENV['PATH'].match(/#{android_home}/)
-          ENV['ANDROID_HOME'] = android_home
-          ENV['PATH'] += ":#{android_tools}"
+      def add_to_path
+        unless ENV['PATH'].match(/^#{Mobo.android_home}\/tools/)
+          ENV['ANDROID_HOME'] = Mobo.android_home
+          ENV['PATH'] = "#{Mobo.android_home}/tools:#{ENV['PATH']}"
+          Mobo.log.debug("$PATH set to '#{ENV['PATH']}' to set up android")
         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")
-        end
-        raise "Setting ANDROID_HOME and PATH failed" unless self.exists?
       end
 
       def package_exists?(package)
-        Mobo.cmd("android list sdk --extended --no-ui --all | grep '\"#{package}\"'")
+        Mobo.cmd("android list sdk --extended --no-ui --all | grep '#{package}'")
       end
 
       def install_package(package)
-        Mobo.cmd("echo y | android update sdk --no-ui --all --filter #{package} 2>&1 >> /dev/null")
+        Mobo.cmd("echo y | android update sdk --no-ui --all --filter #{package}")
       end
     end
 
@@ -70,6 +57,8 @@ module Mobo
           records.each do |record|
             return record if record.match(/#{target}/)
           end
+          # return empty string if nothing is found
+          return ""
         end
 
         def abi_package(target, abi)
@@ -111,21 +100,21 @@ module Mobo
       class << self
 
         def add_to_path
-          if !ENV['PATH'].match(/platform-tools/)
-            ENV['PATH'] += ":#{ENV['ANDROID_HOME']}/platform-tools"
-            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")
+          if !ENV['PATH'].match(/#{Mobo.android_home}\/platform-tools/)
+            ENV['PATH'] = "#{Mobo.android_home}/platform-tools:#{ENV['PATH']}"
           end
+          Mobo.log.debug("$PATH set to #{ENV['PATH']}")
         end
 
         def exists?
-          Mobo.cmd("which adb")
+          if Dir.exists?(Mobo.home_dir) and not Dir["#{Mobo.android_home}/platform-tools/adb"].empty?
+            add_to_path
+          end
+          Mobo.cmd("which adb | grep #{Mobo.home_dir}")
         end
 
         def install
-          Mobo.cmd("echo yes | android update sdk --all --no-ui --filter platform-tools 2>&1 >> /dev/null")
+          Mobo.cmd("echo yes | android update sdk --all --no-ui --filter platform-tools")
           add_to_path  
           raise "Installing adb failed" unless self.exists?
         end

data/lib/mobo/system_setup.rb

@@ -8,6 +8,12 @@ module Mobo
         end
       end
 
+      def 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)
+      end
+
     end
   end
 end

data/lib/mobo.rb

@@ -8,7 +8,7 @@ require_relative 'mobo/system_setup'
 
 module Mobo
   class << self
-    attr_accessor :log, :data, :devices
+    attr_accessor :log, :data, :devices, :home_dir
 
     def log
       unless @log
@@ -18,6 +18,10 @@ module Mobo
       @log
     end
 
+    def android_home
+      @home_dir + '/android-sdk'
+    end
+
     def cmd(command)
       log.debug(command)
       system(command)
@@ -63,6 +67,7 @@ module Mobo
     end
 
     def system_checks
+      SystemSetup.mobo
       SystemSetup.base_libraries
       SystemCheck.android?
       SystemCheck.adb?

metadata

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