airbrussh 1.4.0 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: beb9d7bcc5ef80c739fd7d57f945714c41348eab098b9975dd8611fc92c96cc4
4
- data.tar.gz: a94d57358851990b0cf5bd54735e189ec068b8f413813667a96978780016becb
3
+ metadata.gz: 55fc294193f64fff819d6fd61aa25cb2ae77ed3bb6e11e9b169c6b5a8b48c377
4
+ data.tar.gz: cda1c291c971329be31c3fa0d5695ba0511c4afc6340cf96c09d157a5c565f4c
5
5
  SHA512:
6
- metadata.gz: 24dd006d4a258ecb0917d572e407d077f784efb7eddab21751c8ea19936fd0860848ee52aa33e8c9690b30192c96f00bcec0edebcbb20ab6997267c5e8066cd4
7
- data.tar.gz: 28b834a865a6fb7be89de6a1f72e48890c0dce521e87fddc56fe4802fa9d23dfce1964b40c4da06404cd5cf289b0440c46aa2a11e45b061e70bb4d6da993a9ab
6
+ metadata.gz: e08e903fec21622038b99666116f62bf08f030a7c0d2e42f71b7184a41e87669ddbb894c7180668cc6e0beefa50deabdf91f6a28565bc1208762e668cb7db3ef
7
+ data.tar.gz: 558cc51bf180d31d8fcf1a9e38f33030f0bff56688826d0b14ae0b295a44c3d0984d7aebb61edaf59455d74ed7398674019ec79b976cf5bff12edb900fcc7c3f
@@ -0,0 +1,135 @@
1
+ version: 2.1
2
+
3
+ executors:
4
+ ruby:
5
+ parameters:
6
+ version:
7
+ description: "Ruby version number"
8
+ default: "3.2"
9
+ type: string
10
+ docker:
11
+ - image: ruby:<< parameters.version >>
12
+ environment:
13
+ MT_COMPAT: "1" # Allows old versions of mocha gem to work with minitest
14
+
15
+ commands:
16
+ bundle_install:
17
+ description: Install Ruby dependencies with Bundler
18
+ parameters:
19
+ key:
20
+ description: "Cache key"
21
+ default: "3.2"
22
+ type: string
23
+ steps:
24
+ - restore_cache:
25
+ keys:
26
+ - bundle-v1-{{ arch }}-<< parameters.key >>
27
+ - run:
28
+ name: Install Ruby Dependencies
29
+ command: |
30
+ gem install bundler --conservative --no-document || \
31
+ gem install rubygems-update -v '<3' && update_rubygems && gem install bundler -v '<2' --no-document
32
+ bundle config --local path vendor/bundle
33
+ bundle check || (bundle install --jobs=4 --retry=3 && bundle clean)
34
+ - save_cache:
35
+ paths:
36
+ - ./vendor/bundle
37
+ key: bundle-v1-{{ arch }}-<< parameters.key >>-{{ checksum "Gemfile.lock" }}
38
+
39
+ jobs:
40
+ rubocop:
41
+ executor:
42
+ name: ruby
43
+ version: "2.7"
44
+ steps:
45
+ - checkout
46
+ - bundle_install:
47
+ key: "2.7"
48
+ - run: bundle exec rubocop
49
+ spec:
50
+ parameters:
51
+ ruby:
52
+ description: "Ruby version number"
53
+ default: "3.2"
54
+ type: string
55
+ executor:
56
+ name: ruby
57
+ version: << parameters.ruby >>
58
+ steps:
59
+ - checkout
60
+ - run: echo sshkit=master >> $BASH_ENV
61
+ - bundle_install:
62
+ key: << parameters.ruby >>
63
+ - run: bundle exec rake test
64
+ spec_legacy_ruby:
65
+ parameters:
66
+ ruby:
67
+ description: "Ruby version number"
68
+ default: "1.9"
69
+ type: string
70
+ sshkit:
71
+ description: "sshkit version number"
72
+ default: "1.6.1"
73
+ type: string
74
+ executor:
75
+ name: ruby
76
+ version: << parameters.ruby >>
77
+ steps:
78
+ - checkout
79
+ - run: |
80
+ echo "export sshkit=<< parameters.sshkit >>" >> $BASH_ENV
81
+ if [ "<< parameters.ruby >>" == "1.9" ]; then
82
+ echo "export RUBYOPT=-Ku" >> $BASH_ENV
83
+ fi
84
+ - bundle_install:
85
+ key: << parameters.ruby >>-<< parameters.sshkit >>
86
+ - run: bundle exec rake test
87
+
88
+ workflows:
89
+ version: 2
90
+ commit-workflow:
91
+ jobs:
92
+ - rubocop
93
+ - spec:
94
+ matrix: &matrix
95
+ parameters:
96
+ ruby:
97
+ - "2.4"
98
+ - "2.5"
99
+ - "2.6"
100
+ - "2.7"
101
+ - "3.0"
102
+ - "3.1"
103
+ - "3.2"
104
+ - spec_legacy_ruby:
105
+ matrix: &legacy_ruby_matrix
106
+ parameters:
107
+ ruby:
108
+ - "1.9"
109
+ - "2.0"
110
+ - "2.1"
111
+ - "2.2"
112
+ - "2.3"
113
+ sshkit:
114
+ - "1.6.1"
115
+ - "1.7.1"
116
+ - master
117
+ exclude:
118
+ - ruby: "1.9"
119
+ sshkit: master
120
+ cron-workflow:
121
+ jobs:
122
+ - rubocop
123
+ - spec:
124
+ matrix:
125
+ <<: *matrix
126
+ - spec_legacy_ruby:
127
+ matrix:
128
+ <<: *legacy_ruby_matrix
129
+ triggers:
130
+ - schedule:
131
+ cron: "0 13 * * 6"
132
+ filters:
133
+ branches:
134
+ only:
135
+ - main
@@ -1,5 +1,5 @@
1
- name-template: "$NEXT_PATCH_VERSION"
2
- tag-template: "v$NEXT_PATCH_VERSION"
1
+ name-template: "$RESOLVED_VERSION"
2
+ tag-template: "v$RESOLVED_VERSION"
3
3
  categories:
4
4
  - title: "⚠️ Breaking Changes"
5
5
  label: "⚠️ Breaking"
@@ -11,7 +11,15 @@ categories:
11
11
  label: "📚 Docs"
12
12
  - title: "🏠 Housekeeping"
13
13
  label: "🏠 Housekeeping"
14
+ version-resolver:
15
+ minor:
16
+ labels:
17
+ - "⚠️ Breaking"
18
+ - "✨ Feature"
19
+ default: patch
14
20
  change-template: "- $TITLE (#$NUMBER) @$AUTHOR"
15
21
  no-changes-template: "- No changes"
16
22
  template: |
17
23
  $CHANGES
24
+
25
+ **Full Changelog:** https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
@@ -1,12 +1,12 @@
1
- on: push
2
- name: Push
1
+ name: Release Drafter
2
+ on:
3
+ push:
4
+ branches:
5
+ - main
3
6
  jobs:
4
- draftRelease:
5
- name: Draft Release
7
+ update_release_draft:
6
8
  runs-on: ubuntu-latest
7
9
  steps:
8
- - uses: actions/checkout@master
9
- - name: Draft Release
10
- uses: toolmantim/release-drafter@v5.2.0
10
+ - uses: release-drafter/release-drafter@v5
11
11
  env:
12
12
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
data/CONTRIBUTING.md CHANGED
@@ -19,7 +19,7 @@ Note that Bundler 1.10 is required for development. Run `gem update bundler` to
19
19
 
20
20
  After checking out the airbrussh repo, run `bin/setup` to install dependencies. Run `rake` to execute airbrussh's tests and RuboCop checks.
21
21
 
22
- Airbrussh is designed to work against multiple versions of SSHKit and Ruby. In order to test this, we use the environment variable `sshkit` in order to run the tests against a specific version. The combinations of sshkit and ruby we support are specified in [.travis.yml](.travis.yml). To test all the versions locally, there is a `test_all.rb` bin file. This installs the gems and runs the tests for each sshkit version in [.travis.yml](.travis.yml). *Note: this will update your `Gemfile.lock` as each SSHKit gem version is installed. The gem version is restored to the default when the script exits.*
22
+ Airbrussh is designed to work against multiple versions of SSHKit and Ruby. In order to test this, we use the environment variable `sshkit` in order to run the tests against a specific version. The combinations of sshkit and ruby we support are specified in [.circleci/config.yml](.circleci/config.yml).
23
23
 
24
24
  A Guardfile is also present, so if you'd like to use Guard to do a TDD workflow, then:
25
25
 
data/Gemfile CHANGED
@@ -6,15 +6,25 @@ gemspec
6
6
  if RUBY_VERSION == "1.9.3"
7
7
  # These gems need specific version for Ruby 1.9
8
8
  gem "json", "~> 1.8"
9
+ gem "minitest", "~> 5.11.3"
10
+ gem "mocha", "~> 1.2"
9
11
  gem "net-ssh", "~> 2.8"
10
12
  gem "rake", "< 12.3"
11
13
  gem "term-ansicolor", "~> 1.3.2"
12
14
  gem "tins", "~> 1.6.0"
15
+ elsif RUBY_VERSION < "2.6"
16
+ # These gems need specific versions for Ruby < 2.6
17
+ gem "minitest", "< 5.16" # rubocop:disable Bundler/DuplicatedGem
18
+ gem "net-ssh", "< 7" # rubocop:disable Bundler/DuplicatedGem
13
19
  end
14
20
 
15
- if RUBY_VERSION >= "2.1"
16
- # These gems need at least Ruby 2.1
17
- gem "coveralls", "~> 0.8.15"
21
+ if RUBY_VERSION >= "2.5"
22
+ # These gems need at least Ruby 2.5
23
+ gem "coveralls_reborn", "~> 0.24.0"
24
+ end
25
+
26
+ if RUBY_VERSION >= "2.5"
27
+ # These gems need at least Ruby 2.5
18
28
  gem "rubocop", "0.50.0"
19
29
 
20
30
  # Optional development dependencies; requires bundler >= 1.10.
@@ -30,6 +40,9 @@ if RUBY_VERSION >= "2.1"
30
40
  end
31
41
  end
32
42
 
43
+ # Needed to make rubocop 0.50.0 work on modern rubies
44
+ gem "safe_yaml" if RUBY_VERSION >= "3.1"
45
+
33
46
  if (sshkit_version = ENV["sshkit"])
34
47
  requirement = begin
35
48
  Gem::Dependency.new("sshkit", sshkit_version).requirement
@@ -40,7 +53,7 @@ if (sshkit_version = ENV["sshkit"])
40
53
  else
41
54
  ["capistrano", sshkit_version]
42
55
  end
43
- { :github => "#{user}/sshkit", :branch => branch }
56
+ { :git => "https://github.com/#{user}/sshkit.git", :branch => branch }
44
57
  end
45
58
  gem "sshkit", requirement
46
59
  end
data/LICENSE.txt CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2019 Matt Brictson
3
+ Copyright (c) 2020 Matt Brictson
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
data/README.md CHANGED
@@ -1,10 +1,10 @@
1
1
  # Airbrussh
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/airbrussh.svg)](http://badge.fury.io/rb/airbrussh)
4
- [![Build Status](https://travis-ci.org/mattbrictson/airbrussh.svg?branch=master)](https://travis-ci.org/mattbrictson/airbrussh)
5
- [![Build status](https://ci.appveyor.com/api/projects/status/h052rlq54sne3md6/branch/master?svg=true)](https://ci.appveyor.com/project/mattbrictson/airbrussh/branch/master)
4
+ [![Build Status](https://circleci.com/gh/mattbrictson/airbrussh/tree/main.svg?style=shield)](https://app.circleci.com/pipelines/github/mattbrictson/airbrussh?branch=main)
5
+ [![Build status](https://ci.appveyor.com/api/projects/status/h052rlq54sne3md6/branch/main?svg=true)](https://ci.appveyor.com/project/mattbrictson/airbrussh/branch/main)
6
6
  [![Code Climate](https://codeclimate.com/github/mattbrictson/airbrussh/badges/gpa.svg)](https://codeclimate.com/github/mattbrictson/airbrussh)
7
- [![Coverage Status](https://coveralls.io/repos/mattbrictson/airbrussh/badge.svg?branch=master)](https://coveralls.io/r/mattbrictson/airbrussh?branch=master)
7
+ [![Coverage Status](https://coveralls.io/repos/mattbrictson/airbrussh/badge.svg?branch=main)](https://coveralls.io/r/mattbrictson/airbrussh?branch=main)
8
8
 
9
9
 
10
10
  Airbrussh is a concise log formatter for Capistrano and SSHKit. It displays well-formatted, useful log output that is easy to read. Airbrussh also saves Capistrano's verbose output to a separate log file just in case you need additional details for troubleshooting.
@@ -13,7 +13,7 @@ Airbrussh is a concise log formatter for Capistrano and SSHKit. It displays well
13
13
 
14
14
  If you aren't yet using Capistrano 3.5 (or wish to use Airbrussh with SSHKit directly), refer to the [advanced/legacy usage](#advancedlegacy-usage) section for installation instructions.
15
15
 
16
- ![Sample output](https://raw.github.com/mattbrictson/airbrussh/master/demo.gif)
16
+ ![Sample output](https://raw.github.com/mattbrictson/airbrussh/HEAD/demo.gif)
17
17
 
18
18
  For more details on how exactly Airbrussh affects Capistrano's output and the reasoning behind it, check out the blog post: [Introducing Airbrussh](https://mattbrictson.com/airbrussh).
19
19
 
@@ -37,7 +37,7 @@ set :format, :airbrussh
37
37
 
38
38
  When you run a Capistrano command, Airbrussh provides the following information in its output:
39
39
 
40
- ![Sample output](https://raw.github.com/mattbrictson/airbrussh/master/formatting.png)
40
+ ![Sample output](https://raw.github.com/mattbrictson/airbrussh/HEAD/formatting.png)
41
41
 
42
42
  * Name of Capistrano task being executed
43
43
  * When each task started (minutes:seconds elapsed since the deploy began)
data/airbrussh.gemspec CHANGED
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
29
29
 
30
30
  spec.add_dependency "sshkit", [">= 1.6.1", "!= 1.7.0"]
31
31
 
32
- spec.add_development_dependency "bundler", "~> 1.17"
32
+ spec.add_development_dependency "bundler"
33
33
  spec.add_development_dependency "rake", "~> 12.0"
34
34
  spec.add_development_dependency "minitest", "~> 5.10"
35
35
  spec.add_development_dependency "minitest-reporters", "~> 1.1"
36
- spec.add_development_dependency "mocha", "~> 1.2"
36
+ spec.add_development_dependency "mocha", "~> 2.1"
37
37
  end
data/appveyor.yml CHANGED
@@ -1,21 +1,11 @@
1
- version: '{build}'
2
-
1
+ version: "{build}"
3
2
  skip_tags: true
4
-
5
3
  skip_branch_with_pr: true
6
-
7
4
  environment:
8
- matrix:
9
- - ruby_version: "23"
10
- - ruby_version: "23-x64"
11
-
5
+ MT_COMPAT: "1" # Allows old versions of mocha gem to work with minitest
12
6
  install:
13
- - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
14
- - gem uninstall bundler --all --executables
15
- - gem install bundler --no-document -v "~>1.17"
7
+ - set PATH=C:\Ruby26-x64\bin;%PATH%
16
8
  - bundle install --retry=3
17
-
18
9
  test_script:
19
10
  - bundle exec rake
20
-
21
11
  build: off
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Airbrussh
4
- VERSION = "1.4.0".freeze
4
+ VERSION = "1.4.2".freeze
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: airbrussh
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Brictson
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-10-13 00:00:00.000000000 Z
11
+ date: 2023-08-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sshkit
@@ -34,16 +34,16 @@ dependencies:
34
34
  name: bundler
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: '1.17'
39
+ version: '0'
40
40
  type: :development
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - "~>"
44
+ - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: '1.17'
46
+ version: '0'
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
49
  requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
92
92
  requirements:
93
93
  - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '1.2'
95
+ version: '2.1'
96
96
  type: :development
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: '1.2'
102
+ version: '2.1'
103
103
  description: A replacement log formatter for SSHKit that makes Capistrano output much
104
104
  easier on the eyes. Just add Airbrussh to your Capfile and enjoy concise, useful
105
105
  log output that is easy to read.
@@ -109,11 +109,11 @@ executables: []
109
109
  extensions: []
110
110
  extra_rdoc_files: []
111
111
  files:
112
+ - ".circleci/config.yml"
112
113
  - ".github/release-drafter.yml"
113
114
  - ".github/workflows/push.yml"
114
115
  - ".gitignore"
115
116
  - ".rubocop.yml"
116
- - ".travis.yml"
117
117
  - CHANGELOG.md
118
118
  - CODE_OF_CONDUCT.md
119
119
  - CONTRIBUTING.md
@@ -127,7 +127,6 @@ files:
127
127
  - appveyor.yml
128
128
  - bin/console
129
129
  - bin/setup
130
- - bin/test_all.rb
131
130
  - lib/airbrussh.rb
132
131
  - lib/airbrussh/capistrano.rb
133
132
  - lib/airbrussh/capistrano/tasks.rb
@@ -150,7 +149,7 @@ metadata:
150
149
  changelog_uri: https://github.com/mattbrictson/airbrussh/releases
151
150
  source_code_uri: https://github.com/mattbrictson/airbrussh
152
151
  homepage_uri: https://github.com/mattbrictson/airbrussh
153
- post_install_message:
152
+ post_install_message:
154
153
  rdoc_options: []
155
154
  require_paths:
156
155
  - lib
@@ -165,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
165
164
  - !ruby/object:Gem::Version
166
165
  version: '0'
167
166
  requirements: []
168
- rubygems_version: 3.0.6
169
- signing_key:
167
+ rubygems_version: 3.2.33
168
+ signing_key:
170
169
  specification_version: 4
171
170
  summary: Airbrussh pretties up your SSHKit and Capistrano output
172
171
  test_files: []
data/.travis.yml DELETED
@@ -1,44 +0,0 @@
1
- sudo: false
2
- language: ruby
3
- cache: bundler
4
- branches:
5
- only:
6
- - master
7
- rvm:
8
- - 1.9
9
- - 2.0
10
- - 2.1
11
- - 2.2.10
12
- - 2.3.8
13
- - 2.4.5
14
- - 2.5.3
15
- - ruby-head
16
- env:
17
- - sshkit="master"
18
- - sshkit="= 1.7.1"
19
- - sshkit="= 1.6.1"
20
- matrix:
21
- exclude:
22
- # Older versions of SSHKit don't work with Ruby 2.4+, so skip those
23
- - rvm: 2.4.5
24
- env: sshkit="= 1.7.1"
25
- - rvm: 2.4.5
26
- env: sshkit="= 1.6.1"
27
- - rvm: 2.5.3
28
- env: sshkit="= 1.7.1"
29
- - rvm: 2.5.3
30
- env: sshkit="= 1.6.1"
31
- - rvm: ruby-head
32
- env: sshkit="= 1.7.1"
33
- - rvm: ruby-head
34
- env: sshkit="= 1.6.1"
35
- # Newer versions of SSHKit don't work with Ruby 1.9
36
- - rvm: 1.9
37
- env: sshkit="master"
38
-
39
- before_install:
40
- - gem update --system || echo "skipping rubygems upgrade"
41
- - gem install bundler -v 1.17.3 --conservative --no-document
42
- - gem install executable-hooks --conservative --no-document
43
- install:
44
- - bundle _1.17.3_ install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} || bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
data/bin/test_all.rb DELETED
@@ -1,21 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require "yaml"
3
- require "English"
4
-
5
- ruby24 = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.4.0")
6
-
7
- YAML.load_file(".travis.yml")["env"].each do |sshkit_version|
8
- # Older versions of SSHKit don't work with Ruby 2.4, so skip those
9
- next if ruby24 && sshkit_version !~ /master/
10
- puts "\e[0;34;49m== Running tests against #{sshkit_version} ==\e[0m"
11
- output = `#{sshkit_version} bundle update`
12
- raise "bundle update failed: #{output}" unless $CHILD_STATUS.success?
13
- system("#{sshkit_version} bundle exec rake test")
14
- end
15
-
16
- system("bundle exec rake rubocop")
17
-
18
- at_exit do
19
- puts "\e[0;34;49m== Resetting sshkit ==\e[0m"
20
- system("bundle update")
21
- end