minke 1.9.2 → 1.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjMxOWI0OGVkOWM4NjdhMGZhNWQxMzdmNzM3NWYzZDQ5OTAwZGI4Yg==
+    MzM2NjJiN2ViZjQ5MDZkNWYxNzgzOTdjYWE1MWIzNDNmOWFiZGZhMQ==
   data.tar.gz: !binary |-
-    N2VlNDlkNTU5YjNhNmZjNDc1MjM4MTc1MjIzYWM3YmRjOGY4ZDQ5Mw==
+    MjE1N2Y4MmFmNmFmYmNhMDQ0NDdhZGMxNzNjMTFlN2NkNjc0MTBkNA==
 SHA512:
   metadata.gz: !binary |-
-    NWYyZDY3OTUwZGJhYzc2MjdiZmZmYjY4NmIzODViMWUwNDNkNzk0NzdmNDFj
-    OGNjY2RjYTZlMTg2OGVhMDIxODc0NDNmYzQ2ZTI4YjJmNmU0NGRhYzQ4ODY3
-    MTE2M2ZiODU1ZGZmZDBkYzhlMWIzOTU4Y2IyNDdmYzA2ZmRkYmM=
+    NTY3ZWQxNTRmYWVjMzcyNDk5OTJjODA0YjY0OTFjNjc2OTgzYmM2ZjJkMTM5
+    OTljOGU0ZmU1ZjdjNmEyMDc3ZWZiODg2Nzk0NmQzOTM0MThjMDE1YmJiZGM0
+    MTYwOTYyYTllZTM5MzE4NGJlNmM5OGZhOWNkY2FkNDY3YjgxNjM=
   data.tar.gz: !binary |-
-    YmM0OTFiMjc5YTFmZWQ4NzI2OTk2OGU0MzQ5YWIyY2Q2ZWFmYzYyMTBiNDdj
-    YzVlMmVkMTBmMWMwNGJiYjQ2NjMwOTJlMWM5NmQxNGM1YTEzMmY1OWY2YzZj
-    ZTY0MGY1MjNjZTI5ODg2ZDVmYzY4YzU5ZmE1Yzc3YjBlNTE1ZDA=
+    ZTYzZWIxMzZjYmQ3MTVmZGMzODhmNGMzYjFkNjMzZGU5ZjliMDcyY2NmNDQ0
+    ODUzMzBiNGIzNjA4Nzg1MjA2MWNjZmI3ZmI1YTdlYzYzMzk3NjViOWFhMTE4
+    OGIwMmU0ZmI1YzY4NTI5ZjE1NTdhNDM1YWQzM2Q1YzVlYmY4Njk=

data/docker/Dockerfile

@@ -9,5 +9,11 @@ RUN apt-get update -q \
 		"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
 	&& chmod +x /usr/local/bin/docker-compose
 
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import -
+RUN curl -sSL https://get.rvm.io | bash -s stable --ruby --with-gems="bundle"
+
 COPY ./Gemfile Gemfile
-RUN bundle install
+
+RUN /bin/bash -c "source /usr/local/rvm/scripts/rvm && rvm @global do bundle install"
+
+CMD ["source /usr/local/rvm/scripts/rvm"]

data/docker/Gemfile

@@ -1,8 +1,12 @@
 source 'https://rubygems.org'
 
 gem "rake"
-gem "cucumber", "~> 1.3.10"
+gem "bundler"
+gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
+gem 'cucumber-api', '~> 0.3'
+gem 'nokogiri'
+
 gem 'minke'
 gem 'minke-generator-swift'
 gem 'minke-generator-netmvc'

data/lib/minke/generators/processor.rb

@@ -38,6 +38,7 @@ module Minke
 
         # write the shell script
         Minke::Generators::write_bash_script output_folder + "/_build/minke.sh"
+        Minke::Generators::create_rvm_files output_folder + "/_build/", "@variables.application_name
       end
 
       def build_image docker_file

data/lib/minke/generators/shell_script.rb

@@ -2,12 +2,14 @@ module Minke
   module Generators
     SCRIPT = <<-EOF
     #!/bin/bash
-
     DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
-    BUNDLE_COMMAND="set :bundle_flags, \"--path \#{shared_path}/bundles --quiet\" && bundle install -j3 && bundle update"
+    BUNDLE_COMMAND="bundle install -j3 && bundle update"
     ERROR="Please specify a command e.g. ./minke.sh rake app:test"
     COMMAND=""
     NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
+    GEMSET=$(<.ruby-gemset)
+    GEMSETFOLDER="/usr/local/rvm/gems/ruby-2.3.0@${GEMSET}"
+
 
     if [ "$1" == '' ]; then
       echo $ERROR;
@@ -20,7 +22,7 @@ module Minke
     echo "Running command: ${COMMAND}"
 
     eval "docker network create minke_${NEW_UUID}"
-    eval "docker run --rm -it --net=minke_${NEW_UUID} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build nicholasjackson/minke /bin/bash -c '${BUNDLE_COMMAND} && ${COMMAND}'"
+    eval "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 nicholasjackson/minke /bin/bash -c '${BUNDLE_COMMAND} && ${COMMAND}'"
     eval "docker network rm minke_${NEW_UUID}"
     EOF
 
@@ -29,6 +31,12 @@ module Minke
       File.chmod(0755, path)
     end
 
+    def create_rvm_files folder, application_name
+      File.write("#{folder}.ruby-gemset", application_name)
+      File.write("#{folder}.ruby-version", '2')
+    end
+
     module_function :write_bash_script
+    module_function :create_rvm_files
   end
 end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.9.2"
+  VERSION = "1.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler