minke 1.13.7 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fab1bea1996f6449940a84db6dfd74aaef1e04
-  data.tar.gz: c48baae7fbfe3136dc5540fd1d4061502ab36de9
+  metadata.gz: ec16a6f8bb966d59cb0305eb6abc45e93b31939a
+  data.tar.gz: 960268cd2550e92d486b51017a11c61c01e7d174
 SHA512:
-  metadata.gz: 6227e15e13b0bec5995fd4a85a108ed4118a179b1942f9eef535bd67f7d28a2326a51c2f65621155ab8e4edb5a9b3700aa62472491a2c3724c75d153d6026505
-  data.tar.gz: 7d8515a130fbe4bfbcb3c06376817651e0b0bb7052817033360e3b7a0ab9306ac4c433fe5f33fb119b295d49464236d6bb7b8501db3642998b2ad83799aca658
+  metadata.gz: f72fe2a479b1298b9365ed4f6f6dc7d6af2e17f4e305122a3b99d44d77b64a67b7f8285682a878de40c768b86287ca26046d0d9fada2f72f0a76921e47c2367c
+  data.tar.gz: 763efb3149550d65dce85329d5a825d8bb8eb48f8514796d1bceaf41bbfc2b2f5f8d5be12b1deaca64b6864a7349087a51cbba19ac28d06090e9c6b1dff0f568

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .DS_Store
 /_site
+/**/*.swp

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

data/bin/minke

@@ -79,6 +79,8 @@ subcommands = {
 
 global.order!
 command = ARGV.shift
+subcommands[command].order!
+
 
 def load_config config_file, verbose
   reader = Minke::Config::Reader.new Minke::Logging.create_logger(verbose)
@@ -159,4 +161,4 @@ when "generate"
   doGenerate(options)
 when "encrypt"
   doEncrypt(options)
-end
+end

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stable
+FROM ruby:latest
 
 ENV COMPOSE_VERSION 1.7.1
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -25,14 +25,22 @@ RUN echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/
 RUN apt-get update
 RUN apt-get -y install docker-engine=1.10.3-0~jessie
 
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
-
 RUN curl -o /usr/local/bin/docker-compose -L \
 		"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
 	&& chmod +x /usr/local/bin/docker-compose
 
-COPY .bashrc /root/.bashrc
-
 COPY Gemfile Gemfile
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+RUN bundle install
+
+RUN ls -las /usr/local/bundle/gems
+
+RUN mkdir /usr/local/backup
+
+RUN cp -R /usr/local/bundle/* /usr/local/backup
+
+ENTRYPOINT ["/entrypoint.sh"]
 
-RUN /bin/bash -c "source /usr/local/rvm/scripts/rvm && rvm @global do bundle install"
+CMD ["--help"]

data/docker/entrypoint.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+INSTALL="echo \"#Copying cache\" && cp -r /usr/local/backup/* /usr/local/bundle/ && gem install bundler && bundle install"
+COMMAND="bundle exec minke $@"
+
+if [[ $1 != \generate* ]]; then
+  if [ "$(ls -A ./vendor)" ]; then
+    eval $COMMAND 
+  else  
+    eval "$INSTALL && $COMMAND"
+  fi
+fi
+
+if [[ $1 = \generate* ]]; then
+  eval $COMMAND
+fi

data/lib/minke.rb

@@ -19,6 +19,7 @@ require 'open3'
 
 require 'minke/version'
 require 'minke/command'
+require 'minke/logger'
 
 require 'minke/helpers/copy'
 require 'minke/helpers/rake'
@@ -54,35 +55,3 @@ require 'minke/generators/shell_script'
 
 require 'minke/encryption/encryption'
 require 'minke/encryption/key_locator'
-
-module Minke
-  class Logging
-    @@debug = false
-    @@ret = "\n"
-    
-    def self.create_logger verbose = false
-      Logger.new(STDOUT).tap do |l|
-        l.datetime_format = ''
-        l.formatter = proc do |severity, datetime, progname, msg|
-          case severity
-          when 'ERROR'
-            s = "#{@@ret if @@debug}#{'ERROR'.colorize(:red)}: #{msg.chomp('')}\n"
-            @@debug = false
-            s
-          when 'INFO'
-            s = "#{@@ret if @@debug}#{'INFO'.colorize(:green)}: #{msg.chomp('')}\n"
-            @@debug = false
-            s
-          when 'DEBUG'
-            if verbose == true
-              "#{'DEBUG'.colorize(:yellow)}: #{msg.chomp('')}\n"
-            else
-              @@debug = true
-              "#{'.'.colorize(:yellow)}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/minke/docker/network.rb

@@ -11,7 +11,7 @@ module Minke
       end
 
       def remove
-        @shell_runner.execute("docker network rm #{@network_name}") unless find_network.to_s == ''
+        @shell_runner.execute("docker network rm #{@network_name}", true) unless find_network.to_s == ''
       end
 
       private 
@@ -20,4 +20,4 @@ module Minke
       end
     end
   end
-end
+end

data/lib/minke/helpers/shell.rb

@@ -7,7 +7,7 @@ module Minke
 
       ##
       # Executes a shell command and returns the return status
-      def execute command
+      def execute command, ignore_error=false
         @logger.debug command
         
         Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
@@ -16,7 +16,7 @@ module Minke
           end
           
           exit_status = wait_thr.value
-          unless exit_status.success?
+          unless exit_status.success? || ignore_error == true
             raise "Error executing command: #{command}"
           end
         end
@@ -48,4 +48,4 @@ module Minke
       end
     end
   end
-end
+end

data/lib/minke/logger.rb

@@ -0,0 +1,31 @@
+module Minke
+  class Logging
+    @@debug = false
+    @@ret = "\n"
+    
+    def self.create_logger verbose = false
+      Logger.new(STDOUT).tap do |l|
+        l.datetime_format = ''
+        l.formatter = proc do |severity, datetime, progname, msg|
+          case severity
+          when 'ERROR'
+            s = "#{@@ret if @@debug}#{'ERROR'.colorize(:red)}: #{msg.chomp('')}\n"
+            @@debug = false
+            s
+          when 'INFO'
+            s = "#{@@ret if @@debug}#{'INFO'.colorize(:green)}: #{msg.chomp('')}\n"
+            @@debug = false
+            s
+          when 'DEBUG'
+            if verbose == true
+              "#{'DEBUG'.colorize(:yellow)}: #{msg.chomp('')}\n"
+            else
+              @@debug = true
+              "#{'.'.colorize(:yellow)}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/minke/scripts/minke

@@ -1,51 +1,42 @@
 #!/bin/bash
 MINKE_VERSION="1.13.7"
-ERROR="Please specify a command e.g. ./minke build"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
 
-if [ -f .ruby-gemset ];then
-  GEMSET=$(<.ruby-gemset)
-fi
-
-LEN=$(echo ${#GEMSET})
-
-if [ $LEN -lt 1 ]; then
-  GEMSET='minkegems'
-fi
-
-GEMSETFOLDER="/usr/local/rvm/gems/ruby-2.3.1@${GEMSET}"
-RVM_COMMAND="source /usr/local/rvm/scripts/rvm && rvm gemset use ${GEMSET} --create"
-DOCKER_IMAGE="nicholasjackson/minke:${MINKE_VERSION}"
-COMMAND=""
-
-
-if [ "$1" == '' ]; then
-  echo $ERROR;
-  exit 1;
-fi
+DOCKER_IMAGE="minketester"
 
 COMMAND=$*
 
+GEM_VOLUMES=""
+
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
 
-if [[ $1 == \generate* ]]; then
-  echo "Generating new template"
-  DIR=${PWD}
-  DOCKER_RUN="docker run --rm -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor/gems:${GEMSETFOLDER} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR} ${DOCKER_IMAGE} /bin/bash -c '${RVM_COMMAND} && bundle install && minke ${COMMAND}'"
-  
-  eval "${DOCKER_RUN}"
-fi
-
 if [[ $1 != \generate* ]]; then
+
+  echo "Generate"
+
+  # 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"
+  done < <(grep :path Gemfile)
+
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run --rm ${IT} --net=minke_${NEW_UUID} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor/gems:${GEMSETFOLDER} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} /bin/bash -c '${RVM_COMMAND} && minke ${COMMAND}'"
+  DOCKER_RUN="docker run --rm ${IT} --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: ${COMMAND}"
+  echo "Running command: minke ${COMMAND}"
 
-  eval "docker network create minke_${NEW_UUID}"
+  id=$(docker network create minke_${NEW_UUID})
+  #echo "${DOCKER_RUN}"
   eval "${DOCKER_RUN}"
-  eval "docker network rm minke_${NEW_UUID}"
-fi
+  id=$(docker network rm minke_${NEW_UUID})
+fi
+
+if [[ $1 = \generate* ]]; then
+  DIR=$(pwd)
+  DOCKER_RUN="docker run --rm ${IT} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}/${DIR} ${DOCKER_IMAGE} ${COMMAND}"
+  echo $DOCKER_RUN 
+  eval "$DOCKER_RUN"
+fi

data/lib/minke/tasks/bundle.rb

@@ -9,20 +9,9 @@ module Minke
 
       def run args = nil
         @logger.info '### Install gems'
-        rvm = "#{ENV['HOME']}/.rvm/scripts/rvm"
-        rvm_root = '/usr/local/rvm/scripts/rvm'
 
-        rvm_installed = @shell_helper.exist?(rvm)
-        rvm_root_installed = @shell_helper.exist?(rvm_root)
-
-        gemset = @shell_helper.read_file '.ruby-gemset'
-
-        @logger.info "Using gemset #{gemset}"
-
-        rvm_command = "source #{rvm} && rvm gemset use #{gemset} --create && " if rvm_installed
-        rvm_command = "source #{rvm_root} && rvm gemset use #{gemset} --create && " if rvm_root_installed
-
-        @shell_helper.execute("/bin/bash -c '#{rvm_command}bundle install -j3 && bundle update'")
+        @shell_helper.execute('bundle install -j3')
+        @shell_helper.execute('bundle update')
       end
 
     end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.7"
+  VERSION = "1.13.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.7
+  version: 1.13.8
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,7 @@ files:
 - docker/.bashrc
 - docker/Dockerfile
 - docker/Gemfile
+- docker/entrypoint.sh
 - examples/config_go.yml
 - examples/config_swift.yml
 - lib/minke.rb
@@ -255,6 +256,7 @@ files:
 - lib/minke/helpers/copy.rb
 - lib/minke/helpers/rake.rb
 - lib/minke/helpers/shell.rb
+- lib/minke/logger.rb
 - lib/minke/scripts/minke
 - lib/minke/tasks/build.rb
 - lib/minke/tasks/build_image.rb