aptools 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/aptools.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "aptools"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chinmay Garde"]
-  s.date = "2012-12-15"
+  s.date = "2013-06-12"
   s.description = "Assorted tools for Apportable Platform"
   s.email = "chinmay@apportable.com"
-  s.executables = ["installexp"]
+  s.executables = ["apaapt", "apadb", "installexp"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "aptools.gemspec",
+    "bin/apaapt",
+    "bin/apadb",
     "bin/installexp",
     "lib/apinstallexp.rb",
     "test/helper.rb",

data/bin/installexp

@@ -1,16 +1,36 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'open3'
 require 'fileutils'
 
+def ExecutablePath (ex)
+    return "#{File.dirname(__FILE__)}/#{ex}"
+end
+
 def ExecuteCommand(command, debug)
-    result = `#{command}`
-    puts result if debug
-    return result
+    stdin, stdout, stderr, wait_thr = Open3.popen3(command)
+
+    res = stdout.read
+
+    if debug
+        puts ">>>>>>>>>>>>>>>>>>>>>>>>>"
+        puts "Command '#{command}'"
+        puts res
+        puts "<<<<<<<<<<<<<<<<<<<<<<<<<"
+    end
+    
+    stdin.close
+    stdout.close
+    stderr.close
+
+    return res
 end
 
 def FindPackageName(debug)
-    check_aapt = ExecuteCommand("which aapt", debug)
-    if check_aapt.length == 0
-        puts "Could not find aapt in your path"
+    check_apaapt = ExecuteCommand("which apaapt", debug)
+    if check_apaapt.length == 0
+        puts "Could not find apaapt in your path"
         return ""
     end
 
@@ -20,7 +40,7 @@ def FindPackageName(debug)
         return ""
     end
 
-    info = ExecuteCommand("aapt dump badging #{apks[0]}", debug)
+    info = ExecuteCommand("#{ExecutablePath('apaapt')} dump badging #{apks[0]}", debug)
 
     matchdata = info.match("package: name='?(.+)' versionCode='.+' versionName='.+'")
     package_name = matchdata[1]
@@ -43,11 +63,11 @@ def InstallAPK(package_name, debug)
     apk_file = Dir['**/*.apk'][0]
 
     puts "Deleting application if present"
-    ExecuteCommand("adb uninstall #{package_name}", debug)
+    ExecuteCommand("#{ExecutablePath('apadb')} uninstall #{package_name}", debug)
     puts "Pushing expansion file"
-    ExecuteCommand("adb push #{obb_file} /mnt/sdcard/Android/obb/#{package_name}/#{File.basename(obb_file)}", debug)
+    ExecuteCommand("#{ExecutablePath('apadb')} push #{obb_file} /mnt/sdcard/Android/obb/#{package_name}/#{File.basename(obb_file)}", debug)
     puts "Installing application"
-    ExecuteCommand("adb install #{apk_file}", debug)
+    ExecuteCommand("#{ExecutablePath('apadb')} install #{apk_file}", debug)
     return true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70185097177140 !ruby/object:Gem::Requirement
+  requirement: &70114809342380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185097177140
+  version_requirements: *70114809342380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70185097176400 !ruby/object:Gem::Requirement
+  requirement: &70114809341860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70185097176400
+  version_requirements: *70114809341860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70185097175800 !ruby/object:Gem::Requirement
+  requirement: &70114809341340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185097175800
+  version_requirements: *70114809341340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70185097174940 !ruby/object:Gem::Requirement
+  requirement: &70114809340720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,12 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70185097174940
+  version_requirements: *70114809340720
 description: Assorted tools for Apportable Platform
 email: chinmay@apportable.com
 executables:
+- apaapt
+- apadb
 - installexp
 extensions: []
 extra_rdoc_files:
@@ -72,6 +74,8 @@ files:
 - Rakefile
 - VERSION
 - aptools.gemspec
+- bin/apaapt
+- bin/apadb
 - bin/installexp
 - lib/apinstallexp.rb
 - test/helper.rb
@@ -91,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4273910492216479876
+      hash: 4318947668765125427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: