minke 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cae3864a161b20a56c969033a995be030add5132
-  data.tar.gz: 6de93ee0ed6e6e406a7d86fe6be9d0328f00c578
+  metadata.gz: e3297fb02d24e8b71018ad300b93ea87bdfc7735
+  data.tar.gz: 18d772e90fa131cb3a618ca91a034d4d0fec8a3c
 SHA512:
-  metadata.gz: 10643eea6e924f9a21fbb8034633b5d598480a8a5ad9ddd647d43eaf44c76b8e7468d6056006a64a5bf687affa2574d1a848ecfc32eb3e4852a1a4f51768700d
-  data.tar.gz: efb131593f7eb2d50a6b8c7fcdc3c98b253bb8994e98e30b6ac137138c66a676d6160ea9e79a7cf060c8a6bc648507209d340da0159f95a9aab6512e62326542
+  metadata.gz: 1c0b8dc69e9f24d0bfdaa3994a93fe8433cbe16447c04cfe4d4dc91049489f09c25e2f4bb9dff13ca80b0ddb789eb55a008e7bb7550e39afb45be7625fe41335
+  data.tar.gz: 5609952df0783dbb274d7e267db3474419fc35b371b2d395d217e4d47a69e65f19822943e5319f2e3ffbc68f770dd46610f75ed14c2aa81d57bf69c622ec2938

data/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:stable
 
 ENV COMPOSE_VERSION 1.7.1
-ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN apt-get update
 RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https
@@ -19,6 +19,8 @@ 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
 
 RUN /bin/bash -c "source /usr/local/rvm/scripts/rvm && rvm @global do bundle install"

data/docker/Gemfile

@@ -7,7 +7,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.11.1"
+gem 'minke', "= 1.11.3"
 gem 'minke-generator-swift', "= 0.1.8"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go'

data/lib/minke/tasks/fetch.rb

@@ -7,8 +7,14 @@ module Minke
 
         puts '### Install gems'
         rvm = "#{ENV['HOME']}/.rvm/scripts/rvm"
+        rvm_root = '/usr/local/rvm/scripts/rvm'
+
+
         rvm_installed = File.exist?(rvm)
-        rvm_command = "source #{rvm} && " if rvm_installed 
+        rvm_root_installed = File.exist?(rvm_root)
+
+        rvm_command = "source #{rvm} && " if rvm_installed
+        rvm_command = "source #{rvm_root} && " if rvm_root_installed 
 
         @shell_helper.execute("#{rvm_command}bundle install -j3 && bundle update")
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.11.2"
+  VERSION = "1.11.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Nic Jackson
@@ -215,7 +215,7 @@ files:
 - bin/console
 - bin/minke
 - bin/setup
-- docker/.profile
+- docker/.bashrc
 - docker/Dockerfile
 - docker/Gemfile
 - examples/config_go.yml