emu_ctl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b6267618c425101056703bb2c0a0f1b9853ee5
-  data.tar.gz: afbe4dab8a920e3eae6c07c46ee5c04a7c2c6333
+  metadata.gz: b59cd6a2d27d2888a8ed1fc00997ebda567301d8
+  data.tar.gz: 24e5c4b60bdffff52828952ee7151c445e118a9e
 SHA512:
-  metadata.gz: 05bc213291c3c847fa10d36f67c00bc921720c3f7e98f813f51231d613e9f95e2815416d732ebf6143e20dd93c88abd65aec80d317f0bf3b74ffd79f951ac864
-  data.tar.gz: 14f903eafb516e901e18d2fac8611673cb188ad0e654635047fc9fbaf51d9024c27789de1859d80c0b156fc795372470e6868bc886aa16868bc0e2404f9a92af
+  metadata.gz: 6ebf8e2a355c0f1528e062456aee7c79dc5684e700d3ee559bb2813a4a8abee08383ecc8be6c09b5164dda589ee3577d2f05420ce7b29170c96ff0bbcda42e75
+  data.tar.gz: 98f73d1cdab2b88533bbce99bdbda05b456928540ce16abe7020378e2cb59d6957599e1d38b12e6562410e3c9455f38636cc2a2b49712821f2b0c1e671cdf994

data/README.md

@@ -2,6 +2,8 @@
 
 Commandline util to maintain android emulators on headless machines (or just without window in gerneral).
 
+[![Gem Version](https://badge.fury.io/rb/emu_ctl.svg)](http://badge.fury.io/rb/emu_ctl)
+
 # NOT READY FOR PRODUCTION
 
 ## WHY?

data/bin/emu_ctl

@@ -13,55 +13,67 @@ usage = "
 Usage: 
     #{File.basename($0)} list          prints all available emulators
     #{File.basename($0)} running       shows all running emulators
-    #{File.basename($0)} kill          kills all running emulators
+    #{File.basename($0)} kill (ID|all) kills the emulator with ID (see `running`) or all runnig emulators
     #{File.basename($0)} launch ID     runs the emulator with ID,
                                        ID is an integer form the output of `list`
     #{File.basename($0)} targets       shows all possible targets and skins, will only display targets with abi
     #{File.basename($0)} new ID SKIN   creates a new avd with API level according to ID and skin SKIN
                                        check `targets` for possible values (depends on installed sdk packages)
                                        Only works for targets with default abi
-    #{File.basename($0)} rm ID         deletes avd with ID returned in list"
+    #{File.basename($0)} rm ID         deletes avd with ID returned in list
+    #{File.basename($0)} force-kill    sends `kill -9` to all running emulator processes, BE CAREFUL"
 
 # command line args
 if ARGV.empty?
   puts "You need to specify an action"
   puts "#{usage}"
-  exit(2)
+  exit 2 
 end
 
 action = ARGV.shift
 case action
   when 'kill'
-    pids = EmuCtl::Emulator.running_pids
+    arg = ARGV.shift
+    raise 'you need to specify which emulator to kill' if arg.nil?
+    running = emus = EmuCtl::ADB.devices
+    targets = arg == 'all' ? running : [ running[arg.to_i] ]
+    puts "trying to kill emulators: \n\t#{targets.join('\n\t')}"
+    targets.each{ |t| EmuCtl::ADB.kill_emu(t.qualifier)}
+    puts "done killing"
+  when 'force-kill'
+    warn "dont' use `force-kill` if you don't have to, it might coase android to leave some trash in /tmp/android-[user]/"
+    pids = EmuCtl::Ctl.running_pids
     puts "found running emulators with pid: #{pids}"
-    EmuCtl::Emulator.kill_all
+    EmuCtl::Ctl.kill_pids(pids)
     puts "killed all emulators"
   when 'list'
-    emus = EmuCtl::Emulator.list
-    puts emus.map{ |o| "#{emus.index(o)} - #{o.to_s}" }.join("\n")
+    avds = EmuCtl::Ctl.list
+    puts avds.map{ |o| "#{avds.index(o)} - #{o.to_s}" }.join("\n")
   when 'launch'
     raise "you need to specify the emulator id\n#{usage}" if ARGV.empty?
     index = ARGV.shift.to_i
-    emu = EmuCtl::Emulator.list[index]
-    EmuCtl::Emulator.start(emu)
+    avd = EmuCtl::Ctl.list[index]
+    EmuCtl::Ctl.start(avd)
   when 'targets'
-    targets = EmuCtl::Emulator.list_targets
+    targets = EmuCtl::Ctl.list_targets
     puts targets.map{ |o| "#{targets.index(o)} - #{o.to_s}" }.join("\n")
   when 'new'
     target_index = ARGV.shift.to_i
     skin = ARGV.shift
     raise "you need to specify target and skin" if target_index.nil? || skin.nil?
-    target = EmuCtl::Emulator.list_targets[target_index]
+    target = EmuCtl::Ctl.list_targets[target_index]
     puts "creating new avd from #{target.id} with skin #{skin}"
-    EmuCtl::Emulator.create(target, skin)
+    EmuCtl::Ctl.create(target, skin)
   when 'running'
-  	puts EmuCtl::ADB.devices
+    emus = EmuCtl::ADB.devices
+    puts emus.map{ |o| "#{emus.index(o)} - #{o.to_s}" }.join("\n")
   when 'rm'
   	emu_index = ARGV.shift
   	raise 'you need to specify the emulator id' if emu_index.nil?
-  	emu = EmuCtl::Emulator.list[Integer(emu_index)]
-  	puts "deleting: #{emu}"
-  	EmuCtl::Emulator.delete(emu)
+  	avd = EmuCtl::Ctl.list[Integer(emu_index)]
+  	puts "deleting: #{avd}"
+  	EmuCtl::Ctl.delete(avd)
   else
-    raise "unknown action #{action}\n#{usage}"
+    puts "unknown action #{action}\n#{usage}"
 end
+exit 0

data/emu_ctl.gemspec

@@ -4,13 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "emu_ctl/version"
 
 Gem::Specification.new do |s|
-  s.name        = "emu_ctl"
-  s.version     = EmuCtl::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Nemo Oudeis"]
-  s.email       = ["nemo@oudeis.eu"]
-  s.homepage    = "https://github.com/NemoOudeis/EmulatorControl"
-  s.summary     = %q{command line tool to easily control android emulators}
+  s.name          = "emu_ctl"
+  s.version       = EmuCtl::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ["Nemo Oudeis"]
+  s.email         = ["nemo@oudeis.eu"]
+  s.homepage      = "https://github.com/NemoOudeis/EmulatorControl"
+  s.summary       = %q{command line tool to easily control android emulators}
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/emu_ctl.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'emu_ctl/adb'
-require 'emu_ctl/emulator'
+require 'emu_ctl/ctl'
 require 'emu_ctl/model'
 require 'open3'

data/lib/emu_ctl/adb.rb

@@ -1,20 +1,44 @@
 module EmuCtl
   class ADB
+    def self.cli_opt(emu_qual)
+      "#{"-s #{emu_qual}" unless emu_qual.nil?}"
+    end
+
     def self.devices
-      _, stdout, _ = Open3.popen3('adb devices')
+      _, stdout, _ = Open3.popen3('adb devices -l')
       lines = []
-      stdout.each_line { |l| lines.push(l) }
-      lines.join
+      stdout.each_line { |l| lines.push(l) if l.include?('emulator') }
+      lines.map{ |em| /(emulator-\d+)/.match(em)[1] }.map{ |qual| emu_info(qual) }
+    end
+
+    def self.emu_info(emu_qual=nil)
+      _, stdout, _ = Open3.popen3("adb #{cli_opt(emu_qual)} shell getprop")
+      pattern = /\[.+\]: \[(.+)\]/
+      api_lvl, os_version, sdk = nil, nil, nil
+      stdout.each_line do |l| 
+        api_lvl = pattern.match(l)[1] if l.include?('ro.build.version.sdk') 
+        os_version = pattern.match(l)[1] if l.include?('ro.build.version.release') 
+        sdk = pattern.match(l)[1] if l.include?('ro.product.name') 
+      end
+      return Emulator.new(emu_qual, api_lvl, os_version, sdk)
     end
 
-    def self.boot_complete?
-      _, stdout, stderr = Open3.popen3('adb shell getprop dev.bootcomplete')
+    def self.boot_complete?(emu_qual=nil)
+      cmd = "adb #{cli_opt(emu_qual)} shell getprop dev.bootcomplete"
+      _, stdout, stderr = Open3.popen3(cmd)
       return stderr.gets.nil?
     end
 
-    def self.unlock_emulator
-      system 'adb shell input keyevent 82'
-      system 'adb shell input keyevent 4'
+    def self.unlock_emulator(emu_qual=nil)
+      tag = cli_opt(emu_qual)
+      system "adb #{tag} shell input keyevent 82"
+      system "adb #{tag} shell input keyevent 4"
+    end
+
+    def self.kill_emu(emu_qual)
+      cmd = "adb #{cli_opt(emu_qual)} emu kill"
+      puts cmd
+      Open3.popen3(cmd)
     end
   end
 end

data/lib/emu_ctl/{emulator.rb → ctl.rb}

@@ -1,15 +1,17 @@
 module EmuCtl
-  class Emulator
+  class Ctl
     @@EMU_TIMEOUT = 180
 
     def self.start(emu)
       raise 'invalid name: nil' if emu.name.nil?
       puts "starting emulator: #{emu}"
-      puts "emulator -no-boot-anim -avd #{emu.name} -no-snapshot-load -no-snapshot-save -no-window"
-      system "emulator -no-boot-anim -avd #{emu.name} -no-snapshot-load -no-snapshot-save -no-window &"
+      cmd = "emulator -no-boot-anim -avd #{emu.name} -no-snapshot-load -no-snapshot-save -no-audio -no-window -verbose &"
+      puts "#{cmd}"
+      system "#{cmd}"
       starting_up = true
 
       start = Time.now
+
       until ADB.boot_complete?
         sleep 2
         ellapsed = Time.now - start
@@ -55,14 +57,16 @@ module EmuCtl
     end
 
     def self.running_pids
+      warn 'deprecated: controlling emulators via pids is a bad idea'
       _, stdout, _ = Open3.popen3("pgrep 'emulator'")
       pids = []
       stdout.each_line { |l| pids.push(l.strip) }
       pids
     end
 
-    def self.kill_all
-      Emulator.running_pids.each { |pid| system "kill -9 #{pid}" }
+    def self.kill_pids(pids)
+      warn 'deprecated: controlling emulators via pids is a bad idea'
+      pids.each { |pid| system "kill -9 #{pid}" }
     end
   end
 end

data/lib/emu_ctl/model.rb

@@ -38,4 +38,20 @@ module EmuCtl
       "#{@name}"
     end
   end
+
+  class Emulator
+    attr_accessor(:qualifier, :api_lvl, :os_name, :sdk)
+
+    def initialize(qual, api_lvl, os_name, sdk)
+      @qualifier = qual
+      @api_lvl = api_lvl
+      @os_name = os_name
+      @sdk = sdk
+    end
+
+    def to_s
+      "#{qualifier}: Running #{os_name} on API Level #{api_lvl} with sdk #{sdk}"
+    end
+
+  end
 end

data/lib/emu_ctl/version.rb

@@ -1,3 +1,3 @@
 module EmuCtl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/emulator_spec.rb

@@ -1,37 +1,37 @@
 require "emu_ctl"
 
-RSpec.describe EmuCtl::Emulator do
+RSpec.describe EmuCtl::Ctl do
   describe 'lists' do
     it 'looks up existings avds' do
-      expect(EmuCtl::Emulator.list).to_not be_nil
+      expect(EmuCtl::Ctl.list).to_not be_nil
     end
 
     it 'looks up available targets' do
-      expect(EmuCtl::Emulator.list_targets).to_not be_nil
+      expect(EmuCtl::Ctl.list_targets).to_not be_nil
     end
   end
 
   describe 'emulator creation and deletion' do
     it 'creates new emulator' do
-      old_list = EmuCtl::Emulator.list
+      old_list = EmuCtl::Ctl.list
       # only targets with default abi
-      target = EmuCtl::Emulator.list_targets.select{|t| t.abi.include?('default')}.last
+      target = EmuCtl::Ctl.list_targets.select{|t| t.abi.include?('default')}.last
       puts "creating emulator for target #{target.name} and skin #{target.skins[0]}"
 
-      EmuCtl::Emulator.create(target, target.skins[0])
-      expect(EmuCtl::Emulator.list.count).to eq(old_list.count + 1)
+      EmuCtl::Ctl.create(target, target.skins[0])
+      expect(EmuCtl::Ctl.list.count).to eq(old_list.count + 1)
     end
 
     it 'deletes emulators' do
-      old_list = EmuCtl::Emulator.list
+      old_list = EmuCtl::Ctl.list
       emu = old_list.last
       puts "deleting emulator #{emu}"
-      EmuCtl::Emulator.delete(emu)
-      expect(EmuCtl::Emulator.list.count).to eq(old_list.count - 1)
+      EmuCtl::Ctl.delete(emu)
+      expect(EmuCtl::Ctl.list.count).to eq(old_list.count - 1)
     end
 
     it 'looks up available targets' do
-      expect(EmuCtl::Emulator.list_targets).to_not be_nil
+      expect(EmuCtl::Ctl.list_targets).to_not be_nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emu_ctl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nemo Oudeis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,7 +86,7 @@ files:
 - emu_ctl.gemspec
 - lib/emu_ctl.rb
 - lib/emu_ctl/adb.rb
-- lib/emu_ctl/emulator.rb
+- lib/emu_ctl/ctl.rb
 - lib/emu_ctl/model.rb
 - lib/emu_ctl/version.rb
 - spec/adb_spec.rb
@@ -94,7 +94,8 @@ files:
 - spec/model_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/NemoOudeis/EmulatorControl
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: |2+