minke 1.12.5 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31bebbc2eb36b0c7188f1d58a3497f1c4da2789c
-  data.tar.gz: c68d83c96595474c186664be4f3a22689eeeefc8
+  metadata.gz: 7e25d0ccad540daf111867181d96e940db0d4e1a
+  data.tar.gz: a8416946909763342dd121568b2bfce8989d5fb2
 SHA512:
-  metadata.gz: caf6ba51a328bd06d3b4cf82331ee267fe924b1bcc74f1483a8c4d23d2829059c97c082b4b43cb619320f9691a3c88f3cb88d8fe6e7a0faddf45cbf258c32757
-  data.tar.gz: 56e412019502bd4ee8ffd2e8f838a7129350987686eb0507041d58d1a4b58e75c2990d99c42d7e331bafb5d7565c4d8b6bc279ad1bddda72416f10b6aabce03f
+  metadata.gz: 45898b9c55a9c146666d6198b432ba05b3e8c4f0a84c6bf24fcb99c304692db642cadd0682f47d966b05484e94cf2e76c05fce6307122adb95f74d85c1a147aa
+  data.tar.gz: b771c47f89b5d7daf37c8ee20b0b2072901ac95bec5c6295006e3b18629db37ab1bfce176fb397568ee4b4c032a450f7ea619b66bf892b325becd87a73a3b249

data/.travis.yml

@@ -10,27 +10,27 @@ env:
   - secure: a8pa0anxghVr07pT2Nkn1cr4A+wcbFE+x5jykDS1hwpvM8okolthT5TsfHerLjTGa0nDIbTN5KKwr1qa50nTClbAGAEqbmsIljTXlTfhneLB5Sik67SXaJDuoaEfYyNkngNE0S91AL6/pnOkN90zaNlBxdSzkKj1cytd/hHN896e5OSGnu6u8UK9z2VJiebO+AzEBxVuDt7urBhA9Hz1vcw8WbbFhRKEaC5rVhkrkJnPMDSHLgbNLyW1/T1aITgfHeZ2UHzDZ0BvaTXFZvnphbIWKypy/LDDNQ/qYNTVfndonEgchOCmwb8ybaVOjKz0uVLq2TexPrTuoESelLRmdYAVfmlFTEmwzrJneymqJ7IWMgqaRcSDrPV08dWPbZ4z2fdcHSoushD8rSYsAqoHsdYeuwcdtVH7UhDfE5R5jyEpck3OSsstVJ0A61qhGH0fXit4rRgu+vEcTvN5YK+1BBYGzK6CVcxxPleMjgaWwNGuS+dEc+Q/im5MbrGahjN91XLLg6Q8Be8Ep7Q5gPPMTs67wLO7HpjAXp2vND4Y6fgnbh3awovBJrdYXxoll1Xf0ddawE29EZi3LtvzUvy3xV+mWgA62r9jMdEjIMDnm0Nx+i+tdxCJJiGM4oGInMFv25yOdEWt0rjtH7BniXK7FDaSJM7K6tR639KvfaRTi3U=
   - secure: fekwijapVdOV9dt4ouCrXxvGxqmyjChtWweMu1gpUNDh743CTvbhDjXZy+NfON5kUZJ2pRaxOoa1PRsmOvhFryIOnE71trNEmnkgydJoGTmflGnjFqdk++t5UNYrhaWj5NdG8unpQZRvggeam2uDx3c6rZlrJjJfJ9pyhLZGuvZPlUHIGcBbe8uQPSPcfk/z23OeKzTlRkxNDZHcz3UGNlaeuc0ndtpoHHPn/DaCPwfbyeTuYYhM0MZanXpKam2l5mrm7FJhOYL2uXngNYnxHmzOurmMsUr0zlXbrZiqFHXu5icvPrl5yYEtAdS4saP7tIru0e+JDnKyGEOITRzmT0wglgAbef+UqYIwaJKXnr9Eb0Q75V7QtpK7atpaT8/KIbtpqF2xMblQ6LbJVmEbwQ9yB2Jj/09Gbucmfe8J+GyljuebIpVwz8oEywZuVFwmtBN6ix1CPftVpe9s+258IHl+AxZkbg4wIZwsEGA8qYonUrNdoDSQmHnXcgECl4y5spr292191oer4ZRVTIVKgLTsHcZOTbHg9xoYmkDITXhdDiUql12Q5X29C6u1gSr23Zp5fGzUwaHrqUb8dz6FvsLaIMjOXbUXeARbSgV5qFvhnkxhblaKCpdBki8ylzXPHfPXbl5sLfg6ifKBWy5jcsMuXAU9ABblSMuYDngIE/4=
   - secure: GTrZszTC3TVWypczOOmU7Zo8as1y0YwoBU6DXwX/w4jF3n8aKTf4FtCNx1jBGAcPqPZahRudotR7sPX7ZHnSB4iFK+EVtUoKNt8aC/CyEfdc06hTtalIB9dhNOZEAStkD2PP94ipxab71tUQU1PLPvhRtfbfRwTsQWxQL4gQXMhjTIr9AqQKLTMFj9o4ibVMhN9+Wx35M7C0Wc/psRo28w9emAhyX0gMMzoQGVLP/Y0sloT/NpGAKJ7yiZXYbEJiYjWkjuRA/mIJGXU7GcfcVCJRglQvPq9Tb5CciW2UGp0qc/xfDPObTFaGFDokor3phefXPN4x80Q454pp+YDUIAnLY/0PUZ3i/mnOn6zbdNkdrI+Gc6xglxbwLvFvOUW8vuBTh9SnJjMBHgzTI89cuLp2a9e0HncsCUUCCRr/zifRvW15koU03QQEx9blf3s6Qmqeludvh89/jjteMca7mLQsFFBSMuKTXVq38CgqnvK2pt1jhw4bT2aRrsa0RszutvacWSKljdUlH6RTB9JRVwbGuWapD6TXt7tmOpc0kqKLweFmYxySzITp8EhCbVdmSgexB3tZLlR4y4UqStqsmT1JHRz5yTgPtnxmXDdW5eHdqmxP0I0z5E5eX3qdKVt8NYAP4/hjVj2JyDGXIk7fuK8pYA4d3t7o1n263/b/41M=
-before_install:  
+before_install:
   - sudo apt-get update
   - sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install docker-engine
 install: bundle
 script:
 - rake test
 - rake build
-after_success:
-- if [ "$TRAVIS_BRANCH" == "master" ]; then 
-  cd docker;
-  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.12.5; 
-  docker push nicholasjackson/minke:1.12.5;
-  curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=; 
-  fi
 deploy:
   provider: rubygems
   gem: minke
   on:
-    repo: nicholasjackson/minke
+    branch: master
   api_key:
     secure: NfDL67sdeJ0FOSYns+VKjPPk/ZAhJa/wpffw5RiXG94gst5XUtZauik1nVIrTpWYhw5e34hqHPH9mE+v8AkXQRmGyUkYbW+0ePFuqBHidsSFGUOzg3h0+wYrOkvA60REJAg1EM97IDx7PmhcxfO3NFsDvr6RKOXaNc3cLxmiIdD9PVktm75hk2BvoiuO3d12ph2Wr9RjSuidX/0z2H8oOdDs8e14x9QPqX3LuRiTe+A3h+hjZ1OhH9aT5blJ2ZI65iDMY1K6hzcDuUY7CzCbKZF2pPEkDgtT5FgRX1klu28Ehxebef/vvAFmOt5ztuXyE6nEdoI8NACE7XXQQC+6H5PzE6hWoHKk7/vMn5u2pdMRUykArAJ6++JxRSitaKSXn0xZfRKvszp00WhHiG4kPtQXgNKiJiuOKX9huy+gHssYfP3sxcd0LNrslnxaGRAn0igRHuBeaIi8kxL+03q1tCSjOcc6OV9qPIgZAiGUdeeolefrXFTovptcG5PiDzq6jJoQSO51kRMhG/XGfuf2T+vpl5ouT2dsYSz8qDchX5LEjcjuBXb3J1/Xz5s1oQjGI1w+bSrZ1OAFv0d5v8jcD9IyF4C7iVuqCtlc0bNkm9ZgwG+iHHj/SxezFPCttVFBS2or6YizA2xAONXkuy2g+yUDZplcX56fe0oIQsOJOjc=
+after_deploy:
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+    cd docker;
+    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.12.7;
+    docker push nicholasjackson/minke:1.12.7;
+    curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
+    fi

data/docker/Gemfile

@@ -8,7 +8,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.12.5"
+gem 'minke', "= 1.12.7"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.1"

data/lib/minke/docker/consul.rb

@@ -37,10 +37,8 @@ module Minke
             :deamon  => true
           }
         )
-
-        puts @container
       end
-      
+
       def wait_for_startup url
         server = @service_discovery.build_address(url)
         @health_check.wait_for_HTTPOK "#{server}/v1/status/leader"
@@ -54,4 +52,4 @@ module Minke
       end
     end
   end
-end
+end

data/lib/minke/docker/docker_compose.rb

@@ -8,7 +8,7 @@ module Minke
       end
 
       def create compose_file
-        Minke::Docker::DockerCompose.new compose_file, @system_runner, @project_name, @docker_network 
+        Minke::Docker::DockerCompose.new compose_file, @system_runner, @project_name, @docker_network
       end
     end
 
@@ -55,13 +55,10 @@ module Minke
         end
 
         directory = @system_runner.mktmpdir
-
         temp_file = directory + '/docker-compose.yml'
-        puts temp_file
         @system_runner.write_file temp_file, YAML.dump(hash)
 
         ex = "docker-compose -f #{temp_file} -p #{@project_name} #{command}"
-        puts ex
 
         @system_runner.execute ex
         @system_runner.remove_entry_secure directory
@@ -74,14 +71,14 @@ module Minke
       def create_compose
         existing = YAML.load(File.read(@compose_file))
         services = {}
-        
+
         existing['services'].keys.each do |key|
           newservice = existing['services'][key].merge({'external_links' => ["#{@project_name}_consul_1:consul"]})
           services[key] = newservice
         end
 
         compose = { 'version' => 2.to_s, 'services' => services }
-        
+
         compose
       end
 

data/lib/minke/docker/docker_runner.rb

@@ -32,9 +32,9 @@ module Minke
       # Docker::Image
       def find_image image_name
       	found = nil
-      	
+
         ::Docker::Image.all.each do | image |
-      		found = image if image.info["RepoTags"].include? image_name
+      		found = image if image.info["RepoTags"] != nil && image.info["RepoTags"].include?(image_name)
       	end
 
       	return found
@@ -81,7 +81,7 @@ module Minke
 
         success = true
 
-        unless args[:deamon] == true 
+        unless args[:deamon] == true
           thread = Thread.new do
             container.attach(:stream => true, :stdin => nil, :stdout => true, :stderr => true, :logs => false, :tty => false) do
               |stream, chunk|
@@ -98,7 +98,7 @@ module Minke
         end
 
         container.start
-        
+
         thread.join unless args[:deamon] == true
 
       	return container, success
@@ -123,7 +123,7 @@ module Minke
         end
       end
 
-      def stop_container container 
+      def stop_container container
         container.stop()
       end
 

data/lib/minke/generators/processor.rb

@@ -118,8 +118,7 @@ module Minke
       def get_generator generator
         config = Minke::Generators.get_registrations.select { |c| c.name == generator}.first
         if config == nil
-          puts "Generator not installed please select from the above list of installed generators or install the required gem"
-          exit 1
+          throw "Generator not installed please select from the above list of installed generators or install the required gem"
         end
         processor = Minke::Generators::ConfigProcessor.new @variables
         return processor.process config

data/lib/minke/rake/app.rake

@@ -11,6 +11,9 @@ namespace :app do
   task :fetch do
     if @config.fetch != nil
       puts 'run fetch'
+      runner = Minke::Tasks::Bundle.new({:shell_helper => Minke::Helpers::Shell.new})
+      runner.run
+
       runner = Minke::Tasks::Fetch.new create_dependencies :fetch
       runner.run
     end
@@ -85,10 +88,10 @@ namespace :app do
     task_runner = Minke::Tasks::TaskRunner.new ({
       :rake_helper       => Minke::Helpers::Rake.new,
       :copy_helper       => Minke::Helpers::Copy.new,
-      :service_discovery => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new, network_name) 
+      :service_discovery => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new, network_name)
     })
 
-    consul = Minke::Docker::Consul.new( 
+    consul = Minke::Docker::Consul.new(
       Minke::Docker::HealthCheck.new,
       Minke::Docker::ServiceDiscovery.new( project_name, Minke::Docker::DockerRunner.new(network_name), network_name),
       ConsulLoader::Loader.new(ConsulLoader::ConfigParser.new),

data/lib/minke/scripts/minke.sh

@@ -1,12 +1,20 @@
 #!/bin/bash
+MINKE_VERSION="1.12.7"
 ERROR="Please specify a command e.g. ./minke.sh rake app:test"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
-GEMSET='minkegems'
+
+GEMSET=$(<.ruby-gemset)
+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:1.12.5"
+DOCKER_IMAGE="nicholasjackson/minke:${MINKE_VERSION}"
 COMMAND=""
 
 
@@ -26,7 +34,7 @@ fi
 
 if [[ $1 != \ -g* ]]; then
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run --rm --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} && ${COMMAND}'"
+  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} && ${COMMAND}'"
 
   echo "Running command: ${COMMAND}"
 

data/lib/minke/tasks/bundle.rb

@@ -0,0 +1,29 @@
+module Minke
+  module Tasks
+    class Bundle
+
+      def initialize args
+        @shell_helper = args[:shell_helper]
+      end
+
+      def run args = nil
+        puts '### 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'
+
+        puts "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'")
+      end
+
+    end
+  end
+end

data/lib/minke/tasks/fetch.rb

@@ -3,26 +3,8 @@ module Minke
     class Fetch < Task
 
       def run args = nil
-        puts "## Update dependencies"
-
-        puts '### 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'
-
-        puts "Using gemset #{gemset}" 
-
-        rvm_command = "source #{rvm} && rvm gemset use #{gemset} && " if rvm_installed
-        rvm_command = "source #{rvm_root} && rvm gemset use #{gemset} && " if rvm_root_installed 
-
-        @shell_helper.execute("/bin/bash -c '#{rvm_command}bundle install -j3 && bundle update'")
-
         puts '### Install generator dependencies'
-        
+
         if @generator_config.build_settings.build_commands.fetch != nil
           run_with_block do
             @generator_config.build_settings.build_commands.fetch.each do |command|

data/lib/minke/tasks/run.rb

@@ -15,7 +15,7 @@ module Minke
             compose.logs
           rescue SystemExit, Interrupt
             puts "Stopping...."
-            raise
+            raise SystemExit
           ensure
             compose.down
           end

data/lib/minke/tasks/task.rb

@@ -66,7 +66,7 @@ module Minke
 
       ##
       # Pulls the build image for the container from the registry if one is supplied,
-      # if a build file is specified an image is built. 
+      # if a build file is specified an image is built.
       def create_container_image
         build_image = @generator_config.build_settings.docker_settings.image
         build_image = @config.build_image_for(@task_name) unless @config.build_image_for(@task_name) == nil
@@ -77,6 +77,7 @@ module Minke
           build_image = "#{@config.application_name}-buildimage"
           @docker_runner.build_image build_file, build_image
         else
+          puts build_image
           @docker_runner.pull_image build_image unless @docker_runner.find_image build_image
         end
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.12.5"
+  VERSION = "1.12.7"
 end

data/lib/minke.rb

@@ -37,6 +37,7 @@ require 'minke/config/reader'
 require 'minke/tasks/task_runner'
 require 'minke/tasks/task'
 require 'minke/tasks/build'
+require 'minke/tasks/bundle'
 require 'minke/tasks/cucumber'
 require 'minke/tasks/fetch'
 require 'minke/tasks/push'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.12.7
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,6 +218,7 @@ files:
 - docker/.bashrc
 - docker/Dockerfile
 - docker/Gemfile
+- docker/minke.gem
 - examples/config_go.yml
 - examples/config_swift.yml
 - lib/minke.rb
@@ -246,6 +247,7 @@ files:
 - lib/minke/scripts/minke.sh
 - lib/minke/tasks/build.rb
 - lib/minke/tasks/build_image.rb
+- lib/minke/tasks/bundle.rb
 - lib/minke/tasks/cucumber.rb
 - lib/minke/tasks/fetch.rb
 - lib/minke/tasks/push.rb