conjur-cli 5.6.6 → 6.0.0.rc1

data/test.sh

@@ -1,36 +1,40 @@
 #!/bin/bash -ex
 
-# Constants
-RUBY_VERSION_DEFAULT="2.2.4"
+: ${RUBY_VERSION=2.2.5}
 
-# Arguments
-RUBY_VERSION=${1-${RUBY_VERSION_DEFAULT}}
+# My local RUBY_VERSION is set to ruby-#.#.# so this allows running locally.
+RUBY_VERSION=$(cut -d '-' -f 2 <<< $RUBY_VERSION)
 
-# Script
+main() {
+  build
 
-# Clones 'Dockerfile' and updates the Ruby version in FROM, returning the cloned file's path
-function dockerfile_path {
-    echo "Setting Ruby version as ${RUBY_VERSION}" >&2
-    cp "Dockerfile" "Dockerfile.${RUBY_VERSION}"
-    if ! grep "Dockerfile.${RUBY_VERSION}" .git/info/exclude >/dev/null; then
-        echo "Dockerfile.${RUBY_VERSION}*" >>.git/info/exclude
-    fi
-    sed -i -e "s/${RUBY_VERSION_DEFAULT}/${RUBY_VERSION}/g" Dockerfile.${RUBY_VERSION}
+  start_conjur
 
-    echo "Dockerfile.${RUBY_VERSION}"
+  run_tests
 }
 
-rm -f Gemfile.lock # Needed for bundle to work right
+# internal functions
 
-IMAGE_NAME="cli-ruby:${RUBY_VERSION}" # The tag is the version of Ruby tested against
+build() {
+  # we can get rid of this once we upgrade to docker 17.06+
+  sed "s/\${RUBY_VERSION}/$RUBY_VERSION/" Dockerfile > Dockerfile.$RUBY_VERSION
 
-docker build -t ${IMAGE_NAME} -f $(dockerfile_path) .
+  docker-compose build --pull
+}
+
+start_conjur() {
+  docker-compose pull pg conjur
+
+  env CONJUR_DATA_KEY="$(docker-compose run -T --no-deps conjur data-key generate)" \
+    docker-compose up -d conjur
+  trap "docker-compose down" EXIT
+
+  docker-compose run test ci/wait_for_server.sh
+}
+
+run_tests() {
+  env CONJUR_AUTHN_API_KEY=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:user:admin'].api_key") \
+    docker-compose run test "$@"
+}
 
-docker run --rm \
--v $PWD:/src \
-${IMAGE_NAME} \
-bash -c '''
-bundle update
-bundle exec rake jenkins
-bundle exec rake build
-'''
+main

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.6
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,34 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '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: '0'
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.30'
+        version: 5.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.30'
+        version: 5.0.0.beta
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -87,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: methadone
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -143,34 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: semantic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: cas_rest_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +263,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - rafal@conjur.net
@@ -318,13 +284,10 @@ email:
 executables:
 - _conjur
 - conjur
-- conjurize
-- jsonfield
 extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
-- ".githooks/pre_commit/run_specs.rb"
 - ".gitignore"
 - ".kateproject"
 - ".overcommit.yml"
@@ -332,190 +295,108 @@ files:
 - ".rubocop.yml"
 - APPLIANCE_VERSION
 - CHANGELOG.md
-- Dockerfile
-- Dockerfile.fpm
-- Dockerfile.publish
-- Dockerfile.standalone
-- Dockerfile.validate-packaging
 - Gemfile
+- Humanfile.md
 - Jenkinsfile
 - LICENSE.md
 - PUBLISH.md
 - README.md
 - Rakefile
-- VERSION
-- acceptance-features/audit/audit_event_send.feature
-- acceptance-features/audit/fetch.feature
-- acceptance-features/audit/send.feature
-- acceptance-features/authentication/authenticate.feature
-- acceptance-features/authentication/login.feature
-- acceptance-features/authentication/logout.feature
-- acceptance-features/authentication/whoami.feature
-- acceptance-features/authorization/resource/annotate.feature
-- acceptance-features/authorization/resource/check.feature
-- acceptance-features/authorization/resource/create.feature
-- acceptance-features/authorization/resource/deny.feature
-- acceptance-features/authorization/resource/exists.feature
-- acceptance-features/authorization/resource/give.feature
-- acceptance-features/authorization/resource/permit.feature
-- acceptance-features/authorization/resource/permitted_roles.feature
-- acceptance-features/authorization/resource/show.feature
-- acceptance-features/authorization/role/create.feature
-- acceptance-features/authorization/role/exists.feature
-- acceptance-features/authorization/role/grant_to.feature
-- acceptance-features/authorization/role/graph.feature
-- acceptance-features/authorization/role/members.feature
-- acceptance-features/authorization/role/memberships.feature
-- acceptance-features/bootstrap.feature
-- acceptance-features/conjurenv/check.feature
-- acceptance-features/conjurenv/run.feature
-- acceptance-features/conjurenv/template.feature
-- acceptance-features/directory/group/create.feature
-- acceptance-features/directory/group/retire.feature
-- acceptance-features/directory/host/create.feature
-- acceptance-features/directory/host/retire.feature
-- acceptance-features/directory/hostfactory/create.feature
-- acceptance-features/directory/hostfactory/tokens.feature
-- acceptance-features/directory/layer/create.feature
-- acceptance-features/directory/layer/hosts-add.feature
-- acceptance-features/directory/layer/hosts-remove.feature
-- acceptance-features/directory/layer/retire.feature
-- acceptance-features/directory/user/create.feature
-- acceptance-features/directory/user/retire.feature
-- acceptance-features/directory/user/update_password.feature
-- acceptance-features/directory/variable/create.feature
-- acceptance-features/directory/variable/retire.feature
-- acceptance-features/directory/variable/value.feature
-- acceptance-features/directory/variable/values-add.feature
-- acceptance-features/dsl/policy_owner.feature
-- acceptance-features/dsl/resource_owner.feature
-- acceptance-features/dsl/retire.feature
-- acceptance-features/global-privilege/elevate.feature
-- acceptance-features/global-privilege/reveal.privilege
-- acceptance-features/pubkeys/add.feature
-- acceptance-features/pubkeys/delete.feature
-- acceptance-features/pubkeys/names.feature
-- acceptance-features/pubkeys/show.feature
-- acceptance-features/step_definitions/cli_steps.rb
-- acceptance-features/step_definitions/graph_steps.rb
-- acceptance-features/step_definitions/http_steps.rb
-- acceptance-features/step_definitions/trusted_proxy_steps.rb
-- acceptance-features/step_definitions/user_steps.rb
-- acceptance-features/support/env.rb
-- acceptance-features/support/hooks.rb
-- acceptance-features/support/world.rb
-- acceptance-features/trusted_proxies.feature
 - bin/_conjur
 - bin/conjur
-- bin/conjurize
-- bin/jsonfield
 - build-deb.sh
-- build-standalone
+- ci/cli-test.sh
 - ci/install.sh
 - ci/package.sh
 - ci/publish.sh
 - ci/secrets/publish.yml
 - ci/test.sh
+- ci/wait_for_server.sh
 - conjur-cli.gemspec
 - debify.sh
-- deprecations.sh
-- features/conjurize.feature
-- features/dsl_context.feature
-- features/dsl_host_create.feature
-- features/dsl_ownership.feature
-- features/dsl_permission.feature
-- features/dsl_resource_create.feature
-- features/dsl_role_create.feature
-- features/dsl_user_create.feature
-- features/jsonfield.feature
-- features/role_graph.feature
-- features/step_definitions/conjurize_steps.rb
-- features/step_definitions/dsl_steps.rb
+- dev/docker-compose.yml
+- dev/start.sh
+- dev/stop.sh
+- docker-compose.yml
+- features/authentication/authenticate.feature
+- features/authentication/login.feature
+- features/authentication/logout.feature
+- features/authentication/whoami.feature
+- features/authorization/resource/annotate.feature
+- features/authorization/resource/check.feature
+- features/authorization/resource/exists.feature
+- features/authorization/resource/permitted_roles.feature
+- features/authorization/resource/show.feature
+- features/authorization/role/exists.feature
+- features/authorization/role/members.feature
+- features/authorization/role/memberships.feature
+- features/conjurenv/check.feature
+- features/conjurenv/run.feature
+- features/conjurenv/template.feature
+- features/directory/user/update_password.feature
+- features/directory/variable/value.feature
+- features/directory/variable/values-add.feature
+- features/hostfactory/tokens.feature
+- features/pubkeys/show.feature
+- features/step_definitions/authn_steps.rb
+- features/step_definitions/cli_steps.rb
+- features/step_definitions/file_steps.rb
+- features/step_definitions/flow_control_steps.rb
 - features/step_definitions/graph_steps.rb
-- features/support/conjur-test.pem
-- features/support/conjur.conf
+- features/step_definitions/http_steps.rb
+- features/step_definitions/overrides.rb
+- features/step_definitions/policy_steps.rb
+- features/step_definitions/trusted_proxy_steps.rb
+- features/support/blank.yml
 - features/support/env.rb
 - features/support/hooks.rb
-- features/support/host.json
 - features/support/world.rb
+- jenkins.sh
 - lib/conjur-cli.rb
 - lib/conjur.rb
 - lib/conjur/audit/follower.rb
+- lib/conjur/authenticator.rb
 - lib/conjur/authn.rb
 - lib/conjur/cli.rb
 - lib/conjur/command.rb
-- lib/conjur/command/assets.rb
-- lib/conjur/command/audit.rb
 - lib/conjur/command/authn.rb
-- lib/conjur/command/bootstrap.rb
-- lib/conjur/command/dsl_command.rb
-- lib/conjur/command/elevate.rb
 - lib/conjur/command/env.rb
-- lib/conjur/command/field.rb
-- lib/conjur/command/groups.rb
 - lib/conjur/command/host_factories.rb
 - lib/conjur/command/hosts.rb
-- lib/conjur/command/ids.rb
 - lib/conjur/command/init.rb
-- lib/conjur/command/layers.rb
-- lib/conjur/command/ldapsync.rb
 - lib/conjur/command/plugin.rb
+- lib/conjur/command/policies.rb
 - lib/conjur/command/pubkeys.rb
 - lib/conjur/command/resources.rb
 - lib/conjur/command/roles.rb
-- lib/conjur/command/rspec/audit_helpers.rb
 - lib/conjur/command/rspec/describe_command.rb
 - lib/conjur/command/rspec/helpers.rb
 - lib/conjur/command/rspec/mock_services.rb
 - lib/conjur/command/rspec/output_matchers.rb
-- lib/conjur/command/rubydsl.rb
-- lib/conjur/command/script.rb
-- lib/conjur/command/secrets.rb
-- lib/conjur/command/server.rb
 - lib/conjur/command/shellinit.rb
 - lib/conjur/command/users.rb
 - lib/conjur/command/variables.rb
 - lib/conjur/complete.rb
 - lib/conjur/config.rb
 - lib/conjur/conjurenv.rb
-- lib/conjur/conjurize.rb
-- lib/conjur/conjurize/script.rb
-- lib/conjur/dsl/runner.rb
 - lib/conjur/identifier_manipulation.rb
 - lib/conjur/version.rb
 - lib/patches/conjur/error.rb
 - lib/patches/gli.rb
 - profile.rb
-- publish-deb.sh
-- publish-rubygem.sh
-- push-image
+- publish.sh
 - spec/authn_spec.rb
-- spec/command/assets_spec.rb
-- spec/command/audit_spec.rb
 - spec/command/authn_spec.rb
-- spec/command/elevate_spec.rb
-- spec/command/env_spec.rb
-- spec/command/groups_spec.rb
-- spec/command/host_factories_spec.rb
 - spec/command/hosts_spec.rb
 - spec/command/init_spec.rb
-- spec/command/layers_spec.rb
-- spec/command/ldapsync_spec.rb
 - spec/command/pubkeys_spec.rb
 - spec/command/resources_spec.rb
 - spec/command/roles_spec.rb
-- spec/command/rubydsl_spec.rb
 - spec/command/users_spec.rb
-- spec/command/variable_expiration_spec.rb
-- spec/command/variables_spec.rb
 - spec/command_spec.rb
 - spec/complete_spec.rb
 - spec/config_spec.rb
-- spec/conjurize/script_spec.rb
-- spec/conjurize_spec.rb
 - spec/conjurrc
-- spec/dsl/runner_spec.rb
-- spec/env_spec.rb
 - spec/spec_helper.rb
 - standalone.entrypoint
 - test.sh
@@ -534,60 +415,59 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Conjur command line interface
 test_files:
-- features/conjurize.feature
-- features/dsl_context.feature
-- features/dsl_host_create.feature
-- features/dsl_ownership.feature
-- features/dsl_permission.feature
-- features/dsl_resource_create.feature
-- features/dsl_role_create.feature
-- features/dsl_user_create.feature
-- features/jsonfield.feature
-- features/role_graph.feature
-- features/step_definitions/conjurize_steps.rb
-- features/step_definitions/dsl_steps.rb
+- features/authentication/authenticate.feature
+- features/authentication/login.feature
+- features/authentication/logout.feature
+- features/authentication/whoami.feature
+- features/authorization/resource/annotate.feature
+- features/authorization/resource/check.feature
+- features/authorization/resource/exists.feature
+- features/authorization/resource/permitted_roles.feature
+- features/authorization/resource/show.feature
+- features/authorization/role/exists.feature
+- features/authorization/role/members.feature
+- features/authorization/role/memberships.feature
+- features/conjurenv/check.feature
+- features/conjurenv/run.feature
+- features/conjurenv/template.feature
+- features/directory/user/update_password.feature
+- features/directory/variable/value.feature
+- features/directory/variable/values-add.feature
+- features/hostfactory/tokens.feature
+- features/pubkeys/show.feature
+- features/step_definitions/authn_steps.rb
+- features/step_definitions/cli_steps.rb
+- features/step_definitions/file_steps.rb
+- features/step_definitions/flow_control_steps.rb
 - features/step_definitions/graph_steps.rb
-- features/support/conjur-test.pem
-- features/support/conjur.conf
+- features/step_definitions/http_steps.rb
+- features/step_definitions/overrides.rb
+- features/step_definitions/policy_steps.rb
+- features/step_definitions/trusted_proxy_steps.rb
+- features/support/blank.yml
 - features/support/env.rb
 - features/support/hooks.rb
-- features/support/host.json
 - features/support/world.rb
 - spec/authn_spec.rb
-- spec/command/assets_spec.rb
-- spec/command/audit_spec.rb
 - spec/command/authn_spec.rb
-- spec/command/elevate_spec.rb
-- spec/command/env_spec.rb
-- spec/command/groups_spec.rb
-- spec/command/host_factories_spec.rb
 - spec/command/hosts_spec.rb
 - spec/command/init_spec.rb
-- spec/command/layers_spec.rb
-- spec/command/ldapsync_spec.rb
 - spec/command/pubkeys_spec.rb
 - spec/command/resources_spec.rb
 - spec/command/roles_spec.rb
-- spec/command/rubydsl_spec.rb
 - spec/command/users_spec.rb
-- spec/command/variable_expiration_spec.rb
-- spec/command/variables_spec.rb
 - spec/command_spec.rb
 - spec/complete_spec.rb
 - spec/config_spec.rb
-- spec/conjurize/script_spec.rb
-- spec/conjurize_spec.rb
 - spec/conjurrc
-- spec/dsl/runner_spec.rb
-- spec/env_spec.rb
 - spec/spec_helper.rb