Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Fish committed Jan 8, 2014
2 parents ba098b1 + 42d216a commit 992331c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions lib/yolo/tasks/ios/release.rb
Expand Up @@ -150,20 +150,28 @@ def release_to_github(bundle_path)
# @param url [String] The URL which the build has been deplyed too
# @param password [String] The password required to install the build
#
# @return [type] [description]
def send_notification(url, password)
if url
mail_options = {
:to => self.mail_to,
:ota_url => url,
:subject => "New #{name} build: #{version}",
:subject => "New #{name} build: #{version} (#{current_branch})",
:title => name
}
mail_options[:ota_password] = password if password
@emailer.send(mail_options)
end
end

#
# The current git branch
#
# @return [String] The current git branch
def current_branch
git = Yolo::Tools::Git.new
git.current_branch
end

#
# Initlizes an object from a deployment string
# @param string [String] the deployment class name string
Expand Down
2 changes: 1 addition & 1 deletion yolo.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'yolo'
s.version = '1.3.3'
s.version = '1.3.4'
s.date = Date.today.to_s
s.executables << 'yolo'
s.summary = "YOLO!"
Expand Down

0 comments on commit 992331c

Please sign in to comment.