minke 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzY3ZDEwYjE1YjU5NjA0YmU3ZmIzNDAzMzNmYTQxMGYzZTU4M2M1ZA==
+    N2NlNTg2Mjc1ZWZjNjA2NzNhM2ZhZDEyN2E4MmZiMDQxOTNkZjI4OQ==
   data.tar.gz: !binary |-
-    NGNmZjY2ZmM4MDM1ZGU0ZDUwZTJmMzE5OGM3ZjdjZTA1MjE0ZDdiOA==
+    OWQzYzc5NGQ5MzNkOTljZWM2NWY3MGYyNWQ1ZTZkM2ViY2M4ZjQ2YQ==
 SHA512:
   metadata.gz: !binary |-
-    OGY2NDA2Mzg1NjhhMDZjYmUxYmNhNWUwMjVkNjg5OWIyZGE3ODFlMTI3MzE5
-    OTQ1YTMzNjkxN2I2NjFmODZkMjczZTY2YmM3NjQwYzZiNzVlZDYzYzA1YmU2
-    OGRkYWQyMDVhMmYyMmQ4YzFlODZhODdkYWViYTAxMzQzZGU3ZDU=
+    ZDUzODA5MjUyODQ3OGI5OTA3NzJlMzk0ZmFkYjEzZDk0MzEwZGNlMDk4Yjhh
+    ZGQ2OTlhNWNiY2FjODM5MDNjOGJkZjdmMDdmNzNjZDI4OGQ3OTE1NmZmZTUz
+    M2E2MzQ4MjZkNDQxZDNmOWJlZjY0MzZjZTM1YTNjMDFhYmMzODE=
   data.tar.gz: !binary |-
-    NDEwOWUwZTJkMzYwYzIyOWE0Mzc5MjQzODQ4NDQ5ZDRhZGMwYjJiZDEzOWNi
-    MGQzYzM4NjY0NTdhZWVhNWM1ZDYxNjA3YzZlMTY3OTQ5NGNmZmEyYjA0ZTky
-    N2QyMzFkOWFhOTJkZWNjY2M3ZmUzMzBlMDBhOGUyZDRkMjcwMmQ=
+    NmZkMDczNmJlNGNhNTQ1MzI3MTg1ZjFmM2FhYTlmZmI1NGFjMjAwN2ZmMmIx
+    NmZlMTdmM2JkMmU1ZGZkNjM3NDk0MzM0NzcyN2IwMjBhNjMwMzM3YTM3N2Qy
+    ZWIwMjM1ZDc1NmUwNjE4OThmZjdhNjBkZGVkNWVmZjZlNzAzMTk=

data/README.md

@@ -1,5 +1,5 @@
 # Minke
-[![Build Status](https://travis-ci.org/nicholasjackson/go_builder.svg?branch=master)](https://travis-ci.org/nicholasjackson/go_builder)
+[![Build Status](https://travis-ci.org/nicholasjackson/minke.svg?branch=master)](https://travis-ci.org/nicholasjackson/minke)
 
 Minke is an opinionated build system for Microservices and Docker, like a little envelope of quality it scaffolds the build, run and test (unit test and functional tests) phases of your microservice project allowing you to simply run and test your images using Docker Compose.  Currently supporting Google's Go, extensions are planned for Node.js or HTML / Javascript sites with Grunt or Gulp based builds. 
 

data/lib/minke/go_docker.rb

@@ -66,6 +66,36 @@ module Minke
     	return container
     end
 
+    def self.create_and_run_container args, cmd
+    	# update the timeout for the Excon Http Client
+    	# set the chunk size to enable streaming of log files
+      Docker.options = {:chunk_size => 1, :read_timeout => 3600}
+      container = Docker::Container.create(
+    		'Image' => args['build_args']['image'],
+    		'Cmd' => cmd,
+    		"Binds" => ["#{ENV['GOPATH']}/src:/go/src"],
+    		"Env" => args['build_args']['env'],
+    		'WorkingDir' => args['build_args']['working_directory'])
+
+      return_code = 0
+
+      thread = Thread.new {
+        container.attach { |stream, chunk|
+          puts "#{chunk}"
+
+          if stream.to_s == "stdout"
+            return_code = 0
+          else
+            return_code = 1
+          end
+        }
+      }
+      container.start
+      thread.join
+
+    	return container, return_code
+    end
+
     def self.tag_and_push args
       image =  self.find_image "#{args['go']['application_name']}:latest"
     	image.tag('repo' => "#{args['docker_registry']['namespace']}/#{args['go']['application_name']}", 'force' => true) unless image.info["RepoTags"].include? "#{args['docker_registry']['namespace']}/#{args['go']['application_name']}:latest"

data/lib/minke/rake/app.rake

@@ -4,21 +4,23 @@ namespace :app do
   	p "Test application"
 
     config = Minke::Helpers.config
-    container = Minke::GoDocker.get_container config['docker']
 
   	begin
   		# Get go packages
-  		ret = container.exec(['go','get','-t','-v','./...']) { |stream, chunk| puts "#{stream}: #{chunk}" }
-  		raise Exception, 'Error running command' unless ret[2] == 0
+      puts "Go get"
+      container, ret = Minke::GoDocker.create_and_run_container config['docker'], ['go','get','-t','-v','./...']
+    ensure
+  		container.delete()
+  	end
 
+    begin
   		# Test application
-  		ret = container.exec(['go','test','./...']) do |stream, chunk|
-        puts "#{stream}: #{chunk}"
-      end
+      puts "Go test"
+      container, ret = Minke::GoDocker.create_and_run_container config['docker'], ['go','test','./...']
 
-  		raise Exception, 'Error running command' unless ret[2] == 0
-  	ensure
-  		container.delete(:force => true)
+  		raise Exception, 'Error running command' unless ret == 0
+    ensure
+  		container.delete()
   	end
   end
 
@@ -27,19 +29,14 @@ namespace :app do
   	p "Build for Linux"
 
     config = Minke::Helpers.config
-  	container = Minke::GoDocker.get_container config['docker']
 
   	begin
   		# Build go server
-  		ret = container.exec(
-        ['go','build','-a','-installsuffix','cgo','-ldflags','\'-s\'','-o', config['go']['application_name']]
-      ) do |stream, chunk|
-        puts "#{stream}: #{chunk}"
-      end
+      container, ret = Minke::GoDocker.create_and_run_container config['docker'], ['go','build','-a','-installsuffix','cgo','-ldflags','\'-s\'','-o', config['go']['application_name']]
 
-  		raise Exception, 'Error running command' unless ret[2] == 0
-  	ensure
-  		container.delete(:force => true)
+  		raise Exception, 'Error running command' unless ret == 0
+    ensure
+  		container.delete()
   	end
   end
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler