android-adb 0.0.5 → 0.0.6

data/.yardopts

@@ -0,0 +1 @@
+--protected

data/Gemfile

@@ -1,9 +1,10 @@
 source "http://rubygems.org"
 
-gem "POpen4", "~> 0.1.4"
+gem "Platform", ">= 0.4.0"
 
 group :development do
-  gem "bundler", "~> 1.0"
+  gem "rake"
+  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "yard", ">= 0.6.8"
 end

data/Gemfile.lock

@@ -1,24 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
     Platform (0.4.0)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    open4 (1.0.1)
     rake (0.8.7)
-    rcov (0.9.9)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
-  POpen4 (~> 0.1.4)
-  bundler (~> 1.0)
+  Platform (>= 0.4.0)
+  bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
-  rcov
+  rake
+  yard (>= 0.6.8)

data/LICENSE

@@ -1,202 +1,21 @@
+Copyright (c) 2011 Nic Strong <nic.strong@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2011 Nic Strong (nic.strong@gmail.com)
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/README.md

@@ -1,22 +1,12 @@
-Android ADB
-===========
-
-A ruby gem to bind to the various adb commands (Requires the Android SDK to be installed and tools directory to be in the path).
-
-### Installation from GitHub sources
-
-    git clone git://github.com/nicstrong/android-adb.git
-    cd android-adb
-    bundle install
-    rake install
-
-### Running on Ruby 1.9 under Win32
-
-The POpen4 gem uses win32/open3 on then win32 platform. This gem does not work with Ruby 1.9.
-
-To work around this use matschaffer port from github. To install:
-
-    git clone git://github.com/matschaffer/win32-open3-19.git
-    cd win32-open3-19
-    gem build win32-open3-19.gemspec
-    gem intall win32-open3-19-0.0.1.gem
+Android ADB
+===========
+
+A ruby gem to bind to the various adb commands (Requires the Android SDK to be installed and tools directory to be in the path).
+
+### Installation from GitHub sources
+
+    git clone git://github.com/nicstrong/android-adb.git
+    cd android-adb
+    bundle install
+    rake install
+

data/Rakefile

@@ -33,21 +33,18 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#end
+
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']
 end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "android-adb #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/android-adb.gemspec

@@ -1,61 +1,70 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{android-adb}
-  s.version = "0.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nic Strong"]
-  s.date = %q{2011-04-28}
-  s.email = %q{nic.strong@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "android-adb.gemspec",
-    "examples/listpackages.rb",
-    "examples/showcmds.rb",
-    "lib/android-adb.rb",
-    "lib/android-adb/version.rb"
-  ]
-  s.homepage = %q{http://github.com/nicstrong/android-adb}
-  s.licenses = ["Apache 2.0"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Ruby bindings for the Android SDK adb command.}
-  s.test_files = [
-    "examples/listpackages.rb",
-    "examples/showcmds.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<POpen4>, ["~> 0.1.4"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<POpen4>, ["~> 0.1.4"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<POpen4>, ["~> 0.1.4"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{android-adb}
+  s.version = "0.0.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nic Strong"]
+  s.date = %q{2011-05-03}
+  s.email = %q{nic.strong@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".yardopts",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "android-adb.gemspec",
+    "examples/listdevices.rb",
+    "examples/listpackages.rb",
+    "examples/showcmds.rb",
+    "lib/android-adb.rb",
+    "lib/android-adb/Adb.rb",
+    "lib/android-adb/Device.rb",
+    "lib/android-adb/Package.rb",
+    "lib/android-adb/version.rb"
+  ]
+  s.homepage = %q{http://github.com/nicstrong/android-adb}
+  s.licenses = ["Apache 2.0"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{Ruby bindings for the Android SDK adb command.}
+  s.test_files = [
+    "examples/listdevices.rb",
+    "examples/listpackages.rb",
+    "examples/showcmds.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<Platform>, [">= 0.4.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<yard>, [">= 0.6.8"])
+    else
+      s.add_dependency(%q<Platform>, [">= 0.4.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<yard>, [">= 0.6.8"])
+    end
+  else
+    s.add_dependency(%q<Platform>, [">= 0.4.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<yard>, [">= 0.6.8"])
+  end
+end
+

data/examples/listdevices.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby -wKU
+
+require 'rubygems'
+require "pp"
+
+require File.expand_path('../lib/android-adb/Adb', File.dirname(__FILE__))
+require File.expand_path('../lib/android-adb/Device', File.dirname(__FILE__))
+
+adb = AndroidAdb::Adb.new()
+puts "Devices:"
+pp adb.get_devices

data/examples/listpackages.rb

@@ -3,8 +3,9 @@
 require 'rubygems'
 require "pp"
 
-require File.expand_path('../lib/android-adb', File.dirname(__FILE__))
+require File.expand_path('../lib/android-adb/Adb', File.dirname(__FILE__))
+require File.expand_path('../lib/android-adb/Package', File.dirname(__FILE__))
 
-adb = AndroidAdb::Adb.new()
+adb = AndroidAdb::Adb.new({:show_stderr => true})
 puts "Packages:"
 pp adb.get_packages

data/examples/showcmds.rb

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby -wKU
 
-require File.expand_path('../lib/android-adb', File.dirname(__FILE__))
+require File.expand_path('../lib/android-adb/Adb', File.dirname(__FILE__))
 
 adb = AndroidAdb::Adb.new({:dry_run => true})
 puts "Packages:"
 adb.get_packages
+adb.get_packages({:serial => "1234"})
 
 puts "Devices:"
 adb.get_devices
 
 puts "Uninstall:"
-adb.uninstall("com.example.package")
-adb.uninstall("com.example.package", {:forwardlock => true})
-adb.uninstall("com.example.package", {:reinstall => true})
-adb.uninstall("com.example.package", {:sdcard => true})
-adb.uninstall("com.example.package", {:forwardlock => true, :reinstall => true, :sdcard => true})
+adb.install("com.example.package")
+adb.install("com.example.package", {:forwardlock => true}, {:serial => "abcd"})
+adb.install("com.example.package", {:reinstall => true})
+adb.install("com.example.package", {:sdcard => true})
+adb.install("com.example.package", {:forwardlock => true, :reinstall => true, :sdcard => true})

data/lib/android-adb.rb

@@ -1,91 +1,13 @@
-require 'rubygems'
-require 'POpen4'
+# Author:: Nic Strong  (mailto:nic.strong@gmail.com)
+# Copyright:: Copyright (c) 2011 Nic Strong
+# License::   MIT (See LICENSE)
 
-module AndroidAdb
-
-  class Adb
-    attr_accessor :adb_path, :show_stderr, :dry_run
-
-    def initialize(opts = {})
-      @show_stderr = opts[:show_stderr] || false
-      @dry_run = opts[:dry_run] || false
-      @adb_path = opts[:adb_path] || Adb.find_adb
-    end # def
-
-    def get_devices
-      devices = []
-      run_adb("devices") do |pout|
-        pout.each do |line|
-          line = line.strip
-          if (!line.empty? && line !~ /^List of devices/)
-            parts = line.split
-            devices << {:name   => parts[0],
-                        :serial => parts[1]}
-          end
-        end
-      end
-      return devices
-    end
-
-    def get_packages
-      packages = []
-      run_adb_shell("pm list packages -f") do |pout|
-        pout.each do |line|
-          parts = line.split(":")
-          if (parts.length > 1)
-            info = parts[1].strip.split("=")
-            packages <<  {:apk => info[0], :name => info[1]}
-          end
-        end
-      end
-      return packages
-    end # def
+require 'android-adb/Device'
+require 'android-adb/Package'
+require 'android-adb/Adb'
 
-    def uninstall(package, opts = {})
-      opt_arg = ""
-      opt_arg += " -l" if opts[:forwardlock]
-      opt_arg += " -r" if opts[:reinstall]
-      opt_arg += " -s" if opts[:sdcard]
-      run_adb("uninstall#{opt_arg} #{package}")
-    end
-
-    def run_adb(args, &block)
-      path = "#{@adb_path} #{args}"
-      run(path, &block)
-    end # def
-
-    def run_adb_shell(args, &block)
-      path = "#{@adb_path} shell #{args}"
-      run(path, &block)
-    end
-
-    private
-    def run(path, &block)
-      if @dry_run
-        puts "[#{path}]"
-        return
-      end
-      POpen4::popen4(path) do |pout, perr, pin|
-        if (@show_stderr)
-          perr.each do |line|
-            puts "{e}" + line
-          end
-        end
-        yield pout
-      end
-    end # def
-
-    def self.find_adb
-      begin
-        which_adb = `which adb`.strip
-        return which_adb if !which_adb.nil? && !which_adb.empty?
-      rescue
-      end
-      android_home = ENV['ANDROID_HOME']
-      return File.join(android_homes, "platform-tool/adb") if !android_home.nil? && !android_home.empty
-      return "adb"
-    end
-  end # class
+module AndroidAdb
+  LIBRARY_PATH       = File.join(File.dirname(__FILE__), 'android-adb')
 end # module
 
 

data/lib/android-adb/Adb.rb

@@ -0,0 +1,142 @@
+# Author:: Nic Strong  (mailto:nic.strong@gmail.com)
+# Copyright:: Copyright (c) 2011 Nic Strong
+# License::   MIT (See LICENSE)
+
+require 'Open3'
+require 'Platform'
+
+module AndroidAdb
+
+  class Adb
+    attr_accessor :adb_path, :show_stderr, :dry_run, :last_command
+
+    # Contructs an Adb object for issuing commands to the connected device or emulator.
+    #
+    # If the adb path is not specified in the +opts+ hash it is determined in the following order:
+    # 1. Try and use the unix which command to locate the adb binary.
+    # 2. Use the ANDROID_HOME environment variable.
+    # 3. Default to adb (no path specified).
+    #
+    # @param [Hash] opts The options to create the Adb object with.
+    # @option opts [Boolean] :show_stderr Used for diagnosing issues, it will dump the stderr of the *adb* command being processed.
+    # @option opts [Boolean] :dry_run Does not execute the *adb* command but will output the command that would be run.
+    # @option opts [Boolean] :adb_path Manually set the path to the adb binary.
+    def initialize(opts = {})
+      @show_stderr = opts[:show_stderr] || false
+      @dry_run = opts[:dry_run] || false
+      @adb_path = opts[:adb_path] || Adb.find_adb
+    end
+
+    # Returns a list of all connected devices. The collection is returned as a hash
+    # containing the device name <tt>:name</tt> and the serial <tt>:serial</tt>.
+    # @return [Array<Device>] THe list of connected devices/emulators.
+    def get_devices
+      devices = []
+      run_adb("devices") do |pout|
+        pout.each do |line|
+          line = line.strip
+          if (!line.empty? && line !~ /^List of devices/)
+            parts = line.split
+            device = AndroidAdb::Device.new(parts[0], parts[1])
+            devices << device
+          end
+        end
+      end
+      return devices
+    end
+
+    # Returns a list of all installed packages on the device.
+    # @param [Hash] adb_opts Options for the adb command (@see #run_adb)
+    # @return [Hash] THe list of installed packages. The hash returned contains the apk file name <tt>:apk</tt> and the name of the package <tt>:name</tt>.
+    def get_packages(adb_opts = {})
+      packages = []
+      run_adb_shell("pm list packages -f", adb_opts) do |pout|
+        pout.each do |line|
+          parts = line.split(":")
+          if (parts.length > 1)
+            info = parts[1].strip.split("=")
+            package = AndroidAdb::Package.new(info[1], info[0]);
+            packages << package;
+          end
+        end
+      end
+      return packages
+    end
+
+    # Installs a package from the APK file <tt>package</tt> onto the device/emulator.
+    # @param [String] package The APK package file
+    # @param [Hash] opts The options used to install the package.
+    # @option opts [Boolean] :forwardlock Forward lock the package being installed.
+    # @option opts [Boolean] :reinstall Reinstall the package, keeping existing data.
+    # @option opts [Boolean] :sdcard Install the package to the SD card instead of internal storage.
+    # @param [Hash] adb_opts Options for the adb command (@see #run_adb)
+    def install(package, opts = {}, adb_opts = {})
+      opt_arg = ""
+      opt_arg += " -l" if opts[:forwardlock]
+      opt_arg += " -r" if opts[:reinstall]
+      opt_arg += " -s" if opts[:sdcard]
+      run_adb("install#{opt_arg} #{package}", adb_opts)
+    end
+
+    # Run the adb command with the give <tt>args</tt>.
+    # @param [String] args Arguments to the adb command.
+    # @param [Hash] adb_opts Options for the adb command.
+    # @option adb_opts [String] :serial directs command to the USB device or emulator with the given serial number.
+    # @option adb_opts [Boolean] :emulator Directs command to the only running emulator. Returns an error if more than one emulator is running.
+    # @option adb_opts [Boolean] :device Directs command to the only connected USB device. Returns an error if more than one USB device connected.
+    # @yield [stdout] The standard output of the adb command.
+    def run_adb(args, adb_opts = {}, &block) # :yields: stdout
+      adb_arg = ""
+      adb_arg += " -s #{adb_opts[:serial]}" if !adb_opts[:serial].nil? && !adb_opts[:serial].empty?
+      adb_arg += " -e #{adb_opts[:emulator]}" if adb_opts[:emulator]
+      adb_arg += " -d #{adb_opts[:device]}" if adb_opts[:emulator]
+      path = "#{@adb_path}#{adb_arg} #{args}"
+      last_command = path
+      run(path, &block)
+    end
+
+    # Run the device shell command given by <tt>args</tt>.
+    # @param [String] args Arguments to the adb shell command.
+    # @param [Hash] adb_opts Options for the adb command (@see run_adb).
+    # @yield [stdout] The standard output of the adb command.
+    def run_adb_shell(args, adb_args = {}, &block) # :yields: stdout
+      args = "shell #{args}"
+      run_adb(args, adb_args, &block)
+    end
+
+    private
+    def run(path, &block)
+      if @dry_run
+        puts "[#{path}]"
+        return
+      end
+      Open3::popen3(path) do |pin, pout, perr|
+        if (@show_stderr)
+          perr.each do |line|
+            puts "{e}" + line
+          end
+        end
+        yield pout
+      end
+    end
+
+    def self.find_adb
+      begin
+        which_adb = `which adb`.strip
+        return which_adb if !which_adb.nil? && !which_adb.empty?
+      rescue
+      end
+      android_home = ENV['ANDROID_HOME']
+      if !android_home.nil? && !android_home.empty?
+        adb_cmd = File.join(android_home, "platform-tools", "adb")
+        if (Platform::OS == :win32)
+          adb_cmd += ".exe"
+        end
+        return adb_cmd
+      end
+      return "adb"
+    end
+  end # class
+end # module
+
+

data/lib/android-adb/Device.rb

@@ -0,0 +1,20 @@
+# Author:: Nic Strong  (mailto:nic.strong@gmail.com)
+# Copyright:: Copyright (c) 2011 Nic Strong
+# License::   MIT (See LICENSE)
+
+module AndroidAdb
+  class Device
+    attr_accessor :name, :serial
+
+    # Contructs an Device object.
+    #
+    # @param [String] name The name of the device/emulator.
+    # @param [String] serial The serial number of the device/emulator.
+    def initialize(name, serial)
+      @name = name
+      @serial = serial
+    end
+  end # class
+end # module
+
+

data/lib/android-adb/Package.rb

@@ -0,0 +1,20 @@
+# Author:: Nic Strong  (mailto:nic.strong@gmail.com)
+# Copyright:: Copyright (c) 2011 Nic Strong
+# License::   MIT (See LICENSE)
+
+module AndroidAdb
+  class Package
+    attr_accessor :name, :apk
+
+    # Contructs an Package object.
+    #
+    # @param [String] name The name of the package.
+    # @param [String] apk The path of the installed apk file.
+    def initialize(name, apk)
+      @name = name
+      @apk = apk
+    end
+  end # class
+end # module
+
+

data/lib/android-adb/version.rb

@@ -2,7 +2,7 @@ module AndroidAdb
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,136 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: android-adb
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Nic Strong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-05-03 00:00:00.000000000 +12:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: Platform
+  requirement: &22603896 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
-  name: POpen4
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *22603896
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &22603020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: bundler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *22603020
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &22602468 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *22602468
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &22601544 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  name: jeweler
-  prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
   prerelease: false
+  version_requirements: *22601544
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &22600884 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.8
   type: :development
-  requirement: *id004
+  prerelease: false
+  version_requirements: *22600884
 description: 
 email: nic.strong@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
+- .yardopts
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - android-adb.gemspec
+- examples/listdevices.rb
 - examples/listpackages.rb
 - examples/showcmds.rb
 - lib/android-adb.rb
+- lib/android-adb/Adb.rb
+- lib/android-adb/Device.rb
+- lib/android-adb/Package.rb
 - lib/android-adb/version.rb
+has_rdoc: true
 homepage: http://github.com/nicstrong/android-adb
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 15408915
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Android SDK adb command.
-test_files: 
+test_files:
+- examples/listdevices.rb
 - examples/listpackages.rb
 - examples/showcmds.rb