minke 1.5.9 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM4YjVmNTJmNWFhOWQ0MmM1Njc2NzNiYjE5ZDc3NTMyYjdlMWU5OA==
+    MDVmMTZmNmE1ODBkMzQ4ZmFkMThlZjYzZmNkOGVmN2IwZTQwZjM5NA==
   data.tar.gz: !binary |-
-    NjBhYTA3ZWQzN2Q3MWZhZjM4ZmE3Yjk3MGY5MzYyN2I3NDk4Zjk0NA==
+    OGYyOTU4MDNkMjUyMGQxZDA0ZmQ1OGM2NTk3NmYwNzEyYTkxZWUxMw==
 SHA512:
   metadata.gz: !binary |-
-    ZGEwODA3ZjExZWU0Nzg1ZDljMmJjNGZiMTJiMTRlYjAxYjA2ODYxMTBiYjZh
-    MTcwZTdhYmIwODc4ZjRlODRjNDI3NDUxYjNlZWM0MWFiMmU5YWI1ZmJhMzM4
-    MDdiMTlmYzI0M2U4NjM1YmRhZmE2ZWViN2FlMzE4OWNjNjRhMzc=
+    NDNiODFjYjQ0ZDczYTA1MTEwNTQ2YjM1ZGEwZjNjZmI2NWU2NTk2MjU0N2Rk
+    MWYyNWUxYzJjODE5MWQyYTkxMDIxNjQ3MTc4NGI1ODlmMmQ5NTFkMWNjZGZm
+    NTU1Mjc4ODU0MTI2MjQwZmJmYjM0OTgyYmMxMzNhODcxOGJjOGE=
   data.tar.gz: !binary |-
-    NzUxNzE5MDhjODZhNGZlNWZkOTU5NzhmZTk3YzhjNmI1OGU1MDk3OGVmMDM3
-    NDQ2YjA2MzQ0ZGVkNTBiOGE3OGFmM2FiMjExNDc3MWVlYmI5NWI5NDFkYTA0
-    OWU3ZTM5Y2Y1ZWFkYmYyMmVhOTkyMWRmYjhlNDkwMmE5MTQwNjk=
+    YzkwODViOGYyYzU5MDVjMTNlN2M3Mjc0ODg0YTliOTllZmYwMTkwNDE2YmNh
+    ZmU2YTEwMDIxMDZjYjYzNDBlNTdjZDcyNzBhODNjM2ZlZmJhNTlhYWFmNDAw
+    NmY3OTViZGQwZDU1MTQ2NWY0ODI4MmZmYjk4YWJmOTM0MmIzMTM=

data/lib/minke/docker/docker_compose.rb

@@ -21,14 +21,29 @@ module Minke
       ##
       # start the containers in a stack defined by the docker compose file
       def up
-        @system_runner.execute "docker-compose -f #{@compose_file} up -d"
+        unless ENV['DOCKER_NETWORK'].to_s.empty?
+          directory = create_compose_network_file
+
+          @system_runner.execute "docker-compose -f #{@compose_file} -f #{directory + '/docker-compose.yml'} up -d"
+          @system_runner.remove_entry_secure directory
+        else
+          @system_runner.execute "docker-compose -f #{@compose_file} up -d"
+        end
+
         sleep 2
       end
 
       ##
-      # stop the containers in a stack defined by the docker compose file
-      def stop
-        @system_runner.execute "docker-compose -f #{@compose_file} stop"
+      # stop the containers in a stack and removes them as defined by the docker compose file
+      def down
+        unless ENV['DOCKER_NETWORK'].to_s.empty?
+          directory = create_compose_network_file
+
+          @system_runner.execute "docker-compose -f #{@compose_file} -f #{directory + '/docker-compose.yml'} down"
+          @system_runner.remove_entry_secure directory
+        else
+          @system_runner.execute "docker-compose -f #{@compose_file} down -d"
+        end
       end
 
       ##
@@ -48,6 +63,17 @@ module Minke
       def public_address container, private_port
         @system_runner.execute_and_return "docker-compose -f #{@compose_file} port #{container} #{private_port}"
       end
+
+      def create_compose_network_file
+        content = { 'version' => '2'.to_s, 'networks' => {'default' => { 'external' => { 'name' => ENV['DOCKER_NETWORK'] } } } }
+
+        directory = @system_runner.mktmpdir
+
+        temp_file = directory + '/docker-compose.yml'
+        @system_runner.write_file temp_file, YAML.dump(content)
+
+        directory
+      end
     end
   end
 end

data/lib/minke/docker/system_runner.rb

@@ -11,6 +11,18 @@ module Minke
         return log.strip
       end
 
+      def mktmpdir
+        Dir.mktmpdir
+      end
+
+      def remove_entry_secure dir
+        FileUtils.remove_entry_secure dir
+      end
+
+      def write_file filename, data
+        File.open(filename, 'w') { |file| file.write(data) }
+      end
+
     end
   end
 end

data/lib/minke/tasks/cucumber.rb

@@ -14,8 +14,7 @@ module Minke
           end
 
       	ensure
-      		@compose.stop
-      		@compose.rm
+      		@compose.down
 
           @helper.fatal_error "Cucumber steps failed" unless status == 0
       	end

data/lib/minke/tasks/run.rb

@@ -13,8 +13,7 @@ module Minke
           end
 
       	ensure
-      		@compose.stop
-      		@compose.rm
+      		@compose.down
       	end
       end
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.5.9"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler