minke 1.11.0 → 1.11.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjYxZTYwNDkzZDQwOTQ0OTJhYjRjZjBmYzViNDE5OWQ0YmYxOTNhMg==
-  data.tar.gz: !binary |-
-    NGFhMWY0MTY5MDBlMGQ1ZDM1YzVmNjUyNjQwYWE2MmI5ZjRkNzAyZA==
+SHA1:
+  metadata.gz: f0b6d139c785e4975c59280ecd2983128af2b8ed
+  data.tar.gz: ffdcc500a8d82dfdddc3d70efc356df23d5c95e2
 SHA512:
-  metadata.gz: !binary |-
-    NDRkZmEwNzMzZDI2MjM4ZmFiMDJjZjM4ZjEyMDI3MTkwMjE0NmUyMGYwYmU3
-    M2Y1NjU4NjRhMjllNDdlYTMyODJjM2NlNDQ5N2ZmNTQyODUxNzRhY2ViOGQ3
-    NDc3MGQ3NjA2YWMxYjg5NzQ5MWY0Mzc1NGI5NGE3MzhmYzBmZTA=
-  data.tar.gz: !binary |-
-    YTExMTAzZDUxNmRmNjQ2MzZhODM2Y2UxMzQzZTY3MzQxZjEyN2E4ZmMxMDMz
-    ZjljNWFjNWRhOWRmZTY2YWUwMTFkZTRjMjczNDBiMGUxZDRlNzJiNmEzYmIw
-    MjJlM2E3ODVmODk4ZTE2ZTY4ZDBiMTVhYjJhYmQ3N2Y2MDRhZmQ=
+  metadata.gz: 4ea0b5b0a0a63b44f1ac1ac2ac68aec214b815eac4198e2ba11a9aedcd39c900f7a8cb1fb1f4ce9cec3a2e5a1dd266a43d5838d0a33095684b4fa33eb16b1cef
+  data.tar.gz: 39dd8b65b7f96a719e775356271cfb8aca3e39ca6d87659f0a5ec44df0d309b8fcd6cfb53816cd71cf1a98d9b5179bc11642a8dd5765cfe554b6e89b23dfd2a0

data/docker/Dockerfile

@@ -4,7 +4,14 @@ ENV COMPOSE_VERSION 1.7.1
 ENV PATH /usr/local/rvm/bin:/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
+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
+
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+
+RUN echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list
+
+RUN apt-get update
+RUN apt-get -y install docker-engine
 
 RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
 

data/lib/minke/rake/app.rake

@@ -3,9 +3,12 @@ require 'minke'
 reader = Minke::Config::Reader.new
 @config = reader.read './config.yml'
 
+DOCKER_IP = Minke::Docker::DockerRunner.new(nil).get_docker_ip_address
+ENV['DOCKER_IP'] = DOCKER_IP
+
 namespace :app do
   desc "fetch dependent packages"
-  task :fetch => ['config:set_docker_env'] do
+  task :fetch do
     if @config.fetch != nil
       puts 'run fetch'
       runner = Minke::Tasks::Fetch.new create_dependencies :fetch
@@ -38,7 +41,7 @@ namespace :app do
   end
 
   desc "run application with Docker Compose"
-  task :run => ['config:set_docker_env'] do
+  task :run do
     if @config.run != nil
       runner = Minke::Tasks::Run.new create_dependencies :run
       runner.run
@@ -49,7 +52,7 @@ namespace :app do
   task :build_and_run => [:build_image, :run]
 
   desc "run end to end Cucumber tests USAGE: rake app:cucumber[@tag]"
-  task :cucumber, [:feature] => ['config:set_docker_env'] do |t, args|
+  task :cucumber, [:feature] do |t, args|
     if @config.cucumber != nil
       runner = Minke::Tasks::Cucumber.new create_dependencies :cucumber
       runner.run

data/lib/minke/tasks/fetch.rb

@@ -6,7 +6,10 @@ module Minke
         puts "## Update dependencies"
 
         puts '### Install gems'
-        @shell_helper.execute('bundle install -j3 && bundle update')
+        rvm_installed = @shell_helper.execute('which rvm')
+        rvm_command = 'source /usr/local/rvm/scripts/rvm && ' if rvm_installed 
+
+        @shell_helper.execute("#{rvm_command}bundle install -j3 && bundle update")
 
         puts '### Install generator dependencies'
         

data/lib/minke/tasks/task.rb

@@ -37,6 +37,7 @@ module Minke
         ensure
           puts "Stopping Consul"
           @consul.stop unless @task_settings.consul_loader == nil
+          sleep 3
           @docker_network.remove
         end
       end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

data/lib/minke.rb

@@ -48,7 +48,7 @@ require 'minke/generators/config_processor'
 require 'minke/generators/config_variables'
 require 'minke/generators/processor'
 require 'minke/generators/register'
-require 'minke/generators/shell_script.rb'
+require 'minke/generators/shell_script'
 
 require 'minke/encryption/encryption'
 require 'minke/encryption/key_locator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Nic Jackson
@@ -14,182 +14,182 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: consul_loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -200,12 +200,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -243,8 +243,6 @@ files:
 - lib/minke/helpers/rake.rb
 - lib/minke/helpers/shell.rb
 - lib/minke/rake/app.rake
-- lib/minke/rake/config.rake
-- lib/minke/rake/docker.rake
 - lib/minke/scripts/minke.sh
 - lib/minke/tasks/build.rb
 - lib/minke/tasks/build_image.rb
@@ -267,17 +265,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Minke is a suite of rake tasks for building and testing microservices with

data/lib/minke/rake/config.rake

@@ -1,6 +0,0 @@
-namespace :config do
-  task :set_docker_env do
-    DOCKER_IP = Minke::Docker::DockerRunner.new(nil).get_docker_ip_address
-    ENV['DOCKER_IP'] = DOCKER_IP
-  end
-end

data/lib/minke/rake/docker.rake

@@ -1,23 +0,0 @@
-namespace :docker do
-  desc "updates build images for swagger and golang will overwrite existing images"
-  task :update_images do
-    config = Minke::Config::Reader.new.read './config.yml'
-
-    puts "## Updating Docker images"
-    runner = Minke::Docker::DockerRunner.new
-  	runner.pull_image config.docker.build_image
-
-    puts ""
-  end
-
-  desc "pull images for golang from Docker registry if not already downloaded"
-  task :fetch_images do
-    config = Minke::Config::Reader.new.read './config.yml'
-
-    puts "## Pulling Docker images"
-    runner = Minke::Docker::DockerRunner.new
-  	runner.pull_image config.docker.build_image unless runner.find_image config.docker.build_image
-
-    puts ""
-  end
-end