conjur-debify 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09163b1b3fd1d4cbf3e0c9a7960581bac62d3bf
-  data.tar.gz: 1542b78f84637ac4abb479d1f4f3bdfbf17e3313
+  metadata.gz: 49e366180a3f8f376a01367a42a43442fe706a16
+  data.tar.gz: dbd842630e1e51e96bef593f4653562324e68ad7
 SHA512:
-  metadata.gz: cff5d82b37638d470e81c87d11a1dd96934a4101b63e4c59c6f6717b5a09134be54723b3aa01eed6207ef48b71ef6e7a24274a29baa25a4605376114a2a56e50
-  data.tar.gz: 4f99702117b608961ddb17c3393d6d892fe7738c3839a4a7288d51cab4ecd5bd1a71190ef3a4a781609e513b4a70606ef61549db660560c971ec3a90d4e474e3
+  metadata.gz: e6180c9647d0fc7af44ef3996af13ae1defd604fa4cf6ea733b1bd6ac09fcd85a28381d1f7b72d12bda22b7d16ec1eb9346581807b9ce7e049d1e51754ce625a
+  data.tar.gz: c0641fa9894e3acf5adad1ed702b5e4ad5bfdc959763506f83260811037bb7f67d826786c1348c85b61fc8248b973c4341efb6fb2d65f5b8d4bb2c14738dfb15

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/conjur/debify.rb

@@ -270,23 +270,37 @@ command "test" do |c|
         end
       end
       
+      def command container, *args
+        stdout, stderr, exitcode = container.exec args, &DebugMixin::DOCKER
+        exit_now! "Command failed : #{args.join(' ')}", exitcode unless exitcode == 0
+      end
+      
       begin
         DebugMixin.debug_write "Testing #{project_name} in container #{container.id}\n"
+
         spawn("docker logs -f #{container.id}", [ :out, :err ] => $stderr).tap do |pid|
           Process.detach pid
         end
         container.start
+
+        DebugMixin.debug_write "Stopping conjur\n"
+
+        container.exec [ "sv", "stop", "conjur" ], &DebugMixin::DOCKER
         
-        DebugMixin.debug_write "Waiting for Conjur\n"
-        wait_for_conjur appliance_image, container
+        DebugMixin.debug_write "Purging source install of #{project_name}\n"
+        
+        command container, "rm", "-rf", "/opt/conjur/#{project_name}"
+        command container, "rm", "-f", "/opt/conjur/etc/#{project_name}.conf"
+        command container, "dpkg", "-P", "conjur-#{project_name}"
         
         DebugMixin.debug_write "Installing #{project_name}\n"
         
-        stdout, stderr, exitcode = container.exec [ "dpkg", "-i", "/src/#{project_name}/conjur-#{project_name}_latest_amd64.deb" ], &DebugMixin::DOCKER
-        exit_now! "deb install failed", exitcode unless exitcode == 0
-        stdout, stderr, exitcode = container.exec [ "/opt/conjur/evoke/bin/test-install", project_name ], &DebugMixin::DOCKER
-        exit_now! "test-install failed", exitcode unless exitcode == 0
-  
+        command container, "dpkg", "-i", "/src/#{project_name}/conjur-#{project_name}_latest_amd64.deb"
+        command container, "/opt/conjur/evoke/bin/test-install", project_name
+
+        DebugMixin.debug_write "Starting conjur\n"
+
+        command container, "sv", "start", "conjur"
         wait_for_conjur appliance_image, container
   
         if configure_script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli