yolo 1.3.4 → 1.3.5
Sign up to get free protection for your applications and to get access to all the features.
data/lib/yolo/config/settings.rb
CHANGED
@@ -113,7 +113,7 @@ module Yolo
|
|
113
113
|
#
|
114
114
|
# @return [String] The team token defined in config.yml
|
115
115
|
def team_token
|
116
|
-
if @yaml["deployment"]["
|
116
|
+
if @yaml["deployment"]["team_token"] != "example"
|
117
117
|
@yaml["deployment"]["team_token"]
|
118
118
|
end
|
119
119
|
end
|
@@ -155,7 +155,7 @@ module Yolo
|
|
155
155
|
mail_options = {
|
156
156
|
:to => self.mail_to,
|
157
157
|
:ota_url => url,
|
158
|
-
:subject => "New #{name} build: #{version}
|
158
|
+
:subject => "New #{name} build: #{version} #{current_branch}",
|
159
159
|
:title => name
|
160
160
|
}
|
161
161
|
mail_options[:ota_password] = password if password
|
@@ -169,7 +169,10 @@ module Yolo
|
|
169
169
|
# @return [String] The current git branch
|
170
170
|
def current_branch
|
171
171
|
git = Yolo::Tools::Git.new
|
172
|
-
git.current_branch
|
172
|
+
branch = git.current_branch
|
173
|
+
if git.current_branch != "(no branch)"
|
174
|
+
return "(#{branch})"
|
175
|
+
end
|
173
176
|
end
|
174
177
|
|
175
178
|
#
|
@@ -172,13 +172,14 @@ describe Yolo::Tasks::Ios::Release do
|
|
172
172
|
end
|
173
173
|
|
174
174
|
it "should build mail options once deployed" do
|
175
|
+
Yolo::Tools::Git.any_instance.stub(:current_branch){"test"}
|
175
176
|
@release.mail_to = "test@test.com"
|
176
177
|
@ota.stub(:deploy).and_yield("url", "password")
|
177
178
|
@email.should_receive(:send).with(
|
178
179
|
{
|
179
180
|
:to => "test@test.com",
|
180
181
|
:ota_url => "url",
|
181
|
-
:subject=>"New testname build: 1.0",
|
182
|
+
:subject=>"New testname build: 1.0 (test)",
|
182
183
|
:title=>"testname",
|
183
184
|
:ota_password=>"password"
|
184
185
|
})
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: yolo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-01-
|
12
|
+
date: 2014-01-13 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: xcodebuild-rb
|