briar 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +20 -12
- data/bin/briar_ideviceinstaller.rb +7 -2
- data/bin/briar_install.rb +1 -1
- data/bin/briar_xtc.rb +15 -43
- data/briar.gemspec +13 -11
- data/changelog/1.1.2.md +13 -0
- data/lib/briar/email.rb +2 -1
- data/lib/briar/irbrc.rb +0 -2
- data/lib/briar/version.rb +1 -1
- metadata +49 -42
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7f374a08826fb7d8631082e58c303fd641e5abb4
|
4
|
+
data.tar.gz: dc9631ef4de35c767bdfe180131bab727ded2b02
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a363d592011d1c37a410191390dd81cc14ba169d367eae7c46102397f4ff2acb4fae8f5aeabe6ff2751ecdb8d4350190dadeeb1f738bc98033e34c833a065704
|
7
|
+
data.tar.gz: 01a34587d3a18c605b088d6d81dc315963e1f4f721358c55332fa2be2bc73b414c7c58767ac93b7bfa0a89975d7cd26408c46b8b5b8ebffc9f9f10b93cdb6b0d
|
data/README.md
CHANGED
@@ -25,13 +25,17 @@ Requires ruby >= 1.9.3; ruby 2.1.2 is recommended.
|
|
25
25
|
In your Gemfile:
|
26
26
|
|
27
27
|
```
|
28
|
-
gem 'briar', '~>1.1'
|
28
|
+
gem 'briar', '~> 1.1.2'
|
29
|
+
|
30
|
+
# to use the briar XTC developer tools, include rake
|
31
|
+
gem 'rake', '~> 10.3'
|
29
32
|
```
|
30
33
|
|
31
34
|
In your `features/support/env.rb` file:
|
32
35
|
|
33
36
|
```
|
34
37
|
require 'calabash-cucumber/cucumber'
|
38
|
+
ENV['NO_BRIAR_PREDEFINED_STEPS'] = '1'
|
35
39
|
require 'briar/cucumber'
|
36
40
|
|
37
41
|
# optional
|
@@ -80,21 +84,27 @@ $ briar rm sim-targets
|
|
80
84
|
$ briar rm dups
|
81
85
|
$ briar rm dups briar-ios-example
|
82
86
|
|
83
|
-
# change the simulator version
|
87
|
+
# change the simulator version (will be deprecated soon)
|
84
88
|
$ briar sim ipad_r
|
85
89
|
$ briar sim iphone_4in
|
86
90
|
```
|
87
91
|
|
88
92
|
## Xamarin Test Cloud
|
89
93
|
|
90
|
-
|
94
|
+
Requires adopting the .xamarin convention and a .env file. See the help for `.xamarin` and `xtc`.
|
91
95
|
|
92
96
|
```
|
93
|
-
#
|
94
|
-
|
97
|
+
# list the currently cached device in ~/.xamarin/test-cloud/ios-sets.csv
|
98
|
+
$ briar xtc
|
99
|
+
|
100
|
+
# submit a job to the iPads device set
|
101
|
+
$ briar xtc iPads
|
102
|
+
|
103
|
+
# submit a job to the iPhones device set with the meal_log profile
|
104
|
+
$ briar xtc iPhones meal_log
|
95
105
|
```
|
96
106
|
|
97
|
-
##
|
107
|
+
## Version Numbers
|
98
108
|
|
99
109
|
I will try my best to follow Semantic Versioning [1] when naming the versions.
|
100
110
|
|
@@ -111,14 +121,12 @@ _"But returning to the practical: No release version of SemVer is compatible wit
|
|
111
121
|
* http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Calabash
|
112
122
|
* http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Briar
|
113
123
|
|
114
|
-
## Road Map
|
115
|
-
|
116
|
-
I am thinking of dropping all the of predefined steps! Beware! You have been warned!
|
117
|
-
|
118
124
|
## Contributing
|
119
125
|
|
120
126
|
1. Fork it
|
121
|
-
2. Create your feature branch (`git checkout -b my-new-feature`)
|
127
|
+
2. Create your feature branch (`git checkout -b feature/my-new-feature`)
|
122
128
|
3. Commit your changes (`git commit -am 'Add some feature'`)
|
123
|
-
4. Push to the branch (`git push origin my-new-feature`)
|
129
|
+
4. Push to the branch (`git push -u origin feature/my-new-feature`)
|
124
130
|
5. Create new Pull Request
|
131
|
+
|
132
|
+
Please do not change the version number.
|
@@ -40,7 +40,7 @@ module Briar
|
|
40
40
|
briar_remove_derived_data_dups
|
41
41
|
end
|
42
42
|
|
43
|
-
ipa = merged[:ipa]
|
43
|
+
ipa = File.expand_path(merged[:ipa])
|
44
44
|
expect_ipa(ipa)
|
45
45
|
|
46
46
|
Retriable.retriable do
|
@@ -63,7 +63,8 @@ module Briar
|
|
63
63
|
|
64
64
|
def bundle_installed?(udid, bundle_id, installer)
|
65
65
|
cmd = "#{installer} -u #{udid} -l"
|
66
|
-
|
66
|
+
info = "EXEC: #{cmd}"
|
67
|
+
puts "#{Rainbow(info).cyan}"
|
67
68
|
`#{cmd}`.strip.split(/\s/).include? bundle_id
|
68
69
|
end
|
69
70
|
|
@@ -74,6 +75,8 @@ module Briar
|
|
74
75
|
end
|
75
76
|
|
76
77
|
cmd = "#{installer} -u #{udid} --install #{ipa}"
|
78
|
+
info = "EXEC: #{cmd}"
|
79
|
+
puts "#{Rainbow(info).cyan}"
|
77
80
|
system cmd
|
78
81
|
unless bundle_installed?(udid, bundle_id, installer)
|
79
82
|
raise "could not install '#{ipa}' on '#{udid}' with '#{bundle_id}'"
|
@@ -87,6 +90,8 @@ module Briar
|
|
87
90
|
return true
|
88
91
|
end
|
89
92
|
cmd = "#{installer} -u #{udid} --uninstall #{bundle_id}"
|
93
|
+
info = "EXEC: #{cmd}"
|
94
|
+
puts "#{Rainbow(info).cyan}"
|
90
95
|
system cmd
|
91
96
|
if bundle_installed?(udid, bundle_id, installer)
|
92
97
|
raise "could not uninstall '#{bundle_id}' on '#{udid}'"
|
data/bin/briar_install.rb
CHANGED
data/bin/briar_xtc.rb
CHANGED
@@ -6,35 +6,6 @@ require 'ansi/logger'
|
|
6
6
|
|
7
7
|
@log = ANSI::Logger.new(STDOUT)
|
8
8
|
|
9
|
-
# not yet - maybe never
|
10
|
-
##use <tt>rake install</tt> to install a gem at +path_to_gemspec+
|
11
|
-
## returns the version of the gem installed
|
12
|
-
#def rake_install_gem(path_to_gemspec)
|
13
|
-
#
|
14
|
-
# #out = `"cd #{path_to_gemspec}; rake install"`
|
15
|
-
#
|
16
|
-
# out = nil
|
17
|
-
# Dir.chdir(File.expand_path(path_to_gemspec)) do
|
18
|
-
# system 'rake install'
|
19
|
-
# end
|
20
|
-
#
|
21
|
-
#
|
22
|
-
# #cmd = "cd #{path_to_gemspec} ; rake install"
|
23
|
-
# #output = []
|
24
|
-
# #IO.popen(cmd).each do |line|
|
25
|
-
# # p line.chomp
|
26
|
-
# # output << line.chomp
|
27
|
-
# #end
|
28
|
-
#
|
29
|
-
# puts "out = '#{out}'"
|
30
|
-
# exit 1
|
31
|
-
# tokens = out.split(' ')
|
32
|
-
# gem = tokens[0]
|
33
|
-
# version = tokens[1]
|
34
|
-
# @log.info { "installed #{gem} #{version}" }
|
35
|
-
# version
|
36
|
-
#end
|
37
|
-
|
38
9
|
def briar_xtc_submit(device_set, profile, opts={})
|
39
10
|
default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
|
40
11
|
:ipa => ENV['IPA'],
|
@@ -42,13 +13,12 @@ def briar_xtc_submit(device_set, profile, opts={})
|
|
42
13
|
:account => expect_xtc_account(),
|
43
14
|
:other_gems => ENV['XTC_OTHER_GEMS_FILE'],
|
44
15
|
:xtc_staging_dir => expect_xtc_staging_dir(),
|
45
|
-
:briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '
|
46
|
-
:calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '
|
16
|
+
:briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '1',
|
17
|
+
:calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '1',
|
47
18
|
:async_submit => ENV['XTC_WAIT_FOR_RESULTS'] == '0',
|
48
19
|
:series => ENV['XTC_SERIES'],
|
49
20
|
:rebuild => true}
|
50
21
|
|
51
|
-
|
52
22
|
opts = default_opts.merge(opts)
|
53
23
|
|
54
24
|
build_script = opts[:build_script]
|
@@ -67,22 +37,24 @@ def briar_xtc_submit(device_set, profile, opts={})
|
|
67
37
|
account = opts[:account]
|
68
38
|
api_key = read_api_token(account)
|
69
39
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
40
|
+
# ugh. it works, then it doesn't
|
41
|
+
# i think the real solution is to pull the bin/tools out of the gem and into
|
42
|
+
# (yet) another gem.
|
43
|
+
# if opts[:briar_dev]
|
44
|
+
# briar_path = `bundle show briar`.strip
|
45
|
+
# # system('gem uninstall -Vax --force --no-abort-on-dependent briar',
|
46
|
+
# # :err => '/dev/null')
|
47
|
+
# Dir.chdir(File.expand_path(briar_path)) do
|
48
|
+
# system 'gem rake install'
|
49
|
+
# end
|
50
|
+
# end
|
78
51
|
|
79
52
|
if opts[:calabash_dev]
|
80
53
|
calabash_path = `bundle show calabash-cucumber`.strip
|
81
54
|
system('gem uninstall -Vax --force --no-abort-on-dependent calabash-cucumber',
|
82
55
|
:err => '/dev/null')
|
83
|
-
|
84
56
|
Dir.chdir(File.expand_path(calabash_path)) do
|
85
|
-
system '
|
57
|
+
system 'rake install'
|
86
58
|
end
|
87
59
|
end
|
88
60
|
|
@@ -146,7 +118,7 @@ def briar_xtc_submit(device_set, profile, opts={})
|
|
146
118
|
|
147
119
|
ipa = File.basename(File.expand_path(expect_ipa(opts[:ipa])))
|
148
120
|
|
149
|
-
cmd = "
|
121
|
+
cmd = "test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait} #{series}"
|
150
122
|
|
151
123
|
puts Rainbow("cd #{staging_dir}; #{cmd}").green
|
152
124
|
Dir.chdir(staging_dir) do
|
data/briar.gemspec
CHANGED
@@ -22,29 +22,31 @@ Gem::Specification.new do |gem|
|
|
22
22
|
gem.homepage = 'https://github.com/jmoody/briar'
|
23
23
|
gem.license = 'MIT'
|
24
24
|
|
25
|
+
gem.files = `git ls-files`.split("\n") - ['.gitignore']
|
26
|
+
gem.executables = 'briar'
|
27
|
+
gem.require_paths = ['lib', 'features']
|
28
|
+
|
25
29
|
gem.platform = Gem::Platform::RUBY
|
26
30
|
gem.required_ruby_version = '>= 1.9.3'
|
27
31
|
|
28
32
|
gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0'
|
29
|
-
gem.add_runtime_dependency 'calabash-cucumber', '
|
33
|
+
gem.add_runtime_dependency 'calabash-cucumber', '>= 0.9.168'
|
30
34
|
gem.add_runtime_dependency 'dotenv', '~> 0.9'
|
31
35
|
gem.add_runtime_dependency 'ansi', '~> 1.4'
|
32
36
|
gem.add_runtime_dependency 'rainbow', '~> 2.0'
|
33
|
-
gem.add_runtime_dependency 'xcpretty', '~> 0.1'
|
34
37
|
# downgrade because of xtc gem - wants ~> 1.4
|
35
|
-
gem.add_runtime_dependency 'retriable', '
|
36
|
-
|
37
|
-
gem.add_runtime_dependency '
|
38
|
+
gem.add_runtime_dependency 'retriable', '< 1.5', '>= 1.3'
|
39
|
+
# test cloud requires 1.3.5, we want ~> 1.6
|
40
|
+
gem.add_runtime_dependency 'bundler', '< 1.7', '>= 1.3.5'
|
41
|
+
gem.add_runtime_dependency 'xamarin-test-cloud', '< 1.0', '>= 0.9.35'
|
42
|
+
gem.add_runtime_dependency 'rake', '~> 10.3'
|
38
43
|
|
39
44
|
# downgrading to 1.0.0 from 1.2.0
|
40
45
|
# https://github.com/xamarin/test-cloud-command-line/issues/3
|
41
46
|
gem.add_runtime_dependency 'syntax', '~>1.0'
|
42
47
|
|
43
|
-
gem.add_development_dependency
|
44
|
-
gem.add_development_dependency
|
45
|
-
gem.add_development_dependency
|
48
|
+
gem.add_development_dependency 'travis', '~> 1.7'
|
49
|
+
gem.add_development_dependency 'yard', '~> 0.8'
|
50
|
+
gem.add_development_dependency 'xcpretty', '0.1.6'
|
46
51
|
|
47
|
-
gem.files = `git ls-files`.split("\n") - ['.gitignore']
|
48
|
-
gem.executables = 'briar'
|
49
|
-
gem.require_paths = ['lib', 'features']
|
50
52
|
end
|
data/changelog/1.1.2.md
ADDED
@@ -0,0 +1,13 @@
|
|
1
|
+
## 1.1.2 changelog
|
2
|
+
|
3
|
+
I goofed. 1.1.1 has a bad gemspec and some critical bugs.
|
4
|
+
|
5
|
+
## Features
|
6
|
+
|
7
|
+
### Improvements to `briar xtc`
|
8
|
+
|
9
|
+
* Adds support for targeting XTC series.
|
10
|
+
* Can now wait run xtc as async or sync.
|
11
|
+
* Adjusts how and when bundler is called when submitted an XTC job.
|
12
|
+
|
13
|
+
See `$ briar help xtc`.
|
data/lib/briar/email.rb
CHANGED
@@ -65,9 +65,10 @@ module Briar
|
|
65
65
|
addrs.include? address
|
66
66
|
end
|
67
67
|
|
68
|
+
# @todo replace sleep with a wait_*
|
68
69
|
def should_see_recipients (addresses)
|
69
70
|
should_see_mail_view
|
70
|
-
|
71
|
+
sleep(0.4)
|
71
72
|
addrs = addresses.split(/, ?/)
|
72
73
|
addrs.each do |expected|
|
73
74
|
unless email_to_contains? expected.strip
|
data/lib/briar/irbrc.rb
CHANGED
data/lib/briar/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: briar
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Joshua Moody
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rbx-require-relative
|
@@ -28,22 +28,16 @@ dependencies:
|
|
28
28
|
name: calabash-cucumber
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: '0.11'
|
34
|
-
- - ">"
|
31
|
+
- - ">="
|
35
32
|
- !ruby/object:Gem::Version
|
36
|
-
version: 0.9.
|
33
|
+
version: 0.9.168
|
37
34
|
type: :runtime
|
38
35
|
prerelease: false
|
39
36
|
version_requirements: !ruby/object:Gem::Requirement
|
40
37
|
requirements:
|
41
|
-
- - "
|
42
|
-
- !ruby/object:Gem::Version
|
43
|
-
version: '0.11'
|
44
|
-
- - ">"
|
38
|
+
- - ">="
|
45
39
|
- !ruby/object:Gem::Version
|
46
|
-
version: 0.9.
|
40
|
+
version: 0.9.168
|
47
41
|
- !ruby/object:Gem::Dependency
|
48
42
|
name: dotenv
|
49
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -86,55 +80,53 @@ dependencies:
|
|
86
80
|
- - "~>"
|
87
81
|
- !ruby/object:Gem::Version
|
88
82
|
version: '2.0'
|
89
|
-
- !ruby/object:Gem::Dependency
|
90
|
-
name: xcpretty
|
91
|
-
requirement: !ruby/object:Gem::Requirement
|
92
|
-
requirements:
|
93
|
-
- - "~>"
|
94
|
-
- !ruby/object:Gem::Version
|
95
|
-
version: '0.1'
|
96
|
-
type: :runtime
|
97
|
-
prerelease: false
|
98
|
-
version_requirements: !ruby/object:Gem::Requirement
|
99
|
-
requirements:
|
100
|
-
- - "~>"
|
101
|
-
- !ruby/object:Gem::Version
|
102
|
-
version: '0.1'
|
103
83
|
- !ruby/object:Gem::Dependency
|
104
84
|
name: retriable
|
105
85
|
requirement: !ruby/object:Gem::Requirement
|
106
86
|
requirements:
|
107
|
-
- - "
|
87
|
+
- - "<"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '1.5'
|
90
|
+
- - ">="
|
108
91
|
- !ruby/object:Gem::Version
|
109
92
|
version: '1.3'
|
110
93
|
type: :runtime
|
111
94
|
prerelease: false
|
112
95
|
version_requirements: !ruby/object:Gem::Requirement
|
113
96
|
requirements:
|
114
|
-
- - "
|
97
|
+
- - "<"
|
98
|
+
- !ruby/object:Gem::Version
|
99
|
+
version: '1.5'
|
100
|
+
- - ">="
|
115
101
|
- !ruby/object:Gem::Version
|
116
102
|
version: '1.3'
|
117
103
|
- !ruby/object:Gem::Dependency
|
118
104
|
name: bundler
|
119
105
|
requirement: !ruby/object:Gem::Requirement
|
120
106
|
requirements:
|
121
|
-
- - "
|
107
|
+
- - "<"
|
122
108
|
- !ruby/object:Gem::Version
|
123
|
-
version: '1.
|
109
|
+
version: '1.7'
|
110
|
+
- - ">="
|
111
|
+
- !ruby/object:Gem::Version
|
112
|
+
version: 1.3.5
|
124
113
|
type: :runtime
|
125
114
|
prerelease: false
|
126
115
|
version_requirements: !ruby/object:Gem::Requirement
|
127
116
|
requirements:
|
128
|
-
- - "
|
117
|
+
- - "<"
|
118
|
+
- !ruby/object:Gem::Version
|
119
|
+
version: '1.7'
|
120
|
+
- - ">="
|
129
121
|
- !ruby/object:Gem::Version
|
130
|
-
version:
|
122
|
+
version: 1.3.5
|
131
123
|
- !ruby/object:Gem::Dependency
|
132
124
|
name: xamarin-test-cloud
|
133
125
|
requirement: !ruby/object:Gem::Requirement
|
134
126
|
requirements:
|
135
|
-
- - "
|
127
|
+
- - "<"
|
136
128
|
- !ruby/object:Gem::Version
|
137
|
-
version: '0
|
129
|
+
version: '1.0'
|
138
130
|
- - ">="
|
139
131
|
- !ruby/object:Gem::Version
|
140
132
|
version: 0.9.35
|
@@ -142,12 +134,26 @@ dependencies:
|
|
142
134
|
prerelease: false
|
143
135
|
version_requirements: !ruby/object:Gem::Requirement
|
144
136
|
requirements:
|
145
|
-
- - "
|
137
|
+
- - "<"
|
146
138
|
- !ruby/object:Gem::Version
|
147
|
-
version: '0
|
139
|
+
version: '1.0'
|
148
140
|
- - ">="
|
149
141
|
- !ruby/object:Gem::Version
|
150
142
|
version: 0.9.35
|
143
|
+
- !ruby/object:Gem::Dependency
|
144
|
+
name: rake
|
145
|
+
requirement: !ruby/object:Gem::Requirement
|
146
|
+
requirements:
|
147
|
+
- - "~>"
|
148
|
+
- !ruby/object:Gem::Version
|
149
|
+
version: '10.3'
|
150
|
+
type: :runtime
|
151
|
+
prerelease: false
|
152
|
+
version_requirements: !ruby/object:Gem::Requirement
|
153
|
+
requirements:
|
154
|
+
- - "~>"
|
155
|
+
- !ruby/object:Gem::Version
|
156
|
+
version: '10.3'
|
151
157
|
- !ruby/object:Gem::Dependency
|
152
158
|
name: syntax
|
153
159
|
requirement: !ruby/object:Gem::Requirement
|
@@ -191,19 +197,19 @@ dependencies:
|
|
191
197
|
- !ruby/object:Gem::Version
|
192
198
|
version: '0.8'
|
193
199
|
- !ruby/object:Gem::Dependency
|
194
|
-
name:
|
200
|
+
name: xcpretty
|
195
201
|
requirement: !ruby/object:Gem::Requirement
|
196
202
|
requirements:
|
197
|
-
- -
|
203
|
+
- - '='
|
198
204
|
- !ruby/object:Gem::Version
|
199
|
-
version:
|
205
|
+
version: 0.1.6
|
200
206
|
type: :development
|
201
207
|
prerelease: false
|
202
208
|
version_requirements: !ruby/object:Gem::Requirement
|
203
209
|
requirements:
|
204
|
-
- -
|
210
|
+
- - '='
|
205
211
|
- !ruby/object:Gem::Version
|
206
|
-
version:
|
212
|
+
version: 0.1.6
|
207
213
|
description: extends calabash-ios steps
|
208
214
|
email:
|
209
215
|
- joshuajmoody@gmail.com
|
@@ -232,6 +238,7 @@ files:
|
|
232
238
|
- briar.gemspec
|
233
239
|
- changelog/1.1.0.md
|
234
240
|
- changelog/1.1.1.md
|
241
|
+
- changelog/1.1.2.md
|
235
242
|
- changelog/1.2.0.md
|
236
243
|
- features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
|
237
244
|
- features/step_definitions/alerts_and_sheets/alert_view_steps.rb
|
@@ -312,6 +319,6 @@ rubyforge_project:
|
|
312
319
|
rubygems_version: 2.4.1
|
313
320
|
signing_key:
|
314
321
|
specification_version: 4
|
315
|
-
summary: briar-1.1.
|
322
|
+
summary: briar-1.1.2
|
316
323
|
test_files: []
|
317
324
|
has_rdoc:
|