minke 1.13.4 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4f926abd52ebbf9199f4a7766b9a3c5c145a21
-  data.tar.gz: 28fb4eef08c9ce51f573d56135dfe9ab3f6443e8
+  metadata.gz: a0416f3e50c39ec19fc793b2d6a1706cc521fea8
+  data.tar.gz: 16ef6ecab0adac8658a892c4eb9abad9456e4626
 SHA512:
-  metadata.gz: 5d4b437b4c5784af8b39be526960ce8fa498c932601f862a9155d3025423bd8de4aeb9e039908dc882cb0dc28b9b5bf6b175e93a32a891be529f0398cb0afc8c
-  data.tar.gz: f9f230fc36357001c68125fc6bbbe58e4d59389b31a9c73966eedeae6e2a4199c358a1489a4bd2099eb873b1f4713b9f2c79eb30643fedfed4d87662826168cd
+  metadata.gz: 25949f80afb1d4a8c99eff183aba029079a11f8206d33721b8c3d4bf09a8d468713fab5f927e7c5f6905eb7f701e86e9ef4cb9ba71405353e79d2de518a6e7f2
+  data.tar.gz: 72513cb55be4b42f3c99a133aca0629fed3345bed984c28aa45074b124fd91a1db3dc8d42196afe9136e5c8fca2a3df0d93f912e531eb3a3746add3554463454

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

data/bin/minke

@@ -96,14 +96,11 @@ end
 
 def doCommand(command, verbose, config_file = nil)
   config, generator_config = load_config(config_file, verbose) unless config_file == nil
-  c = Minke::Command.new(
+  Minke::Command.new(
     config, 
     generator_config,
     verbose
-  )
-
-  puts c
-  c.public_send(command)
+  ).public_send(command)
 end
 
 def doGenerate(options)

data/docker/Gemfile

@@ -8,7 +8,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.13.4"
+gem 'minke', "= 1.13.5"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.4"

data/lib/minke/helpers/shell.rb

@@ -10,8 +10,6 @@ module Minke
       def execute command
         @logger.debug command
         
-        require 'open3'
-        cmd = 'ping www.google.com'
         Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
           while line = stdout.gets
             @logger.debug line
@@ -19,7 +17,8 @@ module Minke
           
           exit_status = wait_thr.value
           unless exit_status.success?
-            abort "FAILED !!! #{cmd}"
+            @logger.error "Error executing command: #{command}"
+            abort
           end
         end
       end

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.4"
+MINKE_VERSION="1.13.5"
 ERROR="Please specify a command e.g. ./minke build"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
@@ -31,18 +31,19 @@ COMMAND=$*
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
 
-if [[ $1 == "generate" ]] || [[ $2 == "generate" ]]; then
+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" ]] || [[ $2 != "generate" ]]; then
+if [[ $1 != \generate* ]]; then
   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}'"
 
-  echo "Running command: minke ${COMMAND}"
+  echo "Running command: ${COMMAND}"
 
   eval "docker network create minke_${NEW_UUID}"
   eval "${DOCKER_RUN}"

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.4"
+  VERSION = "1.13.5"
 end

data/lib/minke.rb

@@ -15,6 +15,7 @@ require 'base64'
 require 'securerandom'
 require 'sshkey'
 require 'mkmf'
+require 'open3'
 
 require 'minke/version'
 require 'minke/command'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.5
 platform: ruby
 authors:
 - Nic Jackson