minke 1.12.9 → 1.13.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTRmZWM3NzViM2YzNWYzNDQ3MjEzM2M4NTZmYWIwNDRlYjQyMmVkYg==
-  data.tar.gz: !binary |-
-    ZjY5ZmI1OWVjNDVhNjAzN2ZlMzE1MjExYWMwMDQ3ZWUwMGE4NjI3NA==
+SHA1:
+  metadata.gz: a8a968e0c1571582674fa98f092560407ae4ca50
+  data.tar.gz: 0f81d735278d8c5580b475a916572354504dbf9d
 SHA512:
-  metadata.gz: !binary |-
-    N2JkMzRjZWE0OWE5Yjg5OTJjOGExZDgwODQ0ZWI3MGI4ZThkMTEwYjE5Nzk3
-    MmI2MjNiODdkZWJlMmViZmZkMmFjMGQxYmM1NjU3YmJlN2FkODZhZjBiMGMw
-    NGQzMTAxZDVkZjE0MTI4N2IyMDIzMjM4N2MxYzg0NjAxZDljMmQ=
-  data.tar.gz: !binary |-
-    N2RkMTE2M2YyNGNjNDdhYWIwYzI0MjQxZjk0NzljMzM1ZTJjODQzMDZlOTE4
-    ZDVhMmZjN2Q2MzU4MjBjM2NkZWMxNTY2YzViZDk5NDUxNjczMzA1OWE1YTg0
-    MDVlM2EwYTBiZGNhZTk5NWI3NTlkZTEzN2Y3YWI1YTZlNTgxZDk=
+  metadata.gz: 1262da8729c6d2fe0060ebe3f24f737c1d2822fedf4435b1ce5a274b7aeff1627e8a36183ec52abbaecebdff07f1b31733a1614d4552d2c9dafd13655e5fd456
+  data.tar.gz: 2b8d1055d0554c843b015aae2d80209019a388bc17f12cf81c89866cd4dd21580b303c17a4cc274fea2b1f8b208e3bdeafa1ad7e2bb3e3dbaa012556812204af

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.12.9;
-    docker push nicholasjackson/minke:1.12.9;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.0;
+    docker push nicholasjackson/minke:1.13.0;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/README.md

@@ -1,10 +1,14 @@
-[![Stories in Ready](https://badge.waffle.io/nicholasjackson/minke.png?label=ready&title=Ready)](https://waffle.io/nicholasjackson/minke)
 # Minke
 
-[![Join the chat at https://gitter.im/nicholasjackson/minke](https://badges.gitter.im/nicholasjackson/minke.svg)](https://gitter.im/nicholasjackson/minke?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+|     |     |
+|-----|-----|
+| Stories Ready: | [![Stories in Ready](https://badge.waffle.io/nicholasjackson/minke.png?label=ready&title=Ready)](https://waffle.io/nicholasjackson/minke) |
+| Test Coverage: | [![Test Coverage](https://codeclimate.com/github/nicholasjackson/minke/badges/coverage.svg)](https://codeclimate.com/github/nicholasjackson/minke/coverage) |
+| Build Status: | [![Build Status](https://travis-ci.org/nicholasjackson/minke.svg?branch=master)](https://travis-ci.org/nicholasjackson/minke) |
+| Chat: | [![Join the chat at https://gitter.im/nicholasjackson/minke](https://badges.gitter.im/nicholasjackson/minke.svg)](https://gitter.im/nicholasjackson/minke?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) |
 
 # Documentation and Tutorial 
-[http://minke.rocks/index.html](http://minke.rocks/index.html)
+[https://minke.rocks/index.html](http://minke.rocks/index.html)
 
 # Quick Start
 Minke is an opinionated build system for μServices and Docker, it uses generator templates to create working source code, Dockerfiles, and anything else you may need to build and deploy a working microservice.
@@ -54,3 +58,6 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+
+

data/bin/minke

@@ -24,7 +24,112 @@ Minke::Generators::Processor.load_generators
 puts ""
 puts ""
 
-options = {}
+options = {
+  :config => './config.yml'
+}
+
+subtext = <<HELP
+Commonly used command are:
+   generate    :     generate a new template
+   fetch       :     fetch dependent packages
+   build       :     build template
+   test        :     run unit tests
+   cucumber    :     run cucumber tests
+   run         :     start the application
+   build_image :     build a docker image
+   push        :     push built image to the registry
+See 'minke COMMAND --help' for more information on a specific command.
+HELP
+
+global = OptionParser.new do |opts|
+  opts.banner = "Usage: minke [options] [subcommand [options]]"
+  opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = true }
+  opts.separator ""
+  opts.separator subtext
+end
+
+subcommands = { 
+  'generate' => OptionParser.new do |opts|
+     # ...
+   end,
+
+   'build' => OptionParser.new do |opts|
+     # ...
+   end,
+
+   'test' => OptionParser.new do |opts|
+     opts.banner = "Usage: minke test [options]"
+
+     opts.on("-c", "--config", "Load config file at given path") { |c| options[:config] = c }
+   end
+ }
+
+global.order!
+command = ARGV.shift
+subcommands[command].order!
+
+def load_config options
+  reader = Minke::Config::Reader.new Minke::Logging.create_logger(options[:verbose])
+  config = reader.read options[:config]
+  variables = Minke::Generators::ConfigVariables.new.tap do |v|
+      v.application_name = config.application_name
+      v.namespace = config.namespace
+      v.src_root = File.expand_path('../')
+  end
+  processor = Minke::Generators::Processor.new variables, nil, Minke::Logging.create_logger(options[:verbose])
+  generator_config = processor.get_generator config.generator_name
+  return config, generator_config
+end
+
+config, generator_config = load_config options
+
+case command
+when "test"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).test
+when "build"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).build
+when "fetch"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).fetch
+when "cucumber"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).cucumber
+when "build_image"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).build_image
+when "run"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).run
+when "push"
+  Minke::Command.new(
+    config, 
+    generator_config, 
+    options[:verbose]
+  ).run
+end
+
+exit 0
+
 OptionParser.new do |opts|
   opts.banner = "Usage: minke [options]"
 

data/docker/Gemfile

@@ -11,5 +11,5 @@ gem 'cucumber-api', '~> 0.3'
 gem 'minke', "= 1.12.8"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.8.1"
+gem 'minke-generator-go', "= 0.8.2"
 gem 'minke-generator-spring'

data/lib/minke/command.rb

@@ -0,0 +1,124 @@
+module Minke
+  class Command
+    attr_accessor :config, :generator_config, :verbose
+
+    def initialize(config, generator_config, verbose)
+      self.config = config
+      self.generator_config = generator_config
+      self.verbose = verbose
+    end
+
+    # Creates dependencies for minke
+    def create_dependencies task
+      project_name = "minke#{SecureRandom.urlsafe_base64(12)}".downcase.gsub(/[^0-9a-z ]/i, '')
+      network_name = ENV['DOCKER_NETWORK'] ||= "#{project_name}_default"
+      ENV['DOCKER_PROJECT'] = project_name
+      ENV['DOCKER_NETWORK'] = network_name
+
+      logger = Minke::Logging.create_logger(self.verbose)
+      shell = Minke::Helpers::Shell.new(logger)
+
+      variables = Minke::Generators::ConfigVariables.new.tap do |v|
+        v.application_name = @config.application_name
+        v.namespace = @config.namespace
+        v.src_root = File.expand_path('../')
+      end
+
+      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(logger), network_name)
+      })
+
+      consul = Minke::Docker::Consul.new(
+        {
+          :health_check => Minke::Docker::HealthCheck.new(logger),
+          :service_discovery => Minke::Docker::ServiceDiscovery.new( project_name, Minke::Docker::DockerRunner.new(logger, network_name), network_name),
+          :consul_loader => ConsulLoader::Loader.new(ConsulLoader::ConfigParser.new),
+          :docker_runner => Minke::Docker::DockerRunner.new(logger, network_name),
+          :network => network_name,
+          :project_name => project_name,
+          :logger_helper => logger
+        }
+      )
+
+      network = Minke::Docker::Network.new(
+        network_name,
+        shell
+      )
+
+      return {
+        :config                 => @config,
+        :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,
+        :docker_compose_factory => Minke::Docker::DockerComposeFactory.new(shell, project_name, network_name),
+        :consul                 => consul,
+        :docker_network         => network,
+        :health_check           => Minke::Docker::HealthCheck.new(logger),
+        :service_discovery      => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new(logger), network_name)
+      } 
+    end
+
+    def create_tasks 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))
+      }
+    end
+
+    def fetch
+      if config.fetch != nil
+        tasks = create_tasks :fetch
+        tasks[:bundler].run
+        tasks[:fetch].run
+      end
+    end
+
+    def build
+      if config.build != nil
+        fetch
+        tasks = create_tasks :build
+        tasks[:build].run
+      end
+    end
+
+    def test
+      if config.test != nil
+        build
+        tasks = create_tasks :test
+        tasks[:test].run
+      end
+    end
+
+    def build_image
+      if config.test != nil
+        test
+        tasks = create_tasks :build
+        tasks[:build_image].run
+      end
+    end
+
+    def cucumber
+      if config.cucumber != nil
+        tasks = create_tasks :cucumber
+        tasks[:cucumber].run
+      end
+    end
+
+    def push
+      tasks = create_tasks :push
+      tasks[:push].run
+    end
+
+  end
+end

data/lib/minke/config/reader.rb

@@ -3,6 +3,12 @@ module Minke
     ##
     # Reader reads a yaml based configuration and processes it into a Minke::Config::Config instance
     class Reader
+
+      def initialize logger
+        @logger = logger 
+      end
+
+
       ##
       # read yaml config file and return Minke::Config::Config instance
       def read config_file
@@ -93,7 +99,7 @@ module Minke
       def read_secure hash
         key_path = ENV['SSL_KEY_PATH'].to_s == '' ? "#{ENV['HOME']}/.ssh" : ENV['SSL_KEY_PATH']
         unless Dir.exists? key_path
-          puts "Unable to find SSH keys to decrypt secrets, please set environment variable SSL_KEY_PATH or place the keys in ~/.ssh"
+          @logger.error "Unable to find SSH keys to decrypt secrets, please set environment variable SSL_KEY_PATH or place the keys in ~/.ssh"
           return
         end
 
@@ -103,9 +109,10 @@ module Minke
         locator = Minke::Encryption::KeyLocator.new key_path
         key_path = locator.locate_key fingerprint
 
-        puts key_path
+        @logger.debug key_path
+
         if key_path.to_s.empty?
-          puts "Unable to find SSL key matching fingerprint if your SSL keys are not in ~/.ssh you can set the environment variable SSL_KEY_PATH to point to the correct directory."
+          @logger.error "Unable to find SSL key matching fingerprint if your SSL keys are not in ~/.ssh you can set the environment variable SSL_KEY_PATH to point to the correct directory.", :error
           return
         end
 

data/lib/minke/docker/consul.rb

@@ -1,18 +1,20 @@
 module Minke
   module Docker
     class Consul
-      def initialize health_check, service_discovery, consul_loader, docker_runner, network, project_name
-        @health_check = health_check
-        @service_discovery = service_discovery
-        @consul_loader = consul_loader
-        @docker_runner = docker_runner
-        @network = network
-        @project_name = project_name
+      def initialize args
+        @health_check = args[:health_check]
+        @service_discovery = args[:service_discovery]
+        @consul_loader = args[:consul_loader]
+        @docker_runner = args[:docker_runner]
+        @network = args[:network]
+        @project_name = args[:project_name]
+        @logger = args[:logger_helper]
       end
 
       ##
       # start_and_load_data config
       def start_and_load_data consul_config
+        @logger.info "Starting Consul"
         start
         wait_for_startup consul_config.url
         load_data consul_config.url, consul_config.config_file
@@ -21,6 +23,7 @@ module Minke
       ##
       # stop consul
       def stop
+        @logger.info "Stopping Consul"
         @docker_runner.stop_container @container
         @docker_runner.delete_container @container
       end

data/lib/minke/docker/docker_runner.rb

@@ -1,8 +1,9 @@
 module Minke
   module Docker
     class DockerRunner
-      def initialize network = nil
+      def initialize logger, network = nil
         @network = network ||= 'bridge'
+        @logger = logger
       end
 
       ##
@@ -43,7 +44,7 @@ module Minke
       ##
       # pull_image pulls a new copy of the given image from the registry
       def pull_image image_name
-      	puts "Pulling Image: #{image_name}"
+      	@logger.debug "Pulling Image: #{image_name}"
         ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
         ::Docker::Image.create('fromImage' => image_name)
       end
@@ -79,19 +80,18 @@ module Minke
           'PublishAllPorts' => true
         )
 
-        success = true
+        output = ''
 
         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|
-                stream.to_s == 'stdout' ? color = :green : color  = :red
-                puts "#{chunk.strip}".colorize(color)
-
-                if stream.to_s == "stderr"
-                  success = false
+                if chunk.index('[ERROR]') != nil # deal with hidden characters
+                  @logger.error chunk.gsub!(/\[.*\]/,'')
                 else
-                  success = true
+                  output += chunk.gsub!(/\[.*\]/,'') if output == ''
+                  output += chunk.gsub!(/\[.*\]/,'').prepend("       ") unless output == ''
+                  @logger.debug chunk.gsub!(/\[.*\]/,'')
                 end
             end
           end
@@ -100,6 +100,9 @@ module Minke
         container.start
 
         thread.join unless args[:deamon] == true
+        success = (container.json['State']['ExitCode'] == 0) ? true: false 
+
+        @logger.error(output) unless success 
 
       	return container, success
       end
@@ -107,8 +110,6 @@ module Minke
       ##
       # build_image creates a new image from the given Dockerfile and name
       def build_image dockerfile_dir, name
-        puts dockerfile_dir
-        puts name
         ::Docker.options = {:read_timeout => 6200}
         begin
           ::Docker::Image.build_from_dir(dockerfile_dir, {:t => name}) do |v|
@@ -117,9 +118,9 @@ module Minke
             $stdout.puts data unless data == nil
           end
         rescue => e
-          puts e
+          @logger.error e
           message = /.*{"message":"(.*?)"}/.match(e.to_s)
-          puts "Error: #{message[1]}" unless message == nil || message.length < 1
+          @logger.error "Error: #{message[1]}" unless message == nil || message.length < 1
         end
       end
 
@@ -132,7 +133,7 @@ module Minke
           begin
             container.delete()
           rescue => e
-            puts "Error: Unable to delete container: #{e}"
+            @logger.error "Error: Unable to delete container: #{e}"
           end
         end
       end

data/lib/minke/docker/health_check.rb

@@ -4,21 +4,22 @@ module Minke
     # HealthCheck checks health of a running container
     class HealthCheck
 
-      def initialize count=nil, pause=nil
+      def initialize logger, count=nil, pause=nil
         @count = count ||= 180
         @pause = pause ||= 1
         @successes = 2
+        @logger = logger
       end
 
       ##
       # waits until a 200 response is received from the given url
       def wait_for_HTTPOK url
-        puts "Waiting for server #{url} to start #{@count} attempts left"
+        @logger.debug "Waiting for server #{url} to start #{@count} attempts left"
 
         begin
           response = RestClient.send('get', url)
         rescue
-          puts 'Invalid response from server'
+          @logger.error 'Invalid response from server'
         end
 
         check_response response, url
@@ -46,13 +47,13 @@ module Minke
 
       def check_success url
         if @successes > 0 
-          puts "Server: #{url} passed health check, #{@successes} checks to go..."
+          @logger.debug "Server: #{url} passed health check, #{@successes} checks to go..."
 
           @successes -= 1
           sleep @pause
           wait_for_HTTPOK url
         else
-          puts "Server: #{url} healthy"
+          @logger.debug "Server: #{url} healthy"
         end
       end
 

data/lib/minke/generators/processor.rb

@@ -5,7 +5,6 @@ module Minke
     class Processor
 
       def self.load_generators
-        puts '# Loading installed generators'
         Gem::Specification.find_all.each do |spec|
           if spec.metadata != nil && spec.metadata['entrypoint'] != nil
             require spec.metadata['entrypoint']
@@ -13,7 +12,8 @@ module Minke
         end
       end
 
-      def initialize variables, docker_runner
+      def initialize variables, docker_runner, logger
+        @logger = logger
         @variables = variables
         @docker_runner = docker_runner
       end
@@ -22,8 +22,8 @@ module Minke
         generator = get_generator generator_name
 
         # process the files
-        puts '# Modifiying templates'
-        puts "#{generator.template_location}"
+        @logger.info '# Modifiying templates'
+        @logger.debug "#{generator.template_location}"
 
         process_directory generator.template_location, '**/*', output_folder, @variables.application_name
         process_directory generator.template_location, '**/.*', output_folder, @variables.application_name
@@ -37,15 +37,15 @@ module Minke
         end
 
         # write the shell script
-        Minke::Generators::write_bash_script output_folder + "/_build/minke.sh"
+        Minke::Generators::write_bash_script output_folder + "/_build/minke"
         Minke::Generators::create_rvm_files output_folder + "/_build/", @variables.application_name
       end
 
       def build_image docker_file
-        puts "## Building custom docker image"
+        @logger.info "## Building custom docker image"
 
         image_name = @variables.application_name + "-buildimage"
-        puts @docker_runner.build_image docker_file, image_name
+        @docker_runner.build_image docker_file, image_name
       end
 
       def fetch_image docker_image
@@ -54,12 +54,12 @@ module Minke
       end
 
       def run_command_in_container build_image, command
-        puts command
+        @logger.debug command
         begin
           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 "Unable to run command #{command}" unless success
+          @helper.fatal_error " #{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
@@ -69,7 +69,7 @@ module Minke
 
       def process_directory template_location, folder, output_folder, service_name
         Dir.glob("#{template_location}/#{folder}").each do |file_name|
-          puts "## Processing #{file_name}"
+          @logger.debug "## Processing #{file_name}"
           process_file template_location, file_name, output_folder, service_name
         end
       end

data/lib/minke/generators/register.rb

@@ -4,9 +4,8 @@ module Minke
 
     def register config
       puts "registered #{config.name}"
-
+      
       @@registrations.push(config)
-      #puts "registered #{config.template_location}"
     end
 
     def get_registrations

data/lib/minke/generators/shell_script.rb

@@ -1,7 +1,7 @@
 module Minke
   module Generators
     def write_bash_script path
-      FileUtils.cp(File.expand_path('../../scripts/minke.sh', __FILE__), path)
+      FileUtils.cp(File.expand_path('../../scripts/minke', __FILE__), path)
       File.chmod(0755, path)
     end
 

data/lib/minke/helpers/error.rb

@@ -4,7 +4,7 @@ module Minke
       ##
       # fatal_error aborts the current execute with the given message
       def fatal_error message
-        abort message
+        abort message.colorize(:red)
       end
 
     end

data/lib/minke/helpers/shell.rb

@@ -1,11 +1,27 @@
 module Minke
   module Helpers
     class Shell
+      def initialize logger
+        @logger = logger
+      end
+
       ##
       # Executes a shell command and returns the return status
       def execute command
-        puts command
-        system("#{command}")
+        @logger.debug command
+        
+        require 'open3'
+        cmd = 'ping www.google.com'
+        Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+          while line = stdout.gets
+            @logger.debug line
+          end
+          
+          exit_status = wait_thr.value
+          unless exit_status.success?
+            abort "FAILED !!! #{cmd}"
+          end
+        end
       end
 
       def execute_and_return command

data/lib/minke/scripts/{minke.sh → minke}

@@ -1,6 +1,6 @@
 #!/bin/bash
-MINKE_VERSION="1.12.9"
-ERROR="Please specify a command e.g. ./minke.sh rake app:test"
+MINKE_VERSION="1.13.0"
+ERROR="Please specify a command e.g. ./minke test"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')

data/lib/minke/tasks/build.rb

@@ -3,11 +3,12 @@ module Minke
     class Build < Task
 
       def run args = nil
-        puts "## Build application"
+        @logger.info "## Build application" 
+
         if  @generator_config.build_settings.build_commands.build != nil
           run_with_block do
             @generator_config.build_settings.build_commands.build.each do |command|
-              puts command.to_s
+              @logger.debug command.to_s
               run_command_in_container command
             end
           end

data/lib/minke/tasks/build_image.rb

@@ -3,7 +3,7 @@ module Minke
     class BuildImage < Task
 
       def run args = nil
-        puts "## Build image"
+        @logger.info "## Build image"
 
         @docker_runner.build_image @config.docker.application_docker_file, @config.application_name
       end

data/lib/minke/tasks/bundle.rb

@@ -4,10 +4,11 @@ module Minke
 
       def initialize args
         @shell_helper = args[:shell_helper]
+        @logger = args[:logger_helper]
       end
 
       def run args = nil
-        puts '### Install gems'
+        @logger.info '### Install gems'
         rvm = "#{ENV['HOME']}/.rvm/scripts/rvm"
         rvm_root = '/usr/local/rvm/scripts/rvm'
 
@@ -16,7 +17,7 @@ module Minke
 
         gemset = @shell_helper.read_file '.ruby-gemset'
 
-        puts "Using gemset #{gemset}"
+        @logger.info "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

data/lib/minke/tasks/cucumber.rb

@@ -3,7 +3,7 @@ module Minke
     class Cucumber < Task
 
       def run args = nil
-      	puts "## Running cucumber with tags #{args}"
+      	@logger.info "## Running cucumber with tags #{args}"
 
         compose_file = @config.compose_file_for(@task_name)
         compose_file = File.expand_path(compose_file)

data/lib/minke/tasks/fetch.rb

@@ -3,7 +3,7 @@ module Minke
     class Fetch < Task
 
       def run args = nil
-        puts '### Install generator dependencies'
+        @logger.info '### Fetching dependencies'
 
         if @generator_config.build_settings.build_commands.fetch != nil
           run_with_block do

data/lib/minke/tasks/push.rb

@@ -3,7 +3,7 @@ module Minke
     class Push < Task
 
       def run args = nil
-        puts "## Push image to registry"
+        @logger.info "## Push image to registry"
 
         url = @config.docker_registry.url
         user = @config.docker_registry.user

data/lib/minke/tasks/run.rb

@@ -3,7 +3,7 @@ module Minke
     class Run < Task
 
       def run args = nil
-        puts "## Run application with docker compose"
+        @logger.info "## Run application with docker compose"
 
         compose_file = @config.compose_file_for(@task_name)
         compose_file = File.expand_path(compose_file)
@@ -14,7 +14,7 @@ module Minke
             compose.up
             compose.logs
           rescue SystemExit, Interrupt
-            puts "Stopping...."
+            @logger.info "Stopping...."
             raise SystemExit
           ensure
             compose.down

data/lib/minke/tasks/task.rb

@@ -11,7 +11,7 @@ module Minke
         @task_runner            = args[:task_runner]
         @error_helper           = args[:error_helper]
         @shell_helper           = args[:shell_helper]
-        @logger_helper          = args[:logger_helper]
+        @logger                 = args[:logger_helper]
         @generator_config       = args[:generator_config]
         @docker_compose_factory = args[:docker_compose_factory]
         @consul                 = args[:consul]
@@ -25,7 +25,6 @@ module Minke
       # run_with_config executes the task steps for the given
       # - block containing custom actions
       def run_with_block
-        puts "Starting Consul"
         begin
           @docker_network.create
           @consul.start_and_load_data @task_settings.consul_loader unless @task_settings.consul_loader == nil
@@ -35,7 +34,6 @@ module Minke
 
           @task_runner.run_steps(@task_settings.post) unless @task_settings == nil || @task_settings.post == nil
         ensure
-          puts "Stopping Consul"
           @consul.stop unless @task_settings.consul_loader == nil
           @docker_network.remove
         end
@@ -45,6 +43,8 @@ module Minke
       # runs the given command in a docker container
       def run_command_in_container command
         begin
+          @logger.info "Running command: #{command}"
+
           settings = @generator_config.build_settings.docker_settings
           build_image = create_container_image
 
@@ -77,7 +77,6 @@ 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/tasks/test.rb

@@ -3,7 +3,7 @@ module Minke
     class Test < Task
 
       def run args = nil
-        puts "## Test application"
+      @logger.info "## Test application"
 
         run_with_block do
           @generator_config.build_settings.build_commands.test.each do |command|

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.12.9"
+  VERSION = "1.13.0"
 end

data/lib/minke.rb

@@ -17,10 +17,10 @@ require 'sshkey'
 require 'mkmf'
 
 require 'minke/version'
+require 'minke/command'
 
 require 'minke/helpers/copy'
 require 'minke/helpers/error'
-require 'minke/helpers/logger'
 require 'minke/helpers/rake'
 require 'minke/helpers/shell'
 
@@ -54,3 +54,35 @@ require 'minke/generators/shell_script'
 
 require 'minke/encryption/encryption'
 require 'minke/encryption/key_locator'
+
+module Minke
+  class Logging
+    @@debug = false
+    @@ret = "\n"
+    
+    def self.create_logger verbose = false
+      Logger.new(STDOUT).tap do |l|
+        l.datetime_format = ''
+        l.formatter = proc do |severity, datetime, progname, msg|
+          case severity
+          when 'ERROR'
+            s = "#{@@ret if @@debug}#{'ERROR'.colorize(:red)}: #{msg.chomp('')}\n"
+            @@debug = false
+            s
+          when 'INFO'
+            s = "#{@@ret if @@debug}#{'INFO'.colorize(:green)}: #{msg.chomp('')}\n"
+            @@debug = false
+            s
+          when 'DEBUG'
+            if verbose == true
+              "#{'DEBUG'.colorize(:yellow)}: #{msg.chomp('')}\n"
+            else
+              @@debug = true
+              "#{'.'.colorize(:yellow)}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.12.9
+  version: 1.13.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -221,6 +221,7 @@ files:
 - examples/config_go.yml
 - examples/config_swift.yml
 - lib/minke.rb
+- lib/minke/command.rb
 - lib/minke/config/config.rb
 - lib/minke/config/reader.rb
 - lib/minke/docker/consul.rb
@@ -239,11 +240,9 @@ files:
 - lib/minke/generators/shell_script.rb
 - lib/minke/helpers/copy.rb
 - lib/minke/helpers/error.rb
-- lib/minke/helpers/logger.rb
 - lib/minke/helpers/rake.rb
 - lib/minke/helpers/shell.rb
-- lib/minke/rake/app.rake
-- lib/minke/scripts/minke.sh
+- lib/minke/scripts/minke
 - lib/minke/tasks/build.rb
 - lib/minke/tasks/build_image.rb
 - lib/minke/tasks/bundle.rb
@@ -266,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.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Minke is a suite of rake tasks for building and testing microservices with

data/lib/minke/helpers/logger.rb

@@ -1,17 +0,0 @@
-module Minke
-  module Helpers
-    class Logger
-      def log message, level
-        ## implement logger implementation
-        case level
-        when :error
-          @logger.error message
-        when :info
-          @logger.info message
-        when :debug
-          @logger.debug message
-        end
-      end
-    end
-  end
-end

data/lib/minke/rake/app.rake

@@ -1,124 +0,0 @@
-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 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
-  end
-
-  desc "build application"
-  task :build => [:fetch] do
-    if @config.build != nil
-      runner = Minke::Tasks::Build.new create_dependencies :build
-      runner.run
-    end
-  end
-
-  desc "run unit tests"
-  task :test => [:build] do
-    if @config.test != nil
-      runner = Minke::Tasks::Test.new create_dependencies :test
-      runner.run
-    end
-  end
-
-  desc "build Docker image for application"
-  task :build_image => [:test] do
-    if @config.build != nil
-      runner = Minke::Tasks::BuildImage.new create_dependencies :build
-      runner.run
-    end
-  end
-
-  desc "run application with Docker Compose"
-  task :run do
-    if @config.run != nil
-      runner = Minke::Tasks::Run.new create_dependencies :run
-      runner.run
-    end
-  end
-
-  desc "build and run application with Docker Compose"
-  task :build_and_run => [:build_image, :run]
-
-  desc "run end to end Cucumber tests USAGE: rake app:cucumber[@tag]"
-  task :cucumber, [:feature] do |t, args|
-    if @config.cucumber != nil
-      runner = Minke::Tasks::Cucumber.new create_dependencies :cucumber
-      runner.run
-    end
-  end
-
-  desc "push built image to Docker registry"
-  task :push  do
-    runner = Minke::Tasks::Push.new create_dependencies :push
-    runner.run
-  end
-
-  def create_dependencies task
-    project_name = "minke#{SecureRandom.urlsafe_base64(12)}".downcase.gsub(/[^0-9a-z ]/i, '')
-    network_name = ENV['DOCKER_NETWORK'] ||= "#{project_name}_default"
-    ENV['DOCKER_PROJECT'] = project_name
-    ENV['DOCKER_NETWORK'] = network_name
-
-    variables = Minke::Generators::ConfigVariables.new.tap do |v|
-      v.application_name = @config.application_name
-      v.namespace = @config.namespace
-      v.src_root = File.expand_path('../')
-    end
-
-    Minke::Generators::Processor.load_generators
-    processor = Minke::Generators::Processor.new variables, @docker_runner
-
-    generator_config = processor.get_generator @config.generator_name
-
-    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)
-    })
-
-    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),
-      Minke::Docker::DockerRunner.new(network_name),
-      network_name,
-      project_name
-    )
-
-    network = Minke::Docker::Network.new(
-      network_name,
-      Minke::Helpers::Shell.new
-    )
-
-    return {
-      :config                 => @config,
-      :task_name              => task,
-      :docker_runner          => Minke::Docker::DockerRunner.new(network_name),
-      :task_runner            => task_runner,
-      :error_helper           => Minke::Helpers::Error.new,
-      :shell_helper           => Minke::Helpers::Shell.new,
-      :logger_helper          => Minke::Helpers::Logger.new,
-      :generator_config       => generator_config,
-      :docker_compose_factory => Minke::Docker::DockerComposeFactory.new(Minke::Helpers::Shell.new, project_name, network_name),
-      :consul                 => consul,
-      :docker_network         => network,
-      :health_check           => Minke::Docker::HealthCheck.new,
-      :service_discovery      => Minke::Docker::ServiceDiscovery.new(project_name, Minke::Docker::DockerRunner.new, network_name)
-    }
-  end
-end