minke 1.13.16 → 1.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa0e68808d27776c9de9795277ad0dad8f178e3
-  data.tar.gz: cb2a53605cd6deb9a35a8e0b9c42d9a277803105
+  metadata.gz: 37f21bb55040f8575e3f678af26ec5f622bd6158
+  data.tar.gz: a467dc8c47cb96fb4a8c90c332e1e271845648d8
 SHA512:
-  metadata.gz: c18c441499f82ec11f8b40eb36cc9f64a1fe4d9d90f1e85805eefb1b9424ecc1b6511a780853f952e03cfaf1ecd4ff5b57d777384d33eeb574a79926c7cdf61a
-  data.tar.gz: 126c9ab80a44e8bdd379cadeac8600a94599a4ad44e77ac8def8ef6f4ceb31700e2a55364b2ec06226c25810c93c06b0456bd6496bfe5d58e41b96a261046c5d
+  metadata.gz: 6567b76c4342cb898cf5b7111af987c86419be86f6ca1240d6f96fb2041a8a46a5c8b8f23716f12cfe2ec2fb6598666bab7ff43af3047abe9b61997ff77fe8c0
+  data.tar.gz: d819a2df102d12f1647bf6c1b4b0cd98785575cff6f64c3f6abe6a5c01c703646838ad48f6bde16d7804071740597559bce5c012299d8084189c83ede524c599

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

data/Gemfile

@@ -2,8 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in go_builder.gemspec
 gemspec
-
-gem "codeclimate-test-reporter", group: :test, require: nil
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
 #gem 'minke-generator-go', :path => '/Users/nicj/Developer/gems/minke-generator-go'
 #gem 'minke-generator-node', :path => '/Users/nicj/Developer/gems/minke-generator-node'
 #gem 'minke-generator-spring', :path => '/Users/nicj/Developer/gems/minke-generator-spring'

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:latest
+FROM ruby:2.3.1
 
 ENV COMPOSE_VERSION 1.7.1
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

data/docker/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.13.16"
+gem 'minke', "= 1.13.18"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.8.5"
+gem 'minke-generator-go', "= 0.8.6"
 gem 'minke-generator-spring'

data/lib/minke/config/config.rb

@@ -195,6 +195,12 @@ module Minke
       #
       # [Required]
       attr_accessor :application_compose_file
+
+      ##
+      # Working directory to use for build root, relative to project root
+      #
+      # [Optional]
+      attr_accessor :working_directory
     end
 
     ##

data/lib/minke/config/reader.rb

@@ -50,6 +50,7 @@ module Minke
           d.build_docker_file        = section['build_docker_file']        unless section['build_docker_file'] == nil
           d.application_docker_file  = section['application_docker_file']  unless section['application_docker_file'] == nil
           d.application_compose_file = section['application_compose_file'] unless section['application_compose_file'] == nil
+          d.working_directory        = section['working_directory']        unless section['working_directory'] == nil
         end
       end
 

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.16"
+MINKE_VERSION="1.13.18"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')

data/lib/minke/tasks/task.rb

@@ -67,15 +67,16 @@ module Minke
         begin
           @logger.info "Running command: #{command}"
 
-          settings = @generator_config.build_settings.docker_settings
-          build_image = create_container_image
+          settings          = @generator_config.build_settings.docker_settings
+          build_image       = create_container_image
+          working_directory = create_working_directory
 
           args = {
             :image             => build_image,
             :command           => command,
             :volumes           => settings.binds,
             :environment       => settings.env,
-            :working_directory => settings.working_directory
+            :working_directory => working_directory
           }
           container, success = @docker_runner.create_and_run_container args
 
@@ -108,6 +109,18 @@ module Minke
         build_image
       end
 
+      def create_working_directory
+        base_path = @generator_config.build_settings.docker_settings.working_directory
+        override_path = @task_settings.docker.working_directory unless @task_settings.docker == nil
+
+        if override_path != nil
+          path = Pathname.new(base_path)
+          return (path + override_path).to_s
+        else 
+          return base_path
+        end
+      end
+
     end
   end
 end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.16"
+  VERSION = "1.13.18"
 end

data/minke.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-coolline'
 
   spec.add_runtime_dependency 'sshkey'
   spec.add_runtime_dependency 'colorize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.16
+  version: 1.13.18
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-coolline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement