minke 1.13.20 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811e42427f6cae2eeca648798c896f854dd27696
-  data.tar.gz: e526903241f2dcc47cfba0d034766a6ada9d75eb
+  metadata.gz: a75b7d20dfa4be64d0c2624adce3b9f9e25ec3ea
+  data.tar.gz: 681b7ff115b1b9c411cae5cd893f1d627f11c531
 SHA512:
-  metadata.gz: ac68a11e3ca4f3d397381d507d672c6b95c4ce2a01629be346d83c422647f91dd09e50a06e759428f29df1c496225eafa5bcfc4b573bc168acb2dba8f6ac7c49
-  data.tar.gz: bbe73b673a52fd539be0d145c08e6e2341fa9101e4f8ac901e7acfc152b1431f0a47865aa36e8a7243a3aa2c2ea899d3ef5b3a5155c66fad1c24c2df250c4f78
+  metadata.gz: 40f40d0ad96bb89401230a08b99001e98993accb2cfd72c899ba27bf86f506efedec85d6de500186a52b5994801875df6eb719c2d82e849f72f0a4eb197795f1
+  data.tar.gz: ec4dd302f0844486acbc3d816d377bb03e7a2470a5390f03244046ba36c14322d31e65dfd8ac3adc820a63871cf3c7f6e9999c815eb1411cf910e012f4164420

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

data/bin/minke

@@ -39,6 +39,7 @@ Commonly used command are:
    build_image :     build a docker image
    push        :     push built image to the registry
    encrypt     :     encrypt secrets with a private key
+   shell       :     start a shell session inside the build container
 See 'minke COMMAND --help' for more information on a specific command.
 HELP
 
@@ -155,6 +156,8 @@ when "run"
   doCommand(:run, options[:verbose], options[:config])
 when "push"
   doCommand(:push, options[:verbose], options[:config])
+when "shell"
+  doCommand(:shell, options[:verbose], options[:config])
 when "generate"
   if options[:generator] == nil || options[:output] == nil || options[:name] == nil || options[:namespace] == nil
     puts "Please specify options use: minke generate --help for help on command line options"

data/docker/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.13.20"
+gem 'minke', "= 1.14.0"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.6"

data/lib/minke/command.rb

@@ -18,12 +18,12 @@ module Minke
       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
-
+#      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 ({
         :ruby_helper       => Minke::Helpers::Ruby.new,
         :copy_helper       => Minke::Helpers::Copy.new,
@@ -74,7 +74,8 @@ module Minke
         :run         => Minke::Tasks::Run.new(dependencies),
         :build_image => Minke::Tasks::BuildImage.new(dependencies),
         :cucumber    => Minke::Tasks::Cucumber.new(dependencies),
-        :push        => Minke::Tasks::Push.new(dependencies)
+        :push        => Minke::Tasks::Push.new(dependencies),
+        :shell       => Minke::Tasks::Shell.new(dependencies)
       }
     end
 
@@ -128,5 +129,11 @@ module Minke
       tasks[:push].run
     end
 
+    def shell
+      if config.shell != nil
+        tasks = create_tasks :shell
+        tasks[:shell].run
+      end
+    end
   end
 end

data/lib/minke/config/config.rb

@@ -70,6 +70,13 @@ module Minke
       # [Optional] if not provided the cucumber commands will not be executed
       attr_accessor :cucumber
 
+      ##
+      # Settings for the build shell phase
+      # instance of Minke::Config::Task
+      #
+      # [Optional] if not provided the shell commands will not be executed
+      attr_accessor :shell
+
       ##
       # Returns the docker_compose file for the given section,
       # if the section overrides application_compose_file then this is returned

data/lib/minke/config/reader.rb

@@ -31,6 +31,8 @@ module Minke
         config.run      = read_task_section file['run'], config.docker      unless file['run'] == nil
         config.cucumber = read_task_section file['cucumber'], config.docker unless file['cucumber'] == nil
 
+        config.shell = read_task_section file['shell'], config.docker unless file['shell'] == nil
+
         return config
       end
 

data/lib/minke/docker/docker_runner.rb

@@ -76,7 +76,7 @@ module Minke
       		"Env"             => args[:environment],
       		'WorkingDir'      => args[:working_directory],
           'NetworkMode'     => @network,
-          'name'        => args[:name],
+          'name'            => args[:name],
           'PublishAllPorts' => true
         )
 
@@ -97,14 +97,48 @@ module Minke
           end
         end
 
-        
-
         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
+      
+      #
+      # create_and_run_blocking_container starts a conatainer of the given image name and executes a command, this method blocks until the container exits
+      #
+      # Returns:
+      # - Docker::Container
+      # - sucess (true if command succeded without error)
+      def create_and_run_blocking_container args
+      	# update the timeout for the Excon Http Client
+      	# set the chunk size to enable streaming of log files
+        ::Docker.options = {:chunk_size => 1, :read_timeout => 3600}
+        container = ::Docker::Container.create(
+      		'Image'           => args[:image],
+      		'Cmd'             => args[:command],
+      		"Binds"           => args[:volumes],
+      		"Env"             => args[:environment],
+      		'WorkingDir'      => args[:working_directory],
+          'name'            => args[:name],
+          'NetworkMode'     => @network,
+          "OpenStdin"       => true,
+          "StdinOnce"       => true,
+          "Tty"             => true,
+          'PublishAllPorts' => true
+        )
+
+        container.start
+      
+        STDIN.raw do |stdin|
+          container.attach(stdin: stdin, tty: true) do |chunk|
+            print chunk
+          end
+        end
+
+        success = (container.json['State']['ExitCode'] == 0) ? true: false 
         @logger.error(output) unless success 
 
       	return container, success

data/lib/minke/tasks/shell.rb

@@ -0,0 +1,31 @@
+module Minke
+  module Tasks
+    class Shell < Task
+
+      def run args = nil
+        @logger.info "## Run shell" 
+        @logger.info "## Run application with docker compose"
+
+        compose_file = @config.compose_file_for(@task_name)
+        compose_file = File.expand_path(compose_file)
+        compose = @docker_compose_factory.create compose_file unless compose_file == nil
+        
+        run_with_block do |pre_tasks, post_tasks|
+          begin
+            compose.up
+            pre_tasks.call
+            @logger.info "## Shell open to build container"
+            run_command_in_container('/bin/sh', true)
+          rescue SystemExit, Interrupt
+            @logger.info "Stopping...."
+            raise SystemExit
+          ensure
+            compose.down
+            post_tasks.call
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/minke/tasks/task.rb

@@ -63,7 +63,7 @@ module Minke
 
       ##
       # runs the given command in a docker container
-      def run_command_in_container command
+      def run_command_in_container command, blocking = false
         begin
           @logger.info "Running command: #{command}"
           settings = @generator_config.build_settings.docker_settings
@@ -85,7 +85,12 @@ module Minke
             :environment       => environment,
             :working_directory => working_directory
           }
-          container, success = @docker_runner.create_and_run_container args
+
+          if blocking == false
+            container, success = @docker_runner.create_and_run_container args
+          else 
+            container, success = @docker_runner.create_and_run_blocking_container args
+          end
 
           # throw exception if failed
           raise "Unable to run command #{command}" unless success

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.20"
+  VERSION = "1.14.0"
 end

data/lib/minke.rb

@@ -16,6 +16,7 @@ require 'securerandom'
 require 'sshkey'
 require 'mkmf'
 require 'open3'
+require "io/console"
 
 require 'minke/version'
 require 'minke/command'
@@ -45,6 +46,7 @@ require 'minke/tasks/push'
 require 'minke/tasks/run'
 require 'minke/tasks/test'
 require 'minke/tasks/build_image'
+require 'minke/tasks/shell'
 
 require 'minke/generators/config'
 require 'minke/generators/config_processor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.20
+  version: 1.14.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -279,6 +279,7 @@ files:
 - lib/minke/tasks/fetch.rb
 - lib/minke/tasks/push.rb
 - lib/minke/tasks/run.rb
+- lib/minke/tasks/shell.rb
 - lib/minke/tasks/task.rb
 - lib/minke/tasks/task_runner.rb
 - lib/minke/tasks/test.rb