minke 1.13.5 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0416f3e50c39ec19fc793b2d6a1706cc521fea8
-  data.tar.gz: 16ef6ecab0adac8658a892c4eb9abad9456e4626
+  metadata.gz: 176d12ca1ffae1e33888bfb76ceb8e36e4a213de
+  data.tar.gz: 15bc30494e6873a3206a4498395d530a7a29b8c8
 SHA512:
-  metadata.gz: 25949f80afb1d4a8c99eff183aba029079a11f8206d33721b8c3d4bf09a8d468713fab5f927e7c5f6905eb7f701e86e9ef4cb9ba71405353e79d2de518a6e7f2
-  data.tar.gz: 72513cb55be4b42f3c99a133aca0629fed3345bed984c28aa45074b124fd91a1db3dc8d42196afe9136e5c8fca2a3df0d93f912e531eb3a3746add3554463454
+  metadata.gz: 95b342a6eebe1539bbdd862b1d6bc06c9432d00caf26232097e750d0a0e76fc706760c97128f5e116a95cfee4e3e57b3f7d1dbb0a8f4da1d04bb5d04c25eca49
+  data.tar.gz: 681f63787d28450a20a28c608c8a9101ce2d0a73ecfa6e6495d4bd599a1d179aaecb0e47d9c235ba9aea60e8bf2396beb87fe2c3ebe2afffb97858926edc38aa

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     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.13.5;
-    docker push nicholasjackson/minke:1.13.5;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.6;
+    docker push nicholasjackson/minke:1.13.6;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/bin/minke

@@ -79,7 +79,6 @@ subcommands = {
 
 global.order!
 command = ARGV.shift
-subcommands[command].order! unless command == ''
 
 def load_config config_file, verbose
   reader = Minke::Config::Reader.new Minke::Logging.create_logger(verbose)

data/docker/Gemfile

@@ -8,8 +8,8 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.13.5"
+gem 'minke', "= 1.13.6"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.8.4"
+gem 'minke-generator-go', "= 0.8.5"
 gem 'minke-generator-spring'

data/lib/minke/command.rb

@@ -52,7 +52,6 @@ module Minke
         :task_name              => task,
         :docker_runner          => Minke::Docker::DockerRunner.new(logger, network_name),
         :task_runner            => task_runner,
-        :error_helper           => Minke::Helpers::Error.new,
         :shell_helper           => shell,
         :logger_helper          => logger,
         :generator_config       => generator_config,
@@ -65,14 +64,15 @@ module Minke
     end
 
     def create_tasks task
+      dependencies = create_dependencies(task)
       return {
-        :bundler     => Minke::Tasks::Bundle.new(create_dependencies(task)),
-        :fetch       => Minke::Tasks::Fetch.new(create_dependencies(task)),
-        :build       => Minke::Tasks::Build.new(create_dependencies(task)),
-        :test        => Minke::Tasks::Test.new(create_dependencies(task)),
-        :build_image => Minke::Tasks::BuildImage.new(create_dependencies(task)),
-        :cucumber => Minke::Tasks::Cucumber.new(create_dependencies(task)),
-        :push => Minke::Tasks::Push.new(create_dependencies(task))
+        :bundler     => Minke::Tasks::Bundle.new(dependencies),
+        :fetch       => Minke::Tasks::Fetch.new(dependencies),
+        :build       => Minke::Tasks::Build.new(dependencies),
+        :test        => Minke::Tasks::Test.new(dependencies),
+        :build_image => Minke::Tasks::BuildImage.new(dependencies),
+        :cucumber => Minke::Tasks::Cucumber.new(dependencies),
+        :push => Minke::Tasks::Push.new(dependencies)
       }
     end
 

data/lib/minke/docker/consul.rb

@@ -24,8 +24,8 @@ module Minke
       # stop consul
       def stop
         @logger.info "Stopping Consul"
-        @docker_runner.stop_container @container
-        @docker_runner.delete_container @container
+        @docker_runner.stop_container @container unless @container == nil
+        @docker_runner.delete_container @container unless @container == nil
       end
 
       private

data/lib/minke/docker/health_check.rb

@@ -14,12 +14,12 @@ module Minke
       ##
       # waits until a 200 response is received from the given url
       def wait_for_HTTPOK url
-        @logger.debug "Waiting for server #{url} to start #{@count} attempts left"
+        @logger.debug "Waiting for server #{url} to start #{@count} attempts remaining"
 
         begin
           response = RestClient.send('get', url)
         rescue
-          @logger.error 'Invalid response from server'
+          @logger.debug 'Invalid response from server'
         end
 
         check_response response, url
@@ -41,6 +41,7 @@ module Minke
         if @count > 0
           wait_for_HTTPOK url
         else
+          @logger.error "Server: #{url} failed health check"
           raise 'Server failed to start'
         end
       end

data/lib/minke/docker/service_discovery.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 module Minke
   module Docker
     ##
@@ -21,8 +23,9 @@ module Minke
         begin
           ip = @docker_runner.get_docker_ip_address
           container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+          #puts container_details
           ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port.to_i }.first
-        rescue
+        rescue Exception => e
           raise "Unable to find public address for '#{service_name}' on port #{private_port}"
         end
 

data/lib/minke/generators/processor.rb

@@ -59,7 +59,7 @@ module Minke
           container, success = @docker_runner.create_and_run_container build_image, ["#{File.expand_path(@variables.src_root)}:/src"], nil, '/src', command
 
           # throw exception if failed
-          @helper.fatal_error " #{command}" unless success
+          raise " #{command}" unless success
           #command = Minke::Helpers.replace_vars_in_section generator.generate_command, '##SERVICE_NAME##', APPLICATION_NAME
           #container, ret = Minke::Docker.create_and_run_container config, command
         ensure

data/lib/minke/helpers/shell.rb

@@ -10,15 +10,14 @@ module Minke
       def execute command
         @logger.debug command
         
-        Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-          while line = stdout.gets
+        Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
+          while line = stdout_err.gets
             @logger.debug line
           end
           
           exit_status = wait_thr.value
           unless exit_status.success?
-            @logger.error "Error executing command: #{command}"
-            abort
+            raise "Error executing command: #{command}"
           end
         end
       end

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.5"
+MINKE_VERSION="1.13.6"
 ERROR="Please specify a command e.g. ./minke build"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"

data/lib/minke/tasks/cucumber.rb

@@ -16,10 +16,11 @@ module Minke
             server_address = @service_discovery.build_address(@task_settings.health_check) 
             @health_check.wait_for_HTTPOK(server_address) unless @task_settings.health_check == nil
             
-            status = @shell_helper.execute "cucumber --color -f pretty #{get_features args}"
+            @shell_helper.execute "cucumber --color -f pretty #{get_features args}"
+          rescue Exception => e
+            raise ("Cucumber steps failed: #{e.message}") unless status == true
           ensure
             compose.down
-            @error_helper.fatal_error("Cucumber steps failed") unless status == true
           end
       	end
       end

data/lib/minke/tasks/task.rb

@@ -9,7 +9,6 @@ module Minke
         @task_name              = args[:task_name]
         @docker_runner          = args[:docker_runner]
         @task_runner            = args[:task_runner]
-        @error_helper           = args[:error_helper]
         @shell_helper           = args[:shell_helper]
         @logger                 = args[:logger_helper]
         @generator_config       = args[:generator_config]
@@ -25,6 +24,8 @@ module Minke
       # run_with_config executes the task steps for the given
       # - block containing custom actions
       def run_with_block
+        success = true
+
         begin
           @docker_network.create
           @consul.start_and_load_data @task_settings.consul_loader unless @task_settings.consul_loader == nil
@@ -33,10 +34,21 @@ module Minke
           yield if block_given?
 
           @task_runner.run_steps(@task_settings.post) unless @task_settings == nil || @task_settings.post == nil
+        rescue Exception => e
+          @logger.error e.message
+          success = false
         ensure
           @consul.stop unless @task_settings.consul_loader == nil
-          @docker_network.remove
+          begin
+            @docker_network.remove
+          rescue Exception => e
+            # Trap removing a network as minke may have been called with an existing network and containers
+            # may still be attached.
+            @logger.error e.message
+          end
         end
+
+        abort unless success
       end
 
       ##
@@ -58,7 +70,7 @@ module Minke
           container, success = @docker_runner.create_and_run_container args
 
           # throw exception if failed
-          @error_helper.fatal_error "Unable to run command #{command}" unless success
+          raise "Unable to run command #{command}" unless success
         ensure
           @docker_runner.delete_container container
         end
@@ -75,8 +87,11 @@ module Minke
 
         if build_file != nil
           build_image = "#{@config.application_name}-buildimage"
+          
+          @logger.debug "Building image: #{build_image} from file #{build_file}"
           @docker_runner.build_image build_file, build_image
         else
+          @logger.debug "Pulling image: #{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.13.5"
+  VERSION = "1.13.6"
 end

data/lib/minke.rb

@@ -21,7 +21,6 @@ require 'minke/version'
 require 'minke/command'
 
 require 'minke/helpers/copy'
-require 'minke/helpers/error'
 require 'minke/helpers/rake'
 require 'minke/helpers/shell'
 

data/minke.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'sshkey'
   spec.add_runtime_dependency 'colorize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.6
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -239,7 +253,6 @@ files:
 - lib/minke/generators/register.rb
 - lib/minke/generators/shell_script.rb
 - lib/minke/helpers/copy.rb
-- lib/minke/helpers/error.rb
 - lib/minke/helpers/rake.rb
 - lib/minke/helpers/shell.rb
 - lib/minke/scripts/minke

data/lib/minke/helpers/error.rb

@@ -1,12 +0,0 @@
-module Minke
-  module Helpers
-    class Error
-      ##
-      # fatal_error aborts the current execute with the given message
-      def fatal_error message
-        abort message.colorize(:red)
-      end
-
-    end
-  end
-end