minke 1.9.7 → 1.9.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE2OGE0OGIwNzIxOGFmOGJhNDZkMzI3NGY2M2I4YjA0ZjNjZjE0YQ==
+    MTc1YmJiMDI0MTg5MjM0YWIyZjE4YTA1OWEzNmU1OTcyNTI5NzM0Zg==
   data.tar.gz: !binary |-
-    Y2I5NjY2YmQxYzEwZmRlNmJiYmU4YTdmMDllNzEzOWY2YWRlNTk5OQ==
+    ZDc0ZGZjNzc3NTY3ZDU5MGMxZjBiNjczNDBiMGQ2N2E4NGI3ZWRkMA==
 SHA512:
   metadata.gz: !binary |-
-    Y2ZmYjMwNjliYWM0MDViOWNiZGI2NTg4NzhjNWM0N2JhM2FlOWVmOWExNjQy
-    ZDY2OTYxNjRhYmFkZWMzNTkzMjM0ZjEzNDg5N2QzMzNjMmU4OWQ2OWM1NjA5
-    YjIwYjhlMDQ0OGRlZmQ0ZDc0MTI0ZDdkM2E2ZjVkNzMyZTFjZWU=
+    OGI1NDRjOWM2YWVjMmY3NzYyZmRmMzNkOGJlNTBiMjllMGQ0NTVjZjg5NWNm
+    YjU0NjkyMWE4ZjlmNTNhYjA1NDUyY2M4NzVlZTJkODJlZTExYzQ5YzllMjZh
+    ZmFjOGMzM2IwNzYyZWJhMDdhZmZhYzZmZjg2MmRmMWI1NTljMzk=
   data.tar.gz: !binary |-
-    OTYxNzE2YTJlNjA1ZWQyMWE4NDQyMzViZTQ2YzMyNmYyOTc2N2NkYjU4Mjdm
-    Yzg2MjE5ZDg2ZWM0ZjJmOTU4OTcxYmE2Y2RlYzhlZmYzYzhiNDQzODY3N2Vk
-    NDg3Mzc5MTQ0MzUyNGQ4NWY4NjhkMDA3ZTdkNTQ5MTI4YThjZWU=
+    NDY0NzkzMTVlZmMxOGNjYzFjOTJkYjMwZGUxOWY4ODAwOGJmMDNiYzViNTFm
+    ZDQ2YmU3OWQ1YWIxYjgwNjllZDNmMzMzZTc3OTE0YTk5ZjQ2NjVhMjgwYWZi
+    MzY0OTlmMDQzMzExN2JhMzcwNDc1OWEwNTU5NDEyZDM1ODhjM2E=

data/lib/minke/generators/shell_script.rb

@@ -3,7 +3,7 @@ module Minke
     SCRIPT = <<-EOF
     #!/bin/bash
     DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
-    BUNDLE_COMMAND="source /usr/local/rvm/scripts/rvm && bundle install -j3 && bundle update"
+    RVM_COMMAND="source /usr/local/rvm/scripts/rvm"
     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:]')
@@ -21,7 +21,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} -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 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 '${RVM_COMMAND} && ${COMMAND}'"
     eval "docker network rm minke_${NEW_UUID}"
     EOF
 

data/lib/minke/rake/app.rake

@@ -6,7 +6,7 @@ namespace :app do
 
     if @config.fetch != nil
       puts 'run fetch'
-      runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -16,7 +16,7 @@ namespace :app do
     create_dependencies
 
     if @config.build != nil
-      runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -26,7 +26,7 @@ namespace :app do
     create_dependencies
 
     if @config.test != nil
-      runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -36,7 +36,7 @@ namespace :app do
     create_dependencies
 
     if @config.build != nil
-      runner = Minke::Tasks::BuildImage.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::BuildImage.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -46,7 +46,7 @@ namespace :app do
     create_dependencies
 
     if @config.run != nil
-      runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -59,7 +59,7 @@ namespace :app do
     create_dependencies
 
     if @config.cucumber != nil
-      runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+      runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
       runner.run
     end
   end
@@ -67,7 +67,7 @@ namespace :app do
   desc "push built image to Docker registry"
   task :push  do
     create_dependencies
-    runner = Minke::Tasks::Push.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
+    runner = Minke::Tasks::Push.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper, @system_runner
     runner.run
   end
 
@@ -94,7 +94,7 @@ namespace :app do
 
       Minke::Generators::Processor.load_generators
       processor = Minke::Generators::Processor.new variables, @docker_runner
-      
+
       @generator_config = processor.get_generator @config.generator_name
     end
 

data/lib/minke/tasks/fetch.rb

@@ -4,9 +4,16 @@ module Minke
 
       def run args = nil
         puts "## Update dependencies"
+
+        puts '### Install gems'
+        @system_runner.execute('bundle install -j3 && bundle update')
+
+        puts '### Install generator dependencies'
         run_with_block do
-          @generator_settings.build_settings.build_commands.fetch.each do |command|
-            run_command_in_container command
+          if @generator_settings.build_settings.build_commands.fetch != nil
+            @generator_settings.build_settings.build_commands.fetch.each do |command|
+              run_command_in_container command
+            end
           end
         end
       end

data/lib/minke/tasks/task.rb

@@ -4,7 +4,7 @@ module Minke
     # Task is a base implementation of a rake task such as fetch, build, etc
     class Task
 
-      def initialize config, task, generator_settings, docker_runner, docker_compose_factory, service_discovery, logger, helper
+      def initialize config, task, generator_settings, docker_runner, docker_compose_factory, service_discovery, logger, helper, system_runner
         @config = config
         @task = task
         @generator_settings = generator_settings
@@ -13,6 +13,7 @@ module Minke
         @logger = logger
         @helper = helper
         @task_settings = config.send(task)
+        @system_runner = system_runner
 
         @build_image = @generator_settings.build_settings.docker_settings.image
         @build_image = config.build_image_for(task) unless config.build_image_for(task) == nil
@@ -92,7 +93,6 @@ module Minke
           "#{url.protocol}://#{address}#{url.path}"
         elsif url.type == 'public'
           address = @service_discovery.public_address_for url.address, url.port
-
           "#{url.protocol}://#{address}#{url.path}"
         end
       end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.9.7"
+  VERSION = "1.9.8"
 end

metadata

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