conjur-cli 6.2.5 → 6.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e8bd9b3f0492516bb7636d952ef5b9d8019aecedf93b4cb32ca0060417dd06
-  data.tar.gz: 0c51275a1eab0e47724036a0ddcf76e55eac4b9298c703b85ad0393346ac597a
+  metadata.gz: d32639d38348697c37ba5bf0585a327f6977d8f2ccab13d5cb54c0e53cc51459
+  data.tar.gz: 6b322f2a82897d6b18f3306a6a02fc23ec1312737239fa4a7c8d85ab5dfc06df
 SHA512:
-  metadata.gz: 9f8a5b7f4e9030008e7557e9c68ec661f4d03ee9a17ce78e59c806ca4fa71e99746f700630ec397e0066e6b0519e95e6c951583621d93d6ae1cf70a27db23303
-  data.tar.gz: 8f541da5d129e2e6ba4a0ac3e544b595041c4708d258708f8914ea4c6fdf37218f651a9d4fc022578dbee15d81e077c8745c105d57392c61bbfa1916261e1cd3
+  metadata.gz: 9efa930d071c062bfbe28bcef30df93c1e99ee6d59774736c717b759e64ce1fb20c163d119fba3c96294a269bfbcacc51380bc8f516f1a3199ab33839ed98b6a
+  data.tar.gz: 0bc8d101b7010b39c8837705682a7ac487910eff2c371e13ec20454dfcf708c247711cf2c283b86457a4f8dbd873ee3c725fd7c6ec4840300bd1c3973138dadb

data/CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [6.2.6] - 2022-01-31
+
+### Changed
+- Allow activesupport >=6 as a dependency for ruby-3.0.2.
+  [cyberark/conjur-cli#339](https://github.com/cyberark/conjur-cli/pull/339)
+- Add Ruby 3 tests in CI.
+- Set Ruby 3 as default.
+  [cyberark/conjur-cli#344](https://github.com/cyberark/conjur-cli/pull/344)
+- Bump `conjur-api-ruby` gem.
+- Bump `rake` gem.
+
 ## [6.2.5] - 2021-09-29
 
 ### Fixed
@@ -65,7 +76,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - **Codebase forked: for changes to the 5.x (API [v4](https://github.com/cyberark/conjur-cli/tree/v4)) series, see
   [CHANGELOG in `v4` branch][v4-changelog](https://github.com/cyberark/conjur-cli/blob/v4/CHANGELOG.md)**
 
-[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.4...HEAD
+[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.6...HEAD
+[6.2.6]: https://github.com/cyberark/conjur-cli/compare/v6.2.5...v6.2.6
+[6.2.5]: https://github.com/cyberark/conjur-cli/compare/v6.2.4...v6.2.5
 [6.2.4]: https://github.com/cyberark/conjur-cli/compare/v6.2.3...v6.2.4
 [6.2.3]: https://github.com/cyberark/conjur-cli/compare/v6.2.2...v6.2.3
 [6.2.2]: https://github.com/cyberark/conjur-cli/compare/v6.2.1...v6.2.2

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-#ruby=ruby-2.7.0
+#ruby=ruby-3.0
 #ruby-gemset=conjur-cli
 
 # Specify your gem's dependencies in conjur.gemspec

data/Jenkinsfile

@@ -26,7 +26,7 @@ pipeline {
       }
     }
 
-    stage('Test 2.5') {
+    stage('Test Ruby 2.5') {
       environment {
         RUBY_VERSION = '2.5'
       }
@@ -42,7 +42,7 @@ pipeline {
       }
     }
 
-    stage('Test 2.6') {
+    stage('Test Ruby 2.6') {
       environment {
         RUBY_VERSION = '2.6'
       }
@@ -58,7 +58,7 @@ pipeline {
       }
     }
 
-    stage('Test 2.7') {
+    stage('Test Ruby 2.7') {
       environment {
         RUBY_VERSION = '2.7'
       }
@@ -74,6 +74,22 @@ pipeline {
       }
     }
 
+    stage('Test Ruby 3.0') {
+      environment {
+        RUBY_VERSION = '3.0'
+      }
+
+      steps {
+        sh './test.sh'
+      }
+
+      post {
+        always {
+          junit 'spec/reports/*.xml, features/reports/*.xml'
+        }
+      }
+    }
+
     stage('Submit Coverage Report'){
       steps{
         sh 'ci/submit-coverage'

data/NOTICES.txt

@@ -8,19 +8,19 @@ of the license associated with each component.
 
 SECTION 1: Apache-2.0 
 
->>> https://rubygems.org/gems/conjur-api/versions/5.3.4
->>> https://rubygems.org/gems/gli/versions/2.19.2
+>>> https://rubygems.org/gems/conjur-api/versions/5.3.7
+>>> https://rubygems.org/gems/gli/versions/2.21.0
 
 SECTION 2: BSD-2-Clause
 
->>> https://rubygems.org/gems/highline/versions/1.7.10
+>>> https://rubygems.org/gems/highline/versions/2.0.3
 >>> https://rubygems.org/gems/xdg/versions/2.2.3
 
 SECTION 3: MIT 
 
->>> https://rubygems.org/gems/activesupport/versions/5.2.4.4
->>> https://rubygems.org/gems/deep_merge/versions/1.0.1
->>> https://rubygems.org/gems/netrc/versions/0.10.3
+>>> https://rubygems.org/gems/activesupport/versions/6.1.4.4
+>>> https://rubygems.org/gems/deep_merge/versions/1.2.2
+>>> https://rubygems.org/gems/netrc/versions/0.11.0
 >>> https://rubygems.org/gems/table_print/versions/1.5.7
 
 APPENDIX: Standard License Files and Templates
@@ -35,7 +35,7 @@ APPENDIX: Standard License Files and Templates
 
 Apache-2.0 License is applicable to the following component(s).
 
->>> https://rubygems.org/gems/conjur-api/versions/5.3.4
+>>> https://rubygems.org/gems/conjur-api/versions/5.3.7
 
 Copyright (c) 2020 CyberArk Software Ltd. All rights reserved.'
 
@@ -51,7 +51,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
->>> https://rubygems.org/gems/gli/versions/2.19.2
+>>> https://rubygems.org/gems/gli/versions/2.21.0
 
 Copyright (c) 2010 by Dave Copeland
 
@@ -69,7 +69,7 @@ limitations under the License.
 
 --------------- SECTION 2: BSD-2-Clause ----------
 
->>> https://rubygems.org/gems/highline/versions/1.7.10
+>>> https://rubygems.org/gems/highline/versions/2.0.3
 
 Copyright 2005 Gray Productions. All rights reserved.
 
@@ -100,7 +100,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 MIT License is applicable to the following component(s).
 
->>> https://rubygems.org/gems/activesupport/versions/5.2.4.4
+>>> https://rubygems.org/gems/activesupport/versions/6.1.4.4
 
 Copyright (c) 2005-2018 David Heinemeier Hansson'
 
@@ -123,7 +123,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
->>> https://rubygems.org/gems/deep_merge/versions/1.0.1
+>>> https://rubygems.org/gems/deep_merge/versions/1.2.2
 
 Copyright (c) 2008-2104 Steve Midgley, Daniel DeLeo
 
@@ -145,7 +145,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
->>> https://rubygems.org/gems/netrc/versions/0.10.3
+>>> https://rubygems.org/gems/netrc/versions/0.11.0
 
 Copyright (c) 2011-2014 CONTRIBUTORS.md
 

data/VERSION

@@ -1 +1 @@
-6.2.5
+6.2.6

data/conjur-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   # Filter out development only executables
   gem.executables -= %w{parse-changelog.sh}
 
-  gem.add_dependency 'activesupport', '>= 4.2', '< 6'
+  gem.add_dependency 'activesupport', '~> 6.0'
   gem.add_dependency 'conjur-api', '~> 5.3'
   gem.add_dependency 'deep_merge', '~> 1.0'
   gem.add_dependency 'gli', '>=2.8.0'
@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'io-grab', '~> 0.0'
   gem.add_development_dependency 'json_spec'
   gem.add_development_dependency 'pry-byebug'
-  gem.add_development_dependency 'rake', '~> 12.3.3'
+  gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
 end

data/jenkins.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 # Constants
-RUBY_VERSION_DEFAULT="2.7"
+RUBY_VERSION_DEFAULT="3.0"
 
 # Arguments
 RUBY_VERSION=${1-${RUBY_VERSION_DEFAULT}}

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = '6.2.5'
+  VERSION = '6.2.6'
   ::Version=VERSION
 end

data/test.sh

@@ -1,11 +1,15 @@
 #!/bin/bash -ex
 
-: ${RUBY_VERSION=2.7}
+: ${RUBY_VERSION=3.0}
 
 # My local RUBY_VERSION is set to ruby-#.#.# so this allows running locally.
 RUBY_VERSION=$(cut -d '-' -f 2 <<< $RUBY_VERSION)
 
 main() {
+  if ! docker info >/dev/null 2>&1; then
+    echo "Docker does not seem to be running, run it first and retry"
+    exit 1
+  fi
 
   # set up the containers to run in their own namespace
   COMPOSE_PROJECT_NAME="$(basename "$PWD")_$(openssl rand -hex 3)"

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.5
+  version: 6.2.6
 platform: ruby
 authors:
 - Conjur Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement
@@ -232,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -285,9 +279,6 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/CODEOWNERS"
-- ".github/ISSUE_TEMPLATE/bug.md"
-- ".github/ISSUE_TEMPLATE/feature_request.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".gitleaks.toml"
 - ".kateproject"

data/.github/ISSUE_TEMPLATE/bug.md

@@ -1,42 +0,0 @@
----
-name: Bug
-about: Create a bug report to help us improve
-title: ''
-labels: component/cli, kind/bug
-assignees: ''
-
----
-
-## Summary
-A clear and concise description of what the bug is.
-
-## Steps to Reproduce
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected Results
-A clear and concise description of what you expected to happen.
-
-## Actual Results (including error logs, if applicable)
-A clear and concise description of what actually did happen.
-
-## Reproducible
-   * [ ] Always 
-   * [ ] Sometimes
-   * [ ] Non-Reproducible
-   
-## Version/Tag number
-What version of the product are you running? Any version info that you can share is helpful. 
-For example, you might give the version from Docker logs, the Docker tag, a specific download URL, 
-the output of the `/info` route, etc.
-
-## Environment setup
-Can you describe the environment in which this product is running? Is it running on a VM / in a container / in a cloud? 
-Which cloud provider? Which container orchestrator (including version)? 
-The more info you can share about your runtime environment, the better we may be able to reproduce the issue.
-
-## Additional Information
-Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: kind/enhancement, component/cli
-assignees: ''
-
----
-
-## Is your feature request related to a problem? Please describe.
-
-A clear and concise description of what the problem is. Ex. `I would like to see [...] because [...]`.
-Please include the intended use case and what the feature would improve on so that we can prioritize
-the feature accordingly.
-
-## Describe the solution you would like
-
-A clear and concise description of what the desired end result(s) would be.
-
-## Describe alternatives you have considered
-
-A clear and concise description of any alternative solutions or features that may be related to this that
-you have considered.
-
-## Additional context
-
-Add any other context information about the feature request here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +0,0 @@
-### What does this PR do?
-- _What's changed? Why were these changes made?_
-- _How should the reviewer approach this PR, especially if manual tests are required?_
-- _Are there relevant screenshots you can add to the PR description?_
-
-### What ticket does this PR close?
-Resolves #[relevant GitHub issues, eg 76]
-
-### Checklists
-
-#### Change log
-- [ ] The CHANGELOG has been updated, or
-- [ ] This PR does not include user-facing changes and doesn't require a CHANGELOG update
-
-#### Test coverage
-- [ ] This PR includes new unit and integration tests to go with the code changes, or
-- [ ] The changes in this PR do not require tests
-
-#### Documentation
-- [ ] Docs (e.g. `README`s) were updated in this PR, and/or there is a follow-on issue to update docs, or
-- [ ] This PR does not require updating any documentation