minke 0.14.0 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGVkNzVjMzRlODMyYjM5OGRmODZhZTI0NTlmYjVlZGEzYzBjNjk1ZQ==
+    OWY2ZDAwNmYxNDYxYWI0ZDlhMzE5NTEzN2JkMWI3NDljMDQ0YjM2NQ==
   data.tar.gz: !binary |-
-    NWM5YWE2NTYyYzk2ODg4MjkxOTNiMjE0MzZkOTZmOTc5MzM5YjMzYg==
+    NDEzMTg4M2IyMGQxM2VjNDk1ZGU1MmE1ZGNlYmRkNjgyZTQ0MmNlMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTE4YmUwYzE2MjZiYzllNWMzNjJhZTQ5MjZkYmQzMjEwN2U2YWVkNWVkNjdi
-    NTZjMTRhODkyMjFiYmFiZTkyYmJmOWQ0NzUyZjg5ZTY1NDQ2NTc5MjFmMjE3
-    ZDcyNGY1N2MxNzRiMGMxYmViODM2OTE1NjU5NjcwMmNmYTY5OGM=
+    ZjNmNTZiOTM3ZmQzZGVlZGY2MDEyMDFkYTgxYzUzYmRkYTIwMWRlMGUzM2Y2
+    YjQ1YjJjZTZiZmZmYWI1YzA5M2JmYjliMzRmNTFiZTdjYTIxMjE3OWZiN2Mx
+    MmFhMmY0ZDc0Y2MwYTM4MTE2YmJiMTAzN2NmMGY2YzI1ZGNlNmI=
   data.tar.gz: !binary |-
-    YjI3MmEzOTExZjdmNzg3MGY3MjlkZTVjZGQzYmIxMGVmNTQ1MTVlNDIyZDkx
-    ZGM2MmMyNDIwZDBhMTUzZWVkZDU5NWU2OTVlNGNmMzZlMDRiYTAxZWRlNDJm
-    ZDg0M2RkZjVmYjczZTRjODRmODFhNDdmOTYwODhiMzBmOTY4MDU=
+    OTRhYTBhOGI2ZDQwOWUyOGU2Y2EwYTU5NjcwMWMzNzJkYWVmOTc3MzY4ZDIx
+    ODQ4NDAyMGFhMmY0NjhhNzFmYzBjN2JlMjQyZDIxMWU5MDgzOTMxZTFkYjcz
+    ZDlkMGJmMWRkMTBiYjI0NmYxYWY2MzJiNzQyMmVmM2U1ZGYwNTQ=

data/README.md

@@ -8,6 +8,14 @@ Version 0.13.0 of the gem introduces breaking changes to the configuration files
 
 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, and experimental support for Swift, extensions are planned for Node.js or HTML / Javascript sites with Grunt or Gulp based builds.
 
+## Supported languages
+- Go
+- Swift
+
+## Languages coming soon
+- Node
+- Java
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,6 +40,12 @@ You need to have docker, docker-machine, and docker-compose installed on your bu
 eval "$(docker-machine env default)"
 ```
 
+## Not for Docker for Mac Beta users
+If you use docker for mac please set the environment variable, this will auto resolve once Docker for mac exits beta.
+```
+DOCKER_IP=[your docker vm ip]
+```
+
 ## Usage
 Include the rake tasks in your Rakefile
 ```ruby
@@ -80,6 +94,9 @@ docker_registry:
 docker:
   docker_file: './dockerfiles/event-sauce/Dockerfile'
   compose_file: './dockercompose/event-sauce/docker-compose.yml'
+  build:
+    image: [optional]
+    docker_file: [optional]
 after_build:
   copy_assets:
     -
@@ -131,7 +148,10 @@ An array of elements with the following parameters:
 #### docker:
 This section contains configuration for the Docker build and run process.  
 **docker_file:** path to the folder containing your Dockerfile used by the build_server task.  
-**compose_file:** path to your docker-compose file for run and cucumber tasks.  
+**compose_file:** path to your docker-compose file for run and cucumber tasks.
+**build:** This section allows you to override the language default used for building your application code.
+- **image [optional]:** specify a different image from your registry or local machine to use for building the application.
+- **docker_file [optional]:** specify a dockerfile which will be built into an image and then used for building the application.
 
 #### run:
 The run section defines config for running your microservice with Docker Compose.

data/lib/minke/commands/go.rb

@@ -4,9 +4,9 @@ module Minke
       def commands config
         {
           :build => {
-            :get => ['go','get','-t','-v','-d','./...'],
-            :build => ['go','build','-a','-installsuffix','cgo','-ldflags','\'-s\'','-o', "#{config['application_name']}"],
-            :test => ['go','test','./...']
+            :get => [['go','get','-t','-v','-d','./...']],
+            :build => [['go','build','-a','-installsuffix','cgo','-ldflags','\'-s\'','-o', "#{config['application_name']}"]],
+            :test => [['go','test','./...']]
           },
           :docker => {
             :image => 'golang:latest',

data/lib/minke/commands/swift.rb

@@ -4,8 +4,16 @@ module Minke
       def commands config
         {
           :build => {
-            :build => ['swift', 'build', '-Xcc', '-fblocks'],
-            :test => ['ls', '-ls'],
+            :get => [
+              ['swift', 'build', '--fetch'],
+              # ['bash','-c', "find /src/Packages/ -type d -name Tests -exec echo {} && rm -rf {} \\;"]
+              ['bash','-c', "find /src/Packages/ -type d -name Tests | xargs rm -rf"]
+            ],
+            :build => [
+              ['rm', '-rf', '.build'],
+              ['swift', 'build', '-Xcc', '-fblocks']
+            ],
+            :test => [['swift', 'test']],
           },
           :docker => {
             :image => 'ibmcom/kitura-ubuntu:latest',

data/lib/minke/docker.rb

@@ -1,15 +1,17 @@
 module Minke
   class Docker
     def self.get_docker_ip_address
-    	if !ENV['DOCKER_HOST']
-    		return "127.0.0.1"
-    	else
+    	if ENV['DOCKER_HOST']
     		# dockerhost set
     		host = ENV['DOCKER_HOST'].dup
     		host.gsub!(/tcp:\/\//, '')
     		host.gsub!(/:\d+/,'')
 
     		return host
+      elsif ENV['DOCKER_IP']
+        return ENV['DOCKER_IP']
+      else
+        throw "Please set the environment variable DOCKER_HOST or DOCKER_IP with the ip address of your docker instance."
     	end
     end
 

data/lib/minke/docker_compose.rb

@@ -20,7 +20,7 @@ module Minke
     end
 
     def logs
-      execute "docker-compose -f #{@compose_file} logs"
+      execute "docker-compose -f #{@compose_file} logs -f"
     end
 
     private

data/lib/minke/helpers.rb

@@ -7,7 +7,7 @@ module Minke
 
     @config = nil
 
-    def self.wait_until_server_running server, count
+    def self.wait_until_server_running server, count, successes = 0
       begin
         response = RestClient.send("get", server)
       rescue
@@ -22,6 +22,14 @@ module Minke
         else
           raise 'Server failed to start'
         end
+      else
+        if successes > 0
+          puts "Server: #{server} passed health check, #{successes} checks to go..."
+          sleep 1
+          self.wait_until_server_running server, count + 1, successes - 1
+        else
+          puts "Server: #{server} healthy"
+        end
       end
     end
 

data/lib/minke/rake/app.rake

@@ -1,47 +1,88 @@
 namespace :app do
-  desc "run unit tests"
-  task :test => ['config:set_docker_env', 'config:load_config', 'docker:fetch_images'] do
+
+  desc "get dependent packages"
+  task :get => ['config:set_docker_env', 'config:load_config', 'docker:fetch_images'] do
     config = Minke::Helpers.config
 
     if config[:build_config][:build][:get] != nil
+      puts "## Get dependent packages"
+      config[:build_config][:build][:get].each do |command|
+      	begin
+          container, ret = Minke::Docker.create_and_run_container config, command
+        ensure
+      		Minke::Docker.delete_container container
+      	end
+      end
+      puts ""
+    end
+  end
+
+  desc "build application"
+  task :build => [:get] do
+  	puts "## Build for Linux"
+    config = Minke::Helpers.config
+
+    # do we need to build a custom build container
+    if config['docker']['build'] && config['docker']['build']['docker_file'] != nil
+      puts "## Building custom docker image"
+
+      docker_file = config['docker']['build']['docker_file']
+      image_name = config['application_name'] + "-buildimage"
+
+      Docker.options = {:read_timeout => 6200}
+    	image = Docker::Image.build_from_dir docker_file, {:t => image_name}
+      config[:build_config][:docker][:image] = image_name
+    end
+
+    if config['docker']['build'] && config['docker']['build']['image'] != nil
+      config[:build_config][:docker][:image] = config['docker']['build']['image']
+    end
+
+    if config['build'] != nil && config['build']['before'] != nil
+      config['build']['before'].each do |task|
+        puts "## Running before build task: #{task}"
+        Rake::Task[task].invoke
+
+        puts ""
+      end
+    end
+
+    config[:build_config][:build][:build].each do |command|
     	begin
-    		# Get go packages
-        puts "## Get dependent packages"
-        container, ret = Minke::Docker.create_and_run_container config, config[:build_config][:build][:get]
+    		# Build application
+        container, ret = Minke::Docker.create_and_run_container config, command
+        raise Exception, 'Error running command' unless ret == 0
       ensure
     		Minke::Docker.delete_container container
     	end
-
-      puts ""
     end
 
-    begin
-  		# Test application
-      puts "## Test application"
-      container, ret = Minke::Docker.create_and_run_container config, config[:build_config][:build][:test]
-
-  		raise Exception, 'Error running command' unless ret == 0
-    ensure
-  		Minke::Docker.delete_container container
-  	end
-
     puts ""
   end
 
-  desc "build and test application"
-  task :build => [:test] do
-  	puts "## Build for Linux"
-
+  desc "run unit tests"
+  task :test => [:build] do
     config = Minke::Helpers.config
 
-  	begin
-  		# Build go server
-      container, ret = Minke::Docker.create_and_run_container config, config[:build_config][:build][:build]
+    if config['test'] != nil && config['test']['before'] != nil
+      config['test']['before'].each do |task|
+        puts "## Running before test task: #{task}"
+        Rake::Task[task].invoke
 
-  		raise Exception, 'Error running command' unless ret == 0
-    ensure
-  		Minke::Docker.delete_container container
-  	end
+        puts ""
+      end
+    end
+
+    puts "## Test application"
+    config[:build_config][:build][:test].each do |command|
+      begin
+  		  # Test application
+        container, ret = Minke::Docker.create_and_run_container config, command
+      	raise Exception, 'Error running command' unless ret == 0
+      ensure
+    		Minke::Docker.delete_container container
+    	end
+    end
 
     puts ""
   end
@@ -59,7 +100,7 @@ namespace :app do
   end
 
   desc "build Docker image for application"
-  task :build_server => [:build, :copy_assets] do
+  task :build_server => [:test, :copy_assets] do
     config = Minke::Helpers.config
 
   	puts "## Building Docker image"
@@ -146,8 +187,13 @@ namespace :app do
       if config['cucumber']['after_start'] != nil
         config['cucumber']['after_start'].each do |task|
           puts "## Running after_start task: #{task}"
-          Rake::Task[task].invoke
 
+          begin
+            Rake::Task[task].invoke
+          rescue Exception => msg
+            puts "Error running rake task: #{msg}"
+            raise msg
+          end
           puts ""
         end
       end
@@ -159,7 +205,7 @@ namespace :app do
       end
 
       if config['cucumber']['health_check']['enabled']
-        Minke::Helpers.wait_until_server_running config['cucumber']['health_check']['url'], 0
+        Minke::Helpers.wait_until_server_running config['cucumber']['health_check']['url'], 0, 3
       end
 
   		sh "cucumber --color -f pretty #{feature}"

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/lib/minke.rb

@@ -3,7 +3,8 @@ require 'yaml'
 require 'rest-client'
 require 'consul_loader'
 require 'rake'
-require "erb"
+require 'erb'
+require 'resolv'
 
 require 'minke/version'
 require 'minke/docker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler