briar 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c900760300e6b8089db885afd3b1cc602100edb
-  data.tar.gz: 7a80b3e0528c91657b0f27c9edfff0cefdb3b716
+  metadata.gz: 4f4d348c554ed014075e44cc0c77614a138e3279
+  data.tar.gz: 0b7c50194d16e9f05ad1a053620d02b4115a65f7
 SHA512:
-  metadata.gz: 88144454f2568ae8d330736478b93df221ed554b07c8e6d465caf0fede7fc44a10bde851ed63024558026bea76b405c978fc021e3db3e9ea8a9830afd0391311
-  data.tar.gz: 9a921cb5ce6a723773ecb54ccefbe4262095edf8cc79e712e143ae252284d6d16ed2fba202c14dbb0d14ed84e4d6bdcdd368d5b7c912d46d971eed603ea71db0
+  metadata.gz: bd41d59f1aebd1c043c8c32c840ee520597d6b177626eae6c5c00200a6cce8f22d1263b59d6b7dd377c532c46310561e4deb3a63bc1448a65bc7a80b16b16591
+  data.tar.gz: bf800aab4b0f7203dc9d28306f95775aa290a04aab54da4f25f98141df53ab3b4fdd4a1ce0b5429b643ba2d30b1a1211c92525a6b2b611597316409d902a2181

data/.guardrc

@@ -1 +1,2 @@
-Guard.options[:clear] = true
+# Configure the Pry interactor here.
+# https://github.com/guard/guard/wiki/Configuration-files

data/.rspec

@@ -1,5 +1,5 @@
 --color
---warnings
+#--warnings
 #--backtrace
 --format documentation
 --require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+### 1.1.6
+
+* Tracking issues on pivotal: https://www.pivotaltracker.com/n/projects/1255750
+* #36 briar resign can resign .ipas with swift dylibs
+
+### 1.1.5
+
+* Improves iOS 8 alert and sheet handling.
+
+### 1.1.2
+
+* Bump calabash version to ~> 0.10
+* Adds support for targeting XTC series.
+* Can now wait run xtc as async or sync.
+* Adjusts how and when bundler is called when submitted an XTC job.
+
+### 1.1.1
+
+Bad release; see 1.1.2.
+
+### 1.1.0
+
+* Improves `briar install [device]` and `briar xtc` commands.
+* Drop support for ruby 1.8.7.  The minimum version is 1.9.3.
+* #8 added language keys for Danish and Thai @crishoj
+* #12 briar now retries ideviceinstaller commands on failures
+* #13 briar xtc command now executes all commands in the context of `bundle exec`
+* #14 briar is dropping support for ruby 1.8.7
+

data/Guardfile

@@ -0,0 +1,18 @@
+notification :growl, sticky: false, priority: 0
+logger level: :info
+clearing :on
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+# NOTE: This Guardfile only watches unit specs.
+# Automatically running the integration specs would repeatedly launch the
+# simulator, stealing screen focus and making everyone cranky.
+guard :rspec, cmd: 'bundle exec rspec', spec_paths: ['spec/lib'] do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/run_loop/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec/lib' }
+  #watch('spec/resources.rb')  { 'spec/lib' }
+end

data/bin/briar_resign.rb

@@ -5,6 +5,9 @@ require 'CFPropertyList'
 require 'rexml/document'
 require 'tmpdir'
 require 'find'
+require 'open3'
+require 'briar/environment'
+require 'dotenv'
 
 def msg(title, &block)
   puts "\n" + '-'*10 + title + '-'*10
@@ -13,9 +16,11 @@ def msg(title, &block)
 end
 
 def briar_resign(args)
-  if args.length < 4
+  Dotenv.load
+
+  if args.length < 1
     msg('Usage') do
-      puts 'briar resign </path/to/your.ipa> </path/to/your.mobileprovision> <wildcard-prefix> <signing-identity> [new-bundle-identifier]'
+      puts 'briar resign /path/to/your.ipa {/path/to/your.mobileprovision | BRIAR_MOBILE_PROFILE} {team-identifier | BRIAR_TEAM_IDENTIFIER} {signing-identity | BRIAR_SIGNING_IDENTITY} [new-bundle-identifier]'
     end
     exit 1
   end
@@ -35,7 +40,7 @@ def briar_resign(args)
     exit 1
   end
 
-  mobile_prov = args[1]
+  mobile_prov = args[1] || Briar::Environment.variable('BRIAR_MOBILE_PROFILE')
   unless mobile_prov.end_with?('.mobileprovision')
     msg('Error') do
       puts 'second arg must be a path to a mobileprovision'
@@ -50,7 +55,7 @@ def briar_resign(args)
     exit 1
   end
 
-  wildcard = args[2]
+  wildcard = args[2] || Briar::Environment.variable('BRIAR_TEAM_IDENTIFIER')
   unless wildcard.length == 10
     msg 'error' do
       puts "'#{wildcard}' must have 10 characters eg 'RWTD8QPG2C'"
@@ -65,7 +70,7 @@ def briar_resign(args)
     exit 1
   end
 
-  signing_id = args[3]
+  signing_id = args[3] || Briar::Environment.variable('BRIAR_SIGNING_IDENTITY')
   msg ('Info') do
     puts "will resign with identity '#{signing_id}'"
   end
@@ -236,27 +241,28 @@ def resign_ipa(options)
     file.puts '</plist>'
   end
 
-  # did _not_ work
-  #entitlements = CFPropertyList::List.new(:file => ios_entitlements_path)
-  #data = CFPropertyList.native_types(entitlements.value)
-  #data['application-identifier']= "#{wildcard}.#{app_id}"
-  #data['keychain-access-groups']=["#{wildcard}.#{app_id}"]
-  #data['get-task-allow'] = true
-  #
-  #
-  #plist = CFPropertyList::List.new
-  #plist.value = CFPropertyList.guess(data)
-  #plist.save(ios_entitlements_path, CFPropertyList::List::FORMAT_XML)
-  #puts "INFO: saved new entitlements to '#{ios_entitlements_path}'"
-
-  sign_cmd = "codesign -f -s \"#{options[:id]}\" -vv \"#{abs_app_path}\" --entitlements \"#{ios_entitlements_path}\""
-  puts "INFO: signing with '#{sign_cmd}'"
-
-  unless system(sign_cmd)
-    msg 'error' do
-      puts 'could not sign application'
+  Dir.glob("#{abs_app_path}/**/*").each do |file|
+    unless File.directory?(file)
+      cmd = "xcrun otool -h \"#{file}\""
+      Open3.popen3(cmd) do |_, stderr, _, _|
+        err = stderr.read.strip
+        unless err[/is not an object file/,0]
+          sign_cmd = "xcrun codesign --verbose=4 --deep -f -s \"#{options[:id]}\" \"#{file}\" --entitlements \"#{ios_entitlements_path}\""
+          puts "INFO: signing with '#{sign_cmd}'"
+          Open3.popen3(sign_cmd) do |_, stdout, stderr, wait_thr|
+            out = stdout.read.strip
+            err = stderr.read.strip
+            puts out
+            exit_status = wait_thr.value
+            if exit_status == 0
+            else
+              puts err
+              exit 1
+            end
+          end
+        end
+      end
     end
-    exit 1
   end
 
   unless system("rm -rf '#{ipa}'")
@@ -270,9 +276,15 @@ def resign_ipa(options)
 
   FileUtils.cd(work_dir) do
 
-    unless system("zip -qr #{File.basename(options[:ipa])} Payload")
+    if Dir.exist?(File.join(work_dir, 'SwiftSupport'))
+      zip_input = 'Payload SwiftSupport'
+    else
+      zip_input = 'Payload'
+    end
+
+    unless system("zip -qr #{File.basename(options[:ipa])} #{zip_input}")
       msg 'error' do
-        puts "could not zip '#{File.basename(options[:ipa])}' from 'Payload'"
+        puts "could not zip '#{File.basename(options[:ipa])}' from '#{zip_input}'"
       end
       exit 1
     end

data/lib/briar.rb

@@ -39,6 +39,7 @@ AL = :accessibilityLabel
 
 require 'calabash-cucumber'
 
+require 'briar/environment'
 require 'briar/version'
 require 'briar/briar_core'
 require 'briar/uia/briar_uia'

data/lib/briar/environment.rb

@@ -0,0 +1,12 @@
+module Briar
+  class Environment
+
+    def self.variable(variable_name)
+      ENV[variable_name]
+    end
+
+    def self.set_variable(variable_name, value)
+      ENV[variable_name] = value
+    end
+  end
+end

data/lib/briar/irbrc.rb

@@ -47,6 +47,7 @@ end
 
 puts 'loaded calabash'
 
+include Briar::Environment
 include Briar::Bars
 include Briar::Alerts_and_Sheets
 include Briar::Control::Button

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

data/spec/lib/environment_spec.rb

@@ -0,0 +1,23 @@
+describe Briar::Environment do
+
+  let(:variable_name) {'BRIAR_RSPEC_TEST_VARIABLE'}
+
+  before(:each) {
+    ENV.delete(variable_name)
+  }
+
+  describe '.variable' do
+    it 'returns value of environment variable' do
+      ENV[variable_name] = 'foo'
+      expect(Briar::Environment.variable(variable_name)).to be == 'foo'
+    end
+  end
+
+  describe '.set_variable' do
+    it 'can set value of environment variable' do
+      expect(ENV[variable_name]).to be == nil
+      Briar::Environment.set_variable(variable_name, 'foo')
+      expect(ENV[variable_name]).to be == 'foo'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift File.expand_path('bin', __FILE__)
 require 'awesome_print'
+require 'briar'
 
 # monkey patch for AwesomePrint + objects that implement '=='
+# Can remove once we are using awesome-print 1.6, which means updating
+# calabash-ios to > 0.12.0.
 module AwesomePrint
   class Formatter
     def awesome_self(object, type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -319,8 +319,10 @@ files:
 - ".guardrc"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -338,11 +340,6 @@ files:
 - bin/briar_tags.rb
 - bin/briar_xtc.rb
 - briar.gemspec
-- changelog/1.1.0.md
-- changelog/1.1.1.md
-- changelog/1.1.2.md
-- changelog/1.1.5.md
-- changelog/1.2.0.md
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb
 - features/step_definitions/bars/navbar_steps.rb
@@ -377,6 +374,7 @@ files:
 - lib/briar/control/slider.rb
 - lib/briar/cucumber.rb
 - lib/briar/email.rb
+- lib/briar/environment.rb
 - lib/briar/image_view.rb
 - lib/briar/irbrc.rb
 - lib/briar/keyboard/keyboard.rb
@@ -400,6 +398,7 @@ files:
 - script/ci/travis/com.apple.dt.instruments.process.analysis.plist
 - script/ci/travis/com.apple.dt.instruments.process.kill.plist
 - script/ci/travis/instruments-auth.sh
+- spec/lib/environment_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jmoody/briar
 licenses:
@@ -425,6 +424,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: briar-1.1.7
+summary: briar-1.1.8
 test_files: []
 has_rdoc: 

data/changelog/1.1.0.md

@@ -1,23 +0,0 @@
-## 1.1.0 changelog
-
-This release improves the `$ briar install < device >` and `$ briar xtc` commands.
-
-Briar now depends on bundler.  Calls to 3rd party gem binaries will be executed in the context of `bundle exec`.
-
-Briar now requires ruby 1.9.3 or higher.  Ruby 1.8.7 is no longer supported.
-
-## features
-
-* [pull 8](https://github.com/jmoody/briar/pull/8) added language keys for Danish and Thai
-    - thanks @crishoj
-
-* [pull 12](https://github.com/jmoody/briar/pull/12) briar now retries ideviceinstaller commands on failures
-
-* [pull 13](https://github.com/jmoody/briar/pull/13) briar xtc command now executes all commands in the context of `bundle exec`
-
-* [pull 14](https://github.com/jmoody/briar/pull/14) briar is dropping support for ruby 1.8.7
-
-## deprecated
-
-- 1.1.0 `:reinstall` is no longer a valid `ideviceinstaller` command - `:install` will always delete the existing .ipa from the device and reinstall.
-- 1.1.0 drops ruby 1.8.7 support

data/changelog/1.1.1.md

@@ -1,13 +0,0 @@
-## 1.1.1 changelog
-
-The recommend calabash iOS version is ~> 0.10.
-
-## Features
-
-### Improvements to `briar xtc`
-
-* Adds support for targeting XTC series.
-* Can now wait run xtc as async or sync.
-* Adjusts how and when bundler is called when submitted an XTC job.
-
-See `$ briar help xtc`.

data/changelog/1.1.2.md

@@ -1,13 +0,0 @@
-## 1.1.2 changelog
-
-I goofed.  1.1.1 has a bad gemspec and some critical bugs.
-
-## Features
-
-### Improvements to `briar xtc`
-
-* Adds support for targeting XTC series.
-* Can now wait run xtc as async or sync.
-* Adjusts how and when bundler is called when submitted an XTC job.
-
-See `$ briar help xtc`.

data/changelog/1.1.5.md

@@ -1,5 +0,0 @@
-## 1.1.5 changelog
-
-## Fixes
-
-Improves iOS 8 alert and sheet handling.

data/changelog/1.2.0.md

@@ -1,14 +0,0 @@
-## 1.2.0 changelog
-
-The recommend calabash iOS version is ~> 0.10.
-
-
-*** @required ***
-- [ ] need support for profiles
-- [ ] need support for opening consoles against different simulators
-- [ ] drop automatic import of features/step_definitions
-- [ ] change how rebuilding works in xtc client
-- [ ] adopt another logging tool
-
-*** @optional ***
-