brazenhead 0.1 → 0.2

data/features/step_definitions/string_ids_steps.rb

@@ -0,0 +1,8 @@
+When /^I call "(.*?)" with "(.*?)" on the target "(.*?)"$/ do |method, arg, target|
+  @driver.send method, arg, :target => target
+end
+
+Then /^I should receive an id value back from the Brazenhead module$/ do
+  @driver.last_response.body.to_i.should be > 0
+end
+

data/features/strings_ids.feature

@@ -0,0 +1,5 @@
+Feature: Retrieving id information from Brazenhead
+
+  Scenario: Retrieving Id Values
+    When I call "id_from_name" with "snack" on the target "Brazenhead"
+    Then I should receive an id value back from the Brazenhead module

data/lib/brazenhead/builder.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'brazenhead/manifest_info'
 require 'brazenhead/package'
+require 'brazenhead/process'
 require 'ADB'
 
 module Brazenhead
@@ -9,20 +10,27 @@ module Brazenhead
     include ADB
 
     def build_for(apk, keystore)
-      @source_apk = apk
-      @keystore = keystore
+      @source_apk = File.expand_path apk
       invalid_package_err(apk) unless File.exists? @source_apk
-      install_server
+
+      @keystore = keystore
+      @keystore[:path] = File.expand_path @keystore[:path]
+
+      Dir.mktmpdir do |temp_dir|
+        install_server temp_dir
+      end
+
       manifest_info
     end
 
     private
-    def install_server
-      Dir.mktmpdir do |dir|
-        copy_base_files_to(dir)
-        update_manifest_in(dir)
-        sign(test_apk_in(dir), @keystore)
-        reinstall test_apk_in(dir)
+    def install_server(dir)
+      Dir.chdir(dir) do |here|
+        copy_base_files
+        update_test_manifest
+        store_resources
+        sign test_apk, @keystore
+        reinstall test_apk
         reinstall @source_apk
       end
     end
@@ -31,41 +39,29 @@ module Brazenhead
       install apk, "-r", {}, timeout
     end
 
-    def copy_base_files_to(dir)
-      [test_apk, manifest].each do |file|
-        FileUtils.copy_file(driver_path_for(file), join(dir, file))
+    def copy_base_files
+      [test_apk, android_manifest].each do |file|
+        FileUtils.cp driver_path_for(file), Dir.pwd
       end
     end
 
     def driver_path_for(file)
-      join(File.expand_path("../../../", __FILE__), 'driver', file)
+      File.join File.expand_path("../../../", __FILE__), 'driver', file
     end
 
-    def join(*paths)
-      File.join(*paths)
-    end
-
-    def update_manifest_in(dir)
-      manifest_path = join(dir, manifest)
-
-      replace(manifest_path, target_match, target_replace)
-      update_manifest(test_apk_in(dir), manifest_path, manifest_info.target_sdk)
-    end
-
-    def test_apk_in(dir)
-      join(dir, test_apk)
+    def update_test_manifest
+      replace android_manifest, /\btargetPackage="[^"]+"/,  "targetPackage=\"#{the_target}\""
+      update_manifest test_apk, android_manifest, manifest_info.target_sdk
     end
 
     def replace(file, match, replacement)
       File.write(file, File.read(file).gsub(match, replacement))
     end
 
-    def target_match
-      /\btargetPackage="[^"]+"/
-    end
-
-    def target_replace
-      "targetPackage=\"#{the_target}\""
+    def store_resources
+      Dir.mkdir "assets"
+      dump_resources @source_apk, "assets/resources.txt"
+      add_file test_apk, "assets/resources.txt"
     end
 
     def the_target
@@ -80,7 +76,7 @@ module Brazenhead
       'brazenhead-release-unsigned.apk'
     end
 
-    def manifest
+    def android_manifest
       'AndroidManifest.xml'
     end
 
@@ -88,5 +84,9 @@ module Brazenhead
       raise Exception.new("Invalid package path:  #{apk}")
     end
 
+    def process
+      @process ||= Brazenhead::Process.new
+    end
+
   end
 end

data/lib/brazenhead/package.rb

@@ -10,6 +10,15 @@ module Brazenhead
       process.run(*update, *package(apk), *with(manifest), *using(path_to(min_sdk)))
     end
 
+    def dump_resources(apk, resource_file)
+      process.run(*"aapt dump resources".split, apk)
+      File.write resource_file, process.last_stdout
+    end
+
+    def add_file(apk, file)
+        process.run(*"aapt add".split, apk, file)
+    end
+
     private
     def process
       @process ||= Brazenhead::Process.new

data/lib/brazenhead/version.rb

@@ -1,3 +1,3 @@
 module Brazenhead
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/spec/lib/brazenhead/builder_spec.rb

@@ -2,23 +2,37 @@ require 'brazenhead/builder'
 
 describe Brazenhead::Builder do
   let(:apk) { 'some_apk.apk' }
+  let(:expanded_apk) { File.expand_path(apk) }
   let(:activity) { 'SomeActivityToStart' }
   let(:server) { Brazenhead::Builder.new }
   let(:manifest_info) { double('manifest-info').as_null_object }
   let(:tmpdir) { '/some/tmp/dir' }
   let(:driver_apk) { 'brazenhead-release-unsigned.apk' }
   let(:keystore) { {:path => 'default.keystore'} }
+  let(:process) { double('brazenhead-process').as_null_object }
 
   before(:each) do
+    File.stub(:expand_path) do |arg|
+      "expanded/#{arg}"
+    end
     File.stub(:exists?).and_return(true)
     Dir.stub(:mktmpdir).and_yield(tmpdir)
-    FileUtils.stub(:copy_file)
+    Dir.stub(:chdir).and_yield(tmpdir)
+    Dir.stub(:mkdir)
+    Dir.stub(:pwd).and_return(tmpdir)
+    FileUtils.stub(:cp)
     File.stub(:read).and_return('')
     File.stub(:write)
-    server.stub(:update_manifest)
-    server.stub(:sign)
-    server.stub(:install)
-    Brazenhead::ManifestInfo.stub(:new).with(apk).and_return(manifest_info)
+    stub_all server, :update_manifest, :sign, :install
+
+    Brazenhead::ManifestInfo.stub(:new).with(expanded_apk).and_return(manifest_info)
+    Brazenhead::Process.stub(:new).and_return(process)
+  end
+
+  def stub_all(type, *methods)
+    methods.each do |method|
+      type.stub(method)
+    end
   end
 
   context "building the test server" do
@@ -46,19 +60,43 @@ describe Brazenhead::Builder do
       end
 
       it "should copy the unsigned release package into the directory" do
-        FileUtils.should_receive(:copy_file).with(base_test_apk, File.join(tmpdir, driver_apk))
+        FileUtils.should_receive(:cp).with(base_test_apk, "#{tmpdir}")
         server.build_for(apk, keystore)
       end
 
       it "should copy the manifest into the directory" do
-        FileUtils.should_receive(:copy_file).with(base_manifest, File.join(tmpdir, manifest))
+        FileUtils.should_receive(:cp).with(base_manifest,  "#{tmpdir}")
         server.build_for(apk, keystore)
       end
     end
 
+    context "grabbing resource information" do
+      it "should retrieve resource information from the target package" do
+        process.should_receive(:run).with(*"aapt dump resources #{expanded_apk}".split)
+        server.build_for apk, keystore
+      end
+
+      it "should create an assets directory for the resource information" do
+        Dir.should_receive(:mkdir).with("assets")
+        server.build_for apk, keystore
+      end
+
+      it "should write the resource information to the assets directory" do
+        process.should_receive(:last_stdout).and_return("resource info")
+        resources = "assets/resources.txt"
+        File.should_receive(:write).with(resources, "resource info")
+        server.build_for apk, keystore
+      end
+
+      it "should store the resources in the test server" do
+        process.should_receive(:run).with(*"aapt add #{driver_apk} assets/resources.txt".split)
+        server.build_for apk, keystore
+      end
+    end
+
     context "updating the manifest" do
       it "should load the contents of the existing manifest" do
-        File.should_receive(:read).with("#{tmpdir}/AndroidManifest.xml")
+        File.should_receive(:read).with("AndroidManifest.xml")
         server.build_for(apk, keystore)
       end
 
@@ -66,14 +104,14 @@ describe Brazenhead::Builder do
         the_target_package = "the.target.package"
         File.should_receive(:read).and_return("android:targetPackage=\"it.does.not.matter\"")
         manifest_info.should_receive(:package).and_return(the_target_package)
-        File.should_receive(:write).with("#{tmpdir}/AndroidManifest.xml", "android:targetPackage=\"#{the_target_package}\"")
+        File.should_receive(:write).with("AndroidManifest.xml", "android:targetPackage=\"#{the_target_package}\"")
 
         server.build_for(apk, keystore)
       end
 
       it "should package the modified manifest back into the test package" do 
         manifest_info.should_receive(:target_sdk).and_return(10)
-        server.should_receive(:update_manifest).with("#{tmpdir}/#{driver_apk}", "#{tmpdir}/AndroidManifest.xml", 10)
+        server.should_receive(:update_manifest).with("#{driver_apk}", "AndroidManifest.xml", 10)
         server.build_for(apk, keystore)
       end
 
@@ -81,26 +119,26 @@ describe Brazenhead::Builder do
 
     context "signing the test server" do
       it "should use the provided keystore to sign the package" do
-        server.should_receive(:sign).with("#{tmpdir}/#{driver_apk}", {:path => 'another keystore'})
+        server.should_receive(:sign).with("#{driver_apk}", {:path => 'expanded/another keystore'})
         server.build_for(apk, :path => 'another keystore')
       end
     end
 
     context "installing the test server" do
       it "should reinstall the test server to the device" do
-        server.should_receive(:install).with("#{tmpdir}/#{driver_apk}", "-r", {}, 90)
+        server.should_receive(:install).with("#{driver_apk}", "-r", {}, 90)
         server.build_for(apk, keystore)
       end
 
       it "should reinstall the target package to the device" do
-        server.should_receive(:install).with(apk, "-r", {}, 90)
+        server.should_receive(:install).with(expanded_apk, "-r", {}, 90)
         server.build_for(apk, keystore)
       end
 
     end
   end
 
-  context "sending back informationa about the server" do
+  context "sending back information about the server" do
     it "should send back information about the target package" do
       server.build_for(apk, keystore).should_be manifest_info
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: brazenhead
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
-- Levi Wilson
 - Jeffrey S. Morgan
+- Levi Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -79,8 +79,8 @@ dependencies:
 description: Driver that accepts remote json requests and invokes methods inside Android
   emulator / device.
 email:
-- levi@leandog.com
 - jeff.morgan@leandog.com
+- levi@leandog.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,6 +92,8 @@ files:
 - features/step_definitions/brazenhead_steps.rb
 - features/step_definitions/exception_steps.rb
 - features/step_definitions/robotium_steps.rb
+- features/step_definitions/string_ids_steps.rb
+- features/strings_ids.feature
 - features/support/ApiDemos.apk
 - features/support/debug.keystore
 - features/support/env.rb
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 851322138916103031
+      hash: -501269856312341157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 851322138916103031
+      hash: -501269856312341157
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -159,6 +161,8 @@ test_files:
 - features/step_definitions/brazenhead_steps.rb
 - features/step_definitions/exception_steps.rb
 - features/step_definitions/robotium_steps.rb
+- features/step_definitions/string_ids_steps.rb
+- features/strings_ids.feature
 - features/support/ApiDemos.apk
 - features/support/debug.keystore
 - features/support/env.rb