minke 1.13.9 → 1.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e8e41df805b4ae39e2b77c7ee0a3556bbc25be
-  data.tar.gz: 1ea8151c518be563da7fabd04bfb9d8ae23dfede
+  metadata.gz: 9d6c70ac5b53ba36744cc09453df044b63bc020a
+  data.tar.gz: bfb537c17a7a55425ee172aaf36878b29ef9d405
 SHA512:
-  metadata.gz: f3722a5affda81a67ba07a8bc08b791e8ee57dbf404bd0e3f5407283a4a61d9a61c83fb7b7b2e15f6eb46cc54fa3d546ada6fff1cfe85152ce2b4dca3ed31e08
-  data.tar.gz: 404a404c30fa0aa2cbab7ae66acb122748dba8f84c6eaea2fc8baeb988db0c66e2c6d26831bb1313d30c8afad8da428edf2a64ca35e11db03d21ff0c2e198912
+  metadata.gz: 46800a54dfffb96517d1d88c4863fa061854ee4d951582305bb808bce14469a638bc42174a860877d0c9144adf851558b1ed6933850ef47cf885abe80a550d70
+  data.tar.gz: 3253eb9db99d248c24dca0709f19e093de150427f214a0c8b8cba101b7e502d8fa950bf5a81a4200718c0b6c1de5e242de6df34d58f1fd29a0c1f9d1d12fc08f

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.9;
-    docker push nicholasjackson/minke:1.13.9;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.10;
+    docker push nicholasjackson/minke:1.13.10;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/docker/Gemfile

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

data/lib/minke/command.rb

@@ -27,7 +27,8 @@ module Minke
       task_runner = Minke::Tasks::TaskRunner.new ({
         :rake_helper       => Minke::Helpers::Rake.new,
         :copy_helper       => Minke::Helpers::Copy.new,
-        :service_discovery => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new(logger), network_name)
+        :service_discovery => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new(logger), network_name),
+        :logger_helper     => logger
       })
 
       consul = Minke::Docker::Consul.new(
@@ -70,9 +71,10 @@ module Minke
         :fetch       => Minke::Tasks::Fetch.new(dependencies),
         :build       => Minke::Tasks::Build.new(dependencies),
         :test        => Minke::Tasks::Test.new(dependencies),
+        :run         => Minke::Tasks::Run.new(dependencies),
         :build_image => Minke::Tasks::BuildImage.new(dependencies),
-        :cucumber => Minke::Tasks::Cucumber.new(dependencies),
-        :push => Minke::Tasks::Push.new(dependencies)
+        :cucumber    => Minke::Tasks::Cucumber.new(dependencies),
+        :push        => Minke::Tasks::Push.new(dependencies)
       }
     end
 
@@ -100,6 +102,13 @@ module Minke
       end
     end
 
+    def run
+      if config.run != nil
+        tasks = create_tasks :run
+        tasks[:run].run
+      end
+    end
+    
     def build_image
       if config.test != nil
         test
@@ -121,4 +130,4 @@ module Minke
     end
 
   end
-end
+end

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.9"
+MINKE_VERSION="1.13.10"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -21,7 +21,7 @@ if [[ $1 != \generate* ]]; then
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run --rm --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
 

data/lib/minke/tasks/task_runner.rb

@@ -6,6 +6,7 @@ module Minke
         @rake_helper       = args[:rake_helper]
         @copy_helper       = args[:copy_helper]
         @service_discovery = args[:service_discovery]
+        @logger            = args[:logger_helper]
       end
 
       ##
@@ -25,9 +26,12 @@ module Minke
       ##
       # copys the assets defined in the step
       def copy_assets assets
-        assets.each { |a| @copy_helper.copy_assets a.from, a.to }
+        assets.each do |a| 
+          @logger.debug "Copy #{a.from} To #{a.to}"
+          @copy_helper.copy_assets a.from, a.to
+        end
       end
 
     end
   end
-end
+end

data/lib/minke/version.rb

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

metadata

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