minos 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3edf8ef19ced58587308297037a6e8b97f52bc7c8ac7b3860103f75590ce1ee
-  data.tar.gz: 0eae29c964734492960f12f895bcd6427a682bf7072bbffc19c40af64ae1dd02
+  metadata.gz: ed42480e69026ee8407a729c8448ab478dda30a41df536fd33dbf54ab34b14da
+  data.tar.gz: c28143cbd6fbe7a9b66bcb70b8efd15d0b1e2e14402ce3546a5de2258b3a63df
 SHA512:
-  metadata.gz: 80205457db0bd8e437564c0327bcea5ce5f1c103e2366d51169256068579326c92899291a13e4d2f4dc2f97d57a6799fd6dab2936f15b269c2117cf2e086f454
-  data.tar.gz: ed251dbd5fbf9e06495afe41d16127b7115f0ea5474f8d45ea8f9c963f015b80ab7fb8ef2b3c69f39bf3b84783cb1dfe6b4ccbc03e89ae8dc17b142319db8506
+  metadata.gz: '019fcfb42de45eeb468ffbc16258c65f9ed5cf26f58c74ff7ab6c5d3b25de055b47793eefe417968d68641b1c8976980b835e0cd4eee4a3b501b4c2fcd8b3455'
+  data.tar.gz: 9d86167b076b6d232e3c3d67e90b4b261cb95be76db440f3ea35f60a31d76cc9bd517b2eaa28b01d3c1bb270ef90642af7d314a4baf45718961a7da8087e34c2

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minos (0.3.1)
+    minos (0.3.3)
       activesupport (~> 5.2)
       dry-matcher (~> 0.7)
       dry-monads (~> 1.2)
@@ -15,6 +15,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.1.4)
     dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
@@ -26,7 +27,11 @@ GEM
       dry-equalizer
     i18n (1.5.3)
       concurrent-ruby (~> 1.0)
+    method_source (0.9.2)
     minitest (5.11.3)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -39,6 +44,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   minos!
+  pry
   rake (~> 10.0)
 
 BUNDLED WITH

data/examples/Dockerfile

@@ -1,6 +1,6 @@
 ######################
 # Stage: builder
-FROM busybox as builder
+FROM nginx as builder
 
 ENV HOME /home/app
 WORKDIR $HOME
@@ -11,7 +11,7 @@ CMD ["ls", "-l"]
 
 ###############################
 # Stage release
-FROM busybox as release
+FROM nginx as release
 
 ENV HOME /home/app
 WORKDIR $HOME

data/examples/minos.yaml

@@ -1,7 +1,7 @@
 build:
   artifacts:
   - name: builder
-    image: textmasterapps/busybox
+    image: textmasterapps/nginx
     tags:
     - "$TARGET-$REVISION"
     - "$TARGET-latest"
@@ -10,11 +10,11 @@ build:
       tag: "$IMAGE:$TARGET" # $IMAGE and $TARGET are automatically populated as env vars for you
       target: builder
       cacheFrom:
-      - textmasterapps/busybox:builder
-      - textmasterapps/busybox:builder-$REVISION
-      - textmasterapps/busybox:builder-latest
+      - textmasterapps/nginx:builder
+      - textmasterapps/nginx:builder-$REVISION
+      - textmasterapps/nginx:builder-latest
   - name: release
-    image: textmasterapps/busybox
+    image: textmasterapps/nginx
     tags:
     - "$REVISION" # you can reference ENV variables from your shell
     - "latest"
@@ -26,7 +26,7 @@ build:
         ENV: "production"
         REVISION: "$REVISION"
       cacheFrom:
-      - textmasterapps/busybox:builder
-      - textmasterapps/busybox:release
-      - textmasterapps/busybox:$REVISION
-      - textmasterapps/busybox:latest
+      - textmasterapps/nginx:builder
+      - textmasterapps/nginx:release
+      - textmasterapps/nginx:$REVISION
+      - textmasterapps/nginx:latest

data/lib/minos/artifact.rb

@@ -1,8 +1,13 @@
+require 'open3'
+require 'minos/utils'
 require 'active_support/core_ext/string/inflections'
 
 module Minos
   class Artifact
-    include Dry::Monads::Result::Mixin
+    include Dry::Monads::Task::Mixin
+    include Dry::Monads::List::Mixin
+    include Dry::Monads::Do.for(:build, :push)
+    include Thor::Shell
 
     attr_reader :artifact, :options
 
@@ -15,63 +20,108 @@ module Minos
       artifact['name']
     end
 
-    def pull
-      caches.map do |cache|
-        docker_pull(cache)
-      end
-    end
-
     def build
-      docker_build
+      yield List::Task[
+        *caches.map.each_with_index { |cache, i| docker_pull(i, cache) }
+      ]
+      .traverse
+      .bind { |_| docker_build }
+      .to_result
     end
 
     def push
-      docker_push
+      yield List::Task[
+        *tags.map.each_with_index { |tag, i| docker_push(i, tag) }
+      ]
+      .traverse
+      .to_result
     end
 
     private
 
-    def docker_pull(cache)
-      if run "docker inspect #{cache} -f '{{json .ID}}' > /dev/null 2>&1 || docker pull #{cache} 2> /dev/null"
-        Success(cache)
-      else
-        Failure(cache)
-      end
+    def docker_pull(i, cache)
+      Task[:io, &-> {
+        color = select_color(i)
+        print "Pulling #{cache}...", color: color
+        if run "docker inspect #{cache} -f '{{json .ID}}' > /dev/null 2>&1 || docker pull #{cache} 2> /dev/null", color: color
+          print "Using #{cache}", color: color
+        else
+          # noop
+        end
+      }]
     end
 
     def docker_build
-      if run "docker build #{to_args(docker)} ."
-        Success(name)
-      else
-        Failure(name)
-      end
+      Task[:io, &-> {
+        color = :green
+        print "Building #{target}...", color: color
+        if run "docker build --rm #{Minos::Utils.to_args(docker)} .", color: color
+          print "Successfully built #{target}", color: color
+        else
+          print "Failed building #{target}", :red
+          raise StandardError.new($?)
+        end
+      }]
     end
 
-    def docker_push
-      tags.map do |tag|
-        if run "docker tag #{image}:#{target} #{image}:#{tag} && docker push #{image}:#{tag}"
-          Success("#{image}:#{tag}")
+    def docker_push(i, tag)
+      Task[:io, &-> {
+        color = select_color(i)
+        print "Pushing #{image}:#{tag}...", color: color
+        if run "docker tag #{image}:#{target} #{image}:#{tag} && docker push #{image}:#{tag}", color: color
+          print "Successfully pushed #{image}:#{tag}", color: color
         else
-          Failure("#{image}:#{tag}")
+          print "Failed pushing #{image}:#{tag}", :red
+          raise StandardError.new($?)
+        end
+      }]
+    end
+
+    def run(cmd, color: colors.first)
+      Open3.popen3("#{Minos::Utils.to_envs(env)} ; #{cmd}") do |stdin, stdout, stderr, wait_thr|
+        t_out = Thread.new do
+          while line = stdout.gets do
+            print(line, color: color)
+          end
+        end
+
+        t_err = Thread.new do
+          while line = stderr.gets do
+            print(line, color: :red)
+          end
         end
+
+        wait_thr.join
+        t_err.join
+        t_out.join
+
+        stdin.close
+        stdout.close
+        stderr.close
+
+        wait_thr.value.success?
       end
     end
 
-    def run(cmd)
-      system("#{envs_as_cmd} && #{cmd}")
+    def print(msg, color: colors.first)
+      say_status(name, msg, color)
+    end
+
+    def select_color(i)
+      colors[i % colors.count + 1]
+    end
+
+    def colors
+      %i(blue cyan yellow magenta)
     end
 
-    def envs
+    def env
       {
         'IMAGE'  => image,
         'TARGET' => target,
       }
     end
 
-    def envs_as_cmd
-      envs.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
-    end
-
     def docker
       artifact['docker']
     end
@@ -91,22 +141,5 @@ module Minos
     def tags
       artifact['tags'].to_a
     end
-
-    def to_args(args)
-      args.map do |key, value|
-        case value
-        when Array
-          value.map do |v|
-            "--#{key.underscore.gsub('_', '-')} #{v}"
-          end
-        when Hash
-          value.map do |k, v|
-            "--#{key.underscore.gsub('_', '-')} #{k}=#{v}"
-          end
-        else
-          "--#{key.underscore.gsub('_', '-')} #{value}"
-        end
-      end.flatten.join(' ')
-    end
   end
 end

data/lib/minos/cli.rb

@@ -1,27 +1,49 @@
 module Minos
   class CLI < Thor
-    class_option :manifest, default: "./minos.yaml", desc: "Manifest config file describing docker artifacts"
-    class_option :only, type: :array, default: [], desc: "Process only given artifacts"
-    class_option :except, type: :array, default: [], desc: "Process all but given artifacts"
+    include Thor::Shell
 
     desc "build", "Build docker artifacts specified in the manifest"
+    option :manifest, default: "./minos.yaml", desc: "Manifest config file describing docker artifacts"
+    option :only, type: :array, default: [], desc: "Process only given artifacts"
+    option :except, type: :array, default: [], desc: "Process all but given artifacts"
     def build
-      invoke 'minos:docker:build', []
+      artifacts.each do |a|
+        artifact = Artifact.new(a, options: options)
+        artifact.build
+      end
     end
 
     desc "push", "Publish docker artifacts specified in the manifest"
+    option :manifest, default: "./minos.yaml", desc: "Manifest config file describing docker artifacts"
+    option :only, type: :array, default: [], desc: "Process only given artifacts"
+    option :except, type: :array, default: [], desc: "Process all but given artifacts"
     def push
-      invoke 'minos:docker:push', []
-    end
-
-    desc "deploy", "Deploy docker artifacts specified in the manifest"
-    def deploy
-      invoke 'minos:k8s:deploy', []
+      artifacts.each do |a|
+        artifact = Artifact.new(a, options: options)
+        artifact.push
+      end
     end
 
     desc "version", "Display Minos version"
     def version
       puts Minos::VERSION
     end
+
+    private
+
+    def artifacts
+      artifacts = parse['build']['artifacts'].to_a
+      artifacts.reject! { |a| options[:except].include?(a['name']) } if options[:except].count > 0
+      artifacts.select! { |a| options[:only].include?(a['name']) } if options[:only].count > 0
+      artifacts
+    end
+
+    def parse
+      @parse ||= YAML.load(read)
+    end
+
+    def read
+      File.read(options[:manifest])
+    end
   end
 end

data/lib/minos/utils.rb

@@ -0,0 +1,26 @@
+module Minos
+  class Utils
+    # Flatten args as an array, hash or string into CLI args.
+    def self.to_args(args)
+      args.map do |key, value|
+        case value
+        when Array
+          value.map do |v|
+            "--#{key.underscore.gsub('_', '-')} #{v}"
+          end
+        when Hash
+          value.map do |k, v|
+            "--#{key.underscore.gsub('_', '-')} #{k}=#{v}"
+          end
+        else
+          "--#{key.underscore.gsub('_', '-')} #{value}"
+        end
+      end.flatten.join(' ')
+    end
+
+    # Flatten env as hash into shell's environment variables.
+    def self.to_envs(env)
+      env.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
+    end
+  end
+end

data/lib/minos/version.rb

@@ -1,3 +1,3 @@
 module Minos
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/minos.rb

@@ -1,11 +1,11 @@
 require 'yaml'
 require 'thor'
-require "dry/monads/result"
-require "dry/matcher/result_matcher"
+require 'dry/monads/task'
+require 'dry/monads/result'
+require 'dry/monads/list'
+require 'dry/monads/do'
 
 require 'minos/artifact'
-require 'minos/docker'
-require 'minos/k8s'
 require 'minos/cli'
 require 'minos/version'
 

data/minos.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minos
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.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'
 description: Easy and repeatable Kubernetes deployment based on Docker images
 email:
 - pierre-louis@textmaster.com
@@ -103,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -117,8 +132,7 @@ files:
 - lib/minos.rb
 - lib/minos/artifact.rb
 - lib/minos/cli.rb
-- lib/minos/docker.rb
-- lib/minos/k8s.rb
+- lib/minos/utils.rb
 - lib/minos/version.rb
 - minos.gemspec
 homepage: https://github.com/textmaster/minos
@@ -141,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Easy and repeatable Kubernetes deployment based on Docker images

data/lib/minos/docker.rb

@@ -1,75 +0,0 @@
-module Minos
-  class Docker < Thor
-    include Thor::Shell
-
-    class_option :manifest, default: "./minos.yaml", desc: "Manifest config file describing docker artifacts"
-    class_option :only, type: :array, default: [], desc: "Process only given artifacts"
-    class_option :except, type: :array, default: [], desc: "Process all but given artifacts"
-
-    desc "build", "Build docker artifacts specified in the manifest"
-    def build
-      artifacts.each do |a|
-        artifact = Artifact.new(a, options: options)
-
-        # Pull
-        artifact.pull.each do |result|
-          Dry::Matcher::ResultMatcher.(result) do |m|
-            m.success do |name|
-              say_status artifact.name, "Using #{name}"
-            end
-            m.failure do |name|
-              # noop
-              # failure here means we don't have docker image locally
-            end
-          end
-        end
-
-        # Build
-        Dry::Matcher::ResultMatcher.(artifact.build) do |m|
-          m.success do |name|
-            say_status artifact.name, "Successfully built #{name}"
-          end
-          m.failure do |name|
-            say_status artifact.name, "Failed building #{name}", :red
-            exit 1
-          end
-        end
-      end
-    end
-
-    desc "push", "Publish docker artifacts specified in the manifest"
-    def push
-      artifacts.each do |a|
-        artifact = Artifact.new(a, options: options)
-        artifact.push.each do |result|
-          Dry::Matcher::ResultMatcher.(result) do |m|
-            m.success do |name|
-              say_status artifact.name, "Successfully pushed #{name}"
-            end
-            m.failure do |name|
-              say_status artifact.name, "Failed pushing #{name}", :red
-              exit 1
-            end
-          end
-        end
-      end
-    end
-
-    private
-
-    def artifacts
-      artifacts = parse['build']['artifacts'].to_a
-      artifacts.reject! { |a| options[:except].include?(a['name']) } if options[:except].count > 0
-      artifacts.select! { |a| options[:only].include?(a['name']) } if options[:only].count > 0
-      artifacts
-    end
-
-    def parse
-      @parse ||= YAML.load(read)
-    end
-
-    def read
-      File.read(options[:manifest])
-    end
-  end
-end

data/lib/minos/k8s.rb

@@ -1,8 +0,0 @@
-module Minos
-  class K8s < Thor
-    desc "deploy", "Deploy docker artifacts specified in the manifest"
-    def deploy
-      puts "not implemented"
-    end
-  end
-end