minke 1.13.10 → 1.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6c70ac5b53ba36744cc09453df044b63bc020a
-  data.tar.gz: bfb537c17a7a55425ee172aaf36878b29ef9d405
+  metadata.gz: d74eb0c6b2a2675a6f5ff698852e20170dedf585
+  data.tar.gz: 9045a87f9ab54978fa6073bb8ca15b4c19c42ed1
 SHA512:
-  metadata.gz: 46800a54dfffb96517d1d88c4863fa061854ee4d951582305bb808bce14469a638bc42174a860877d0c9144adf851558b1ed6933850ef47cf885abe80a550d70
-  data.tar.gz: 3253eb9db99d248c24dca0709f19e093de150427f214a0c8b8cba101b7e502d8fa950bf5a81a4200718c0b6c1de5e242de6df34d58f1fd29a0c1f9d1d12fc08f
+  metadata.gz: fcf8d0fcf334fbdf375bb13aaaa7b28ffd934117546c1a4487ff07b24e6e403b2987cfd4a8f3706661c99a48969bda44178ce3a317bd8c61644ad1b7862720c9
+  data.tar.gz: 1394a7ae594929a9bd294014cf6bbd72f0fc6c5c690108c4ff2b1bef220285f960bbafcd886ad5f2d27cdf9a9fabb628553daa97aa25cf0922e84b2a0d4c5739

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     docker build -t nicholasjackson/minke --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` .;
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     docker push nicholasjackson/minke:latest;
-    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.10;
-    docker push nicholasjackson/minke:1.13.10;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.11;
+    docker push nicholasjackson/minke:1.13.11;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/docker/Gemfile

@@ -8,7 +8,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.13.10"
+gem 'minke', "= 1.13.11"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.5"

data/lib/minke/command.rb

@@ -25,7 +25,7 @@ module Minke
       end
 
       task_runner = Minke::Tasks::TaskRunner.new ({
-        :rake_helper       => Minke::Helpers::Rake.new,
+        :ruby_helper       => Minke::Helpers::Ruby.new,
         :copy_helper       => Minke::Helpers::Copy.new,
         :service_discovery => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new(logger), network_name),
         :logger_helper     => logger

data/lib/minke/docker/service_discovery.rb

@@ -18,12 +18,23 @@ module Minke
       # Returns:
       # public address for the container e.g. 0.0.0.0:8080
       def public_address_for service_name, private_port
-        begin
-          ip = @docker_runner.get_docker_ip_address
-          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
-          #puts container_details
-          ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port.to_i }.first
-        rescue Exception => e
+        ip = ""
+        ports = nil
+
+        10.times do
+          begin
+            ip = @docker_runner.get_docker_ip_address
+            container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+            #puts container_details
+            ports = container_details.first.info['Ports'].select { |p| 
+              p['PrivatePort'] == private_port.to_i
+            }.first
+          rescue Exception
+            sleep(1)
+          end
+        end
+        
+        if ports == nil || ports['PublicPort'] == nil 
           raise "Unable to find public address for '#{service_name}' on port #{private_port}"
         end
 
@@ -39,12 +50,24 @@ module Minke
       # Returns:
       # private address for the container e.g. 172.17.0.2:8080
       def bridge_address_for service_name, private_port
-        begin
-          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
-          ip = container_details.first.info['NetworkSettings']['Networks']["#{@docker_network}"]['IPAddress']
-        rescue
+        ip = ""
+
+        10.times do
+          begin
+            container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+            ip = container_details
+              .first
+              .info['NetworkSettings']['Networks']["#{@docker_network}"]['IPAddress']
+            break
+          rescue
+            sleep(1)
+          end
+        end
+         
+        if ip.length < 1  
           raise "Unable to find bridge address for network: #{@docker_network}, container: #{service_name}, port: #{private_port}"
         end
+          
         return "#{ip}:#{private_port}"
       end
 

data/lib/minke/helpers/ruby.rb

@@ -0,0 +1,21 @@
+module Minke
+  module Helpers
+    class Ruby
+     
+      def initialize
+        load_ruby_files
+      end
+
+      def load_ruby_files
+        $LOAD_PATH.unshift Dir.pwd
+        Dir[File.join(Dir.pwd, "*.rb")].each {|file| require File.basename(file) }
+      end
+
+      ##
+      # invoke a rake task
+      def invoke_task(task, logger)
+        Minke::Extension.new(logger).send(task)
+      end
+    end
+  end
+end

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.10"
+MINKE_VERSION="1.13.11"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -16,8 +16,10 @@ GEM_VOLUMES=""
 if [[ $1 != \generate* ]]; then
   # Test if we need to mount any special volumes for paths specified in the Gemfile
   while read -r line; do
-    l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
-    GEM_VOLUMES="${GEM_VOLUMES} -v $l:$l"
+    if [[ $line != \#* ]]; then
+      l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
+      GEM_VOLUMES="${GEM_VOLUMES} -v $l:$l"
+    fi
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)

data/lib/minke/tasks/cucumber.rb

@@ -9,18 +9,20 @@ module Minke
         compose_file = File.expand_path(compose_file)
         compose = @docker_compose_factory.create compose_file unless compose_file == nil
 
-        run_with_block do
+        run_with_block do |pre_func, post_func|
           status = false
           begin
             compose.up
+            pre_func.call
+
             server_address = @service_discovery.build_address(@task_settings.health_check) 
             @health_check.wait_for_HTTPOK(server_address) unless @task_settings.health_check == nil
-            
             @shell_helper.execute "cucumber --color -f pretty #{get_features args}"
           rescue Exception => e
             raise ("Cucumber steps failed: #{e.message}") unless status == true
           ensure
             compose.down
+            post_func.call
           end
       	end
       end

data/lib/minke/tasks/run.rb

@@ -9,15 +9,17 @@ module Minke
         compose_file = File.expand_path(compose_file)
         compose = @docker_compose_factory.create compose_file unless compose_file == nil
 
-        run_with_block do
+        run_with_block do |pre_func, post_func|
           begin
             compose.up
+            pre_func.call
             compose.logs
           rescue SystemExit, Interrupt
             @logger.info "Stopping...."
             raise SystemExit
           ensure
             compose.down
+            post_func.call
           end
         end
       end

data/lib/minke/tasks/task.rb

@@ -29,11 +29,21 @@ module Minke
         begin
           @docker_network.create
           @consul.start_and_load_data @task_settings.consul_loader unless @task_settings.consul_loader == nil
-          @task_runner.run_steps(@task_settings.pre) unless @task_settings == nil || @task_settings.pre == nil
-
-          yield if block_given?
+          
+          pre_func = -> {
+            @task_runner.run_steps(@task_settings.pre) unless @task_settings == nil || @task_settings.pre == nil
+          }
 
-          @task_runner.run_steps(@task_settings.post) unless @task_settings == nil || @task_settings.post == nil
+          post_func = -> {
+            @task_runner.run_steps(@task_settings.post) unless @task_settings == nil || @task_settings.post == nil
+          } 
+          
+          if block_given?
+            yield(pre_func, post_func)
+          else
+            pre_func.call
+            post_func.call
+          end
         rescue Exception => e
           @logger.error e.message
           success = false

data/lib/minke/tasks/task_runner.rb

@@ -3,7 +3,7 @@ module Minke
     class TaskRunner
 
       def initialize args
-        @rake_helper       = args[:rake_helper]
+        @ruby_helper       = args[:ruby_helper]
         @copy_helper       = args[:copy_helper]
         @service_discovery = args[:service_discovery]
         @logger            = args[:logger_helper]
@@ -12,15 +12,18 @@ module Minke
       ##
       # execute the defined steps in the given Minke::Config::TaskRunSettings
       def run_steps steps
-        execute_rake_tasks steps.tasks unless steps.tasks == nil
+        execute_ruby_tasks steps.tasks unless steps.tasks == nil
         copy_assets steps.copy unless steps.copy == nil
       end
 
       private
       ##
       # execute an array of rake tasks
-      def execute_rake_tasks tasks
-        tasks.each { |t| @rake_helper.invoke_task t }
+      def execute_ruby_tasks tasks
+        tasks.each { |t| 
+          @logger.debug "Executing task: #{t}"
+          @ruby_helper.invoke_task(t, @logger)
+        }
       end
 
       ##

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.10"
+  VERSION = "1.13.11"
 end

data/lib/minke.rb

@@ -22,7 +22,7 @@ require 'minke/command'
 require 'minke/logger'
 
 require 'minke/helpers/copy'
-require 'minke/helpers/rake'
+require 'minke/helpers/ruby'
 require 'minke/helpers/shell'
 
 require 'minke/docker/docker_compose'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.10
+  version: 1.13.11
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,7 +254,7 @@ files:
 - lib/minke/generators/register.rb
 - lib/minke/generators/shell_script.rb
 - lib/minke/helpers/copy.rb
-- lib/minke/helpers/rake.rb
+- lib/minke/helpers/ruby.rb
 - lib/minke/helpers/shell.rb
 - lib/minke/logger.rb
 - lib/minke/scripts/minke

data/lib/minke/helpers/rake.rb

@@ -1,11 +0,0 @@
-module Minke
-  module Helpers
-    class Rake
-      ##
-      # invoke a rake task
-      def invoke_task task
-        Rake::Task[task].invoke
-      end
-    end
-  end
-end