minke 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY0MTRkNGJkNjIzNWVjZWExZGI3YzEzZTg5NWU2NmY1MTNjN2Q3NQ==
+    MzBmMDVmMWY5ZTI1ODNlMGFhZWM1MGJhNWViODdhNGI3ZDU3NGY5Yw==
   data.tar.gz: !binary |-
-    NjU0M2JjMjMzNDUyNGFlOTg5ODE3ZTE3NzYyM2E5NDhhNDBlOGJjNA==
+    NDgxZDY1MTBkZDgyY2ZiNjVkM2I5ODM3MTdlZjExZjc0ODk1OWU1MQ==
 SHA512:
   metadata.gz: !binary |-
-    NWY0NjJiZmIxYmI3NGNkMDk3ZDIzNTEwZTc1M2NjNGJjMjA3OTVmNTNhMTlj
-    YzVmZjFmMTRlNDI5ZGMyYTk1NDY4Yzg4Y2E0ZmQwZTE2Mjk1Njg3ZGY1OWQ2
-    NDc1N2NmMGI4NzNiNDFlZWQ4YWVjNjMyYmI1OGI5Y2ZjMzBkNjc=
+    ODkwMzE5NTU3ODg5YjJhNGUwYWI3NDNiZWNkYWRiNTdmNmIxOWVkY2YxYzll
+    NTYzMjE1NWU2ZGYzZDU5Y2M5YzczZTZkM2NjMDdmZjBmYWRjOTA4NDM1YWM5
+    NmM3N2NiNzAyOGIyZTQzMGY4YzdiMGVlYjU4YmY5MjdlMDRhM2E=
   data.tar.gz: !binary |-
-    MzVhM2U2Njc3OWVjMDc4MTY4ZjJiMDIxNzNhZjcyZGVlNDQzZWZkMGU1MjY5
-    YWNhZGIxZjg0ZDNjYTk1ZTk1ZmRlN2NmYWI2MzM3Yzc2MTEyMDU0YjI4ODM4
-    NTAwMDhmZmZkNWE4NzNiOTBjOGU1ZjZkMWVhNmM1ZGE2MGQ5Y2E=
+    YzVlMzdhNTQ5Y2YzNjFkY2Y1YTI3MTYwNjllNzIxN2Y0ZTI2MTI0YmI2NjQx
+    YTE4ODFhOWIyNmU3ZmNlZjkwMDM0NTUxNGM5ZTg2ZGU3N2FmZTViODI4MTBm
+    YjBhMzQ3MjMwMzQxNDIwMjUxYTRiZmQyNzg3ODUyYTdmMDcxYjA=

data/README.md

@@ -7,13 +7,19 @@ Version 1 is pretty much a complete rewrite which supports new generator plugins
 
 Version 1.0 is not compatible with previous versions of minke however upgrading is not so painful, full instructions will be updated shortly.   In the mean time please continue to use the previous stable 0.1.5 [https://github.com/nicholasjackson/minke/tree/0.1.5](https://github.com/nicholasjackson/minke/tree/0.1.5).
 
-**Version 1.0**  
-[![Build Status](https://travis-ci.org/nicholasjackson/minke.svg?branch=master)](https://travis-ci.org/nicholasjackson/minke)
+**Version 1.0.1**  
+[![Build Status](https://travis-ci.org/nicholasjackson/minke.svg?branch=master)](https://travis-ci.org/nicholasjackson/minke)  
+
+[![Code Climate](https://codeclimate.com/github/nicholasjackson/minke/badges/gpa.svg)](https://codeclimate.com/github/nicholasjackson/minke)  
+
+[![Test Coverage](https://codeclimate.com/github/nicholasjackson/minke/badges/coverage.svg)](https://codeclimate.com/github/nicholasjackson/minke/coverage)  
+
+[![Issue Count](https://codeclimate.com/github/nicholasjackson/minke/badges/issue_count.svg)](https://codeclimate.com/github/nicholasjackson/minke)
 
 Minke is an opinionated build system for Microservices and Docker, like a little envelope of quality it scaffolds the build, run and test (unit test and functional tests) phases of your microservice project allowing you to simply run and test your images using Docker Compose.  Currently supporting Google's Go, and experimental support for Swift, extensions are planned for Node.js or HTML / Javascript sites with Grunt or Gulp based builds.
 
 ## Generators
-- Go - Go Microservice Template
+- Go - [Go Microservice Template](https://github.com/nicholasjackson/minke-generator-go)
 - Java - Spring Boot
 - Swift - Kitura (Coming Soon)
 - Node - ExpressJS (Coming Soon)

data/bin/minke

@@ -36,7 +36,7 @@ variables = Minke::Generators::ConfigVariables.new.tap do |v|
   v.namespace = options[:namespace]
   v.src_root = File.expand_path(options[:output]) unless options[:output] == nil
 end
-processor = Minke::Generators::Processor.new variables
+processor = Minke::Generators::Processor.new variables, Minke::Docker::DockerRunner.new
 processor.load_generators
 
 

data/lib/minke/docker/docker_runner.rb

@@ -48,6 +48,10 @@ module Minke
       def create_and_run_container image, volumes, environment, working_directory, cmd
       	# update the timeout for the Excon Http Client
       	# set the chunk size to enable streaming of log files
+        #puts working_directory
+        puts volumes
+        #puts environment
+
         ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
         container = ::Docker::Container.create(
       		'Image' => image,

data/lib/minke/generators/processor.rb

@@ -4,8 +4,9 @@ module Minke
     # Process handles the creation of new projects from a generator template.
     class Processor
 
-      def initialize variables
+      def initialize variables, docker_runner
         @variables = variables
+        @docker_runner = docker_runner
       end
 
       def process generator_name, output_folder
@@ -19,43 +20,38 @@ module Minke
         process_directory generator.template_location, '**/.*', output_folder, @variables.application_name
 
         # run generate command if present
-        if generator.generate_settings != nil && generator.generate_settings.command
-          build_image unless generator.generate_settings.command.docker_file == nil
-          fetch_image unless generator.generate_settings.command.docker_image == nil
+        puts generator.inspect
+        if generator.generate_settings != nil && generator.generate_settings.command != nil
+          image = build_image generator.generate_settings.docker_file  unless generator.generate_settings.docker_file == nil
+          image = fetch_image generator.generate_settings.docker_image unless generator.generate_settings.docker_image == nil
 
-          #run_command_in_container
+          run_command_in_container image, generator.generate_settings.command unless generator.generate_settings.command == nil
         end
       end
 
-      def build_image
+      def build_image docker_file
         puts "## Building custom docker image"
 
-        image_name = APPLICATION_NAME + "-buildimage"
-        Docker.options = {:read_timeout => 6200}
-        image = Docker::Image.build_from_dir generator.generate_command_docker_file, {:t => image}
+        image_name = @variables.application_name + "-buildimage"
+        puts @docker_runner.build_image docker_file, image_name
       end
 
-      def fetch_image
-        Minke::Docker.pull_image generator.generate_command_docker_image unless Minke::Docker.find_image generator.generate_command_docker_image
-        image_name = generator.generate_command_docker_image
+      def fetch_image docker_image
+        @docker_runner.pull_image docker_image unless @docker_runner.find_image docker_image
+        docker_image
       end
 
-      def run_command_in_container
+      def run_command_in_container build_image, command
+        puts command
         begin
-          config = {
-            :build_config => {
-              :docker => {
-                :image => image_name,
-                :binds => ["#{File.expand_path(options[:output])}:/src"],
-                :working_directory => "/src"
-              }
-            }
-          }
+          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
           #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
-        #  Minke::Docker.delete_container container
+          @docker_runner.delete_container container
         end
       end
 

data/lib/minke/helpers/helper.rb

@@ -12,7 +12,7 @@ module Minke
         Dir.mkdir directory unless Dir.exist? to
         FileUtils.cp from, to
       end
- 
+
       ##
       # invoke a rake task
       def invoke_task task
@@ -37,7 +37,7 @@ module Minke
 
       ##
       # waits until a 200 response is received from the given url
-      def wait_for_HTTPOK url, count, successes = 0
+      def wait_for_HTTPOK url, count, successes = 3
         begin
           response = RestClient.send("get", url)
         rescue

data/lib/minke/rake/app.rake

@@ -3,36 +3,51 @@ namespace :app do
   desc "fetch dependent packages"
   task :fetch => ['config:set_docker_env', 'docker:fetch_images'] do
     create_dependencies
-    runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.fetch != nil
+      runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "build application"
   task :build => [:fetch] do
     create_dependencies
-    runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.build != nil
+      runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "run unit tests"
   task :test => [:build] do
     create_dependencies
-    runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.test != nil
+      runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "build Docker image for application"
   task :build_image => [:test] do
     create_dependencies
-    runner = Minke::Tasks::BuildImage.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.build != nil
+      runner = Minke::Tasks::BuildImage.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "run application with Docker Compose"
   task :run => ['config:set_docker_env'] do
     create_dependencies
-    runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.run != nil
+      runner = Minke::Tasks::Run.new @config, :run, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "build and run application with Docker Compose"
@@ -41,8 +56,11 @@ namespace :app do
   desc "run end to end Cucumber tests USAGE: rake app:cucumber[@tag]"
   task :cucumber, [:feature] => ['config:set_docker_env'] do |t, args|
     create_dependencies
-    runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
-    runner.run
+
+    if @config.cucumber != nil
+      runner = Minke::Tasks::Cucumber.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner.run
+    end
   end
 
   desc "push built image to Docker registry"
@@ -55,6 +73,7 @@ namespace :app do
   def create_dependencies
     @system_runner = Minke::Docker::SystemRunner.new
     @docker_compose_factory ||= Minke::Docker::DockerComposeFactory.new @system_runner
+    @docker_runner ||= Minke::Docker::DockerRunner.new
 
     if @config == nil
       reader = Minke::Config::Reader.new
@@ -65,15 +84,14 @@ namespace :app do
       variables = Minke::Generators::ConfigVariables.new.tap do |v|
         v.application_name = @config.application_name
         v.namespace = @config.namespace
-        v.src_root = File.expand_path('../', __FILE__)
+        v.src_root = File.expand_path('../')
       end
 
-      processor = Minke::Generators::Processor.new variables
+      processor = Minke::Generators::Processor.new variables, @docker_runner
       processor.load_generators
       @generator_config = processor.get_generator @config.generator_name
     end
 
-    @docker_runner ||= Minke::Docker::DockerRunner.new
     @logger ||= Logger.new(STDOUT)
     @helper ||= Minke::Helpers::Helper.new
   end

data/lib/minke/tasks/build.rb

@@ -6,7 +6,7 @@ module Minke
         puts "## Build application"
         run_with_block do
           @generator_settings.build_settings.build_commands.build.each do |command|
-            puts command
+            puts command.to_s
           	run_command_in_container command
           end
         end

data/lib/minke/tasks/task.rb

@@ -57,7 +57,7 @@ module Minke
       end
 
       def wait_for_health_check url
-        @helper.wait_for_HTTPOK build_address(url), 3, 0
+        @helper.wait_for_HTTPOK build_address(url), 0, 3
       end
 
       def copy_assets assets

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler