Skip to content

Commit

Permalink
Add dev gems to Gemfile, drop Gemfile.lock from VCS (#1045)
Browse files Browse the repository at this point in the history
  • Loading branch information
kke authored and jakolehm committed Feb 27, 2019
1 parent d1bf46e commit 60dda34
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 162 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/spec/reports/
/tmp/
**/.vagrant
Gemfile.lock
gems.locked
161 changes: 0 additions & 161 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion lib/pharos/configuration/route.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
module Pharos
module Configuration
class Route < Pharos::Configuration::Struct
ROUTE_REGEXP = %r(^((?<type>\S+)\s+)?(?<prefix>default|[0-9./]+)(\s+via (?<via>\S+))?(\s+dev (?<dev>\S+))?(\s+proto (?<proto>\S+))?(\s+(?<options>.+))?$)
ROUTE_REGEXP = %r(^((?<type>\S+)\s+)?(?<prefix>default|[0-9./]+)(\s+via (?<via>\S+))?(\s+dev (?<dev>\S+))?(\s+proto (?<proto>\S+))?(\s+(?<options>.+))?$).freeze

# @param line [String]
# @return [Pharos::Configuration::Route]
Expand Down
1 change: 1 addition & 0 deletions lib/pharos/transport/command/result.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def synchronize(&block)

def initialize_debug
return if ENV['DEBUG'].to_s.empty?

@debug_prefix = " #{"#{hostname}:".dim} "
end
end
Expand Down
2 changes: 2 additions & 0 deletions lib/pharos/transport/ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def connect(**options)
rescue *RETRY_CONNECTION_ERRORS => exc
logger.debug { "Received #{exc.class.name} : #{exc.message} when connecting to bastion host #{bastion.user}@#{bastion.host}" }
raise if gw_opts[:non_interactive] == false || !$stdin.tty? # don't re-retry

logger.debug { "Retrying in interactive mode" }
gw_opts[:non_interactive] = false
retry
Expand All @@ -51,6 +52,7 @@ def connect(**options)
rescue *RETRY_CONNECTION_ERRORS => exc
logger.debug { "Received #{exc.class.name} : #{exc.message} when connecting to #{@user}@#{@host}" }
raise if non_interactive == false || !$stdin.tty? # don't re-retry

logger.debug { "Retrying in interactive mode" }
non_interactive = false
retry
Expand Down
1 change: 1 addition & 0 deletions pharos-cluster.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec", "~> 3.7"
spec.add_development_dependency "fakefs", "~> 0.13"
spec.add_development_dependency "rubocop", "~> 0.57"
spec.add_development_dependency "pry-byebug", "~> 3.6"
end

0 comments on commit 60dda34

Please sign in to comment.