conjur-debify 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036cffe142434776c5b343709dd6180f53c3f9fb
-  data.tar.gz: c381c211706f3bfb8747b7e572b13129d4e8f76e
+  metadata.gz: 9cfd1a8c7590e68df545ee14205ebc86a695f636
+  data.tar.gz: 8951e64bfe8ab43dada0ed964bf0b1985679a73a
 SHA512:
-  metadata.gz: ed0a8d89e0196a0a315054c38a390209b1c3bd7895d1e17afd0326e79b8eaf743129edc487b968ec21d330960c48115741b8a1c21d25287b2eb56f2ddac7226e
-  data.tar.gz: 02a67909b16651936dff4c1b77c7767b14982a192784fca2be857c258f739c73156410f0412012804406101cbef030cb9242518c7634c9d336fa22606cb07aab
+  metadata.gz: 2c3c5de841eb1a8e14666da2f02a623d85ced3a2a72e99bc5d5fb4eb2bced96e38415c59ac42d2105aa81b20c45af4fb063825293f7ffd46811d465727409e14
+  data.tar.gz: 36ae0244afe85132741d13e867d477ed43a83bee52faf27ca439ec2f02fdadc369536fcbdf10bce1ac8cef79726bbc0b55787f1d6c78467497fe9f80c03d937f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.1
+
+* When testing, `docker exec` into the Conjur container to run
+  `/opt/conjur/evoke/bin/wait_for_conjur`.
+
 # 1.3.0
 
 * Add `--volumes-from`

data/README.md

@@ -1,5 +1,23 @@
 # Debify
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'conjur-debify'
+```
+
+And then execute:
+```sh-session
+$ bundle
+```
+
+Or install it yourself as a ruby gem:
+```sh-session
+$ gem install conjur-debify
+```
+
 ## Build a package
 
 Builds a Conjur Debian package from a Ruby gem.
@@ -118,7 +136,7 @@ COMMAND OPTIONS
 
 ### Example usage
 
-Assuming a `secrets.yml` like this exists in the source directory:
+Assuming a `secrets.yml` like this exists in the source directory and that you have `summon` with the Conjur provider installed on the machine:
 
 ```yaml
 ARTIFACTORY_USERNAME: !var artifactory/users/jenkins/username
@@ -167,28 +185,12 @@ COMMAND OPTIONS
 authz $ debify sandbox -t $(cat VERSION_APPLIANCE)-stable
 ... much logging
 authz $ docker exec -it authz-sandbox bash
-root@7d4217655332:/src/authz# /opt/conjur/evoke/bin/dev-install
+root@7d4217655332:/src/authz# /opt/conjur/evoke/bin/dev-install authz
 ...
 root@7d4217655332:/src/authz# export RAILS_ENV=test
 root@7d4217655332:/src/authz# bundle exec rake db:migrate
 ```
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'debify'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install debify
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/debify/fork )

data/features/debify.feature

@@ -16,6 +16,6 @@ Feature: Packaging
 	@announce-output
 	Scenario: 'example' project can be tested successfully
 		Given I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1 example -- --post-install /distrib/postinstall.sh`
-		When I run `env DEBUG=true GLI_DEBUG=true debify test -t 4.7-stable -v 0.0.1 -d ../../example --no-pull example test.sh`
+		When I run `env DEBUG=true GLI_DEBUG=true debify test -t 4.8-stable -v 0.0.1 -d ../../example --no-pull example test.sh`
 		Then the exit status should be 0
 		And the stderr should contain "Test succeeded"

data/lib/conjur/debify.rb

@@ -266,37 +266,20 @@ command "package" do |c|
   end
 end
 
-def wait_for_conjur appliance_image, container
-  wait_options = {
-    'Image' => appliance_image.id,
-    'Entrypoint' => '/opt/conjur/evoke/bin/wait_for_conjur',
-    'HostConfig' => {
-      'Links' => [
-        [ container.id, 'conjur' ].join(":")
-      ]
-    }
-  }
-  wait_options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
-
-  wait_container = Docker::Container.create wait_options
-  begin
-    spawn("docker logs -f #{wait_container.id}", [ :out, :err ] => $stderr).tap do |pid|
-      Process.detach pid
-    end
-    wait_container.start
-    status = wait_container.wait
-    raise "wait_for_conjur failed" unless status['StatusCode'] == 0
-  ensure
-    wait_container.delete(force: true)
-  end
-end
-
 def container_command container, *args
   stdout, stderr, exitcode = container.exec args, &DebugMixin::DOCKER
   exit_now! "Command failed : #{args.join(' ')}", exitcode unless exitcode == 0
   stdout
 end
 
+def wait_for_conjur appliance_image, container
+  # Add a hosts entry for now, get rid of it when wait_for_conjur no
+  # longer requires it.
+  system("docker exec #{container.id} /bin/bash -c 'echo 127.0.0.1 conjur >> /etc/hosts'")
+  container_command container, '/opt/conjur/evoke/bin/wait_for_conjur'
+end
+
+
 desc "Test a Conjur debian package in a Conjur appliance container"
 long_desc <<DESC
 First, a Conjur appliance container is created and started. By default, the

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli