Skip to content

Commit

Permalink
Merge pull request fastlane-old#99 from fastlane/feature/new-ui
Browse files Browse the repository at this point in the history
Migrated match to the new fastlane UI
  • Loading branch information
KrauseFx committed Feb 9, 2016
2 parents c82798c + 6d597b5 commit 0d57d88
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ruby:
config_file: .rubocop.yml
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: ruby
osx_image: xcode7.1
os: osx
before_install:
- gem update --system
- gem install bundler
Expand Down
2 changes: 1 addition & 1 deletion lib/match/encrypt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def crypt(path: nil, password: nil, encrypt: true)
command << "&> /dev/null" unless $verbose # to show show an error message is something goes wrong
success = system(command.join(' '))

raise "Error decrypting '#{path}'" unless success
UI.crash!("Error decrypting '#{path}'") unless success
FileUtils.mv(tmpfile, path)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/match/git_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def self.clone(git_url, shallow_clone, manual_password: nil)
print_all: $verbose,
print_command: $verbose)

raise "Error cloning repo, make sure you have access to it '#{git_url}'".red unless File.directory?(@dir)
UI.user_error!("Error cloning repo, make sure you have access to it '#{git_url}'") unless File.directory?(@dir)

if !Helper.test? and GitHelper.match_version(@dir).nil? and manual_password.nil? and File.exist?(File.join(@dir, "README.md"))
UI.important "Migrating to new match..."
Expand Down
4 changes: 2 additions & 2 deletions lib/match/options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def self.available_options
default_value: 'development',
verify_block: proc do |value|
unless Match.environments.include?(value)
raise "Unsupported environment #{value}, must be in #{Match.environments.join(', ')}".red
UI.user_error!("Unsupported environment #{value}, must be in #{Match.environments.join(', ')}")
end
end),
FastlaneCore::ConfigItem.new(key: :app_identifier,
Expand Down Expand Up @@ -87,7 +87,7 @@ def self.available_options
if value.start_with?("/var/folders") or value.include?("tmp/") or value.include?("temp/")
# that's fine
else
raise "Specify the `git_url` instead of the `path`".red
UI.user_error!("Specify the `git_url` instead of the `path`")
end
end
end,
Expand Down
2 changes: 1 addition & 1 deletion match.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'security' # Mac OS Keychain manager

spec.add_dependency 'fastlane_core', '>= 0.35.0', '< 1.0.0' # all shared code and dependencies
spec.add_dependency 'fastlane_core', '>= 0.36.1', '< 1.0.0' # all shared code and dependencies
spec.add_dependency 'credentials_manager', '>= 0.13.0', '< 1.0.0' # fastlane password manager
spec.add_dependency 'spaceship', '>= 0.18.1', '< 1.0.0' # communication layer with Apple's web services
spec.add_dependency 'sigh', '>= 1.2.2', '< 2.0.0'
Expand Down

0 comments on commit 0d57d88

Please sign in to comment.