minos 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e9853e5a1c81483e6f0e946d8e670d1dc947ba9f1d17d045a32c9af2d121c3
-  data.tar.gz: 62b4000e486b49a2fa3002d40b4921926e89ad891e9483c5451ef0fe18a3725a
+  metadata.gz: 6e990511ea43438c9374a1205d0a15417da89a57ed4c57c190e1bfa36b72946d
+  data.tar.gz: 1e7d4a3d6acbcbac2eab3705eb197fa9712e6bda4fe44f8c627801498483846f
 SHA512:
-  metadata.gz: 8358d1a238ed0510a5a5d85bd1341d736e9c41a099eb87ced95d8c2db44d3cf555474a2fc9e9ba8ac4233a2022cbfffd04dd867cd227b574fb61f4a4487c0367
-  data.tar.gz: b01639fef57b52f125f5157d1225556aba660a80c0d195c6d5f43bd9c37595a019333ce579e9166a75be74d9f013eaa6fc9d925ba399fd95819e52666e74069d
+  metadata.gz: 4e810c0cef87e648d29673b417461cf2e8b1a4dd4481372baa00eeccfafdc2fe63824b4b7165158f49d013bf8acfec6d70897626b3e8607fd8dc7068131337d1
+  data.tar.gz: 4561bf59c5110afd9e6f87ac21d0b16e481a5d6a334ca68d14c02f12b70d49ad7895813f5d24d19d2283929264acb1d3e6b18749bced538c05e5f8dc46a9e5c2

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    minos (0.2.0)
+    minos (0.2.1)
       activesupport (~> 5.2)
       thor (~> 0.20)
+      wisper (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +15,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     concurrent-ruby (1.1.4)
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)
@@ -22,6 +23,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    wisper (2.0.0)
 
 PLATFORMS
   ruby

data/examples/Dockerfile

@@ -0,0 +1,26 @@
+######################
+# Stage: builder
+FROM busybox as builder
+
+ENV HOME /home/app
+WORKDIR $HOME
+
+RUN touch builder
+
+CMD ["ls", "-l"]
+
+###############################
+# Stage release
+FROM busybox as release
+
+ENV HOME /home/app
+WORKDIR $HOME
+
+RUN touch release
+
+CMD ["ls", "-l"]
+
+ARG ENV=production
+ARG REVISION
+
+ENV REVISION $REVISION

data/examples/minos.yaml

@@ -0,0 +1,32 @@
+build:
+  artifacts:
+  - name: builder
+    image: textmasterapps/busybox
+    tags:
+    - "$TARGET-$REVISION"
+    - "$TARGET-latest"
+    docker:
+      file: ./examples/Dockerfile
+      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
+  - name: release
+    image: textmasterapps/busybox
+    tags:
+    - "$REVISION" # you can reference ENV variables from your shell
+    - "latest"
+    docker:
+      file: ./examples/Dockerfile
+      tag: "$IMAGE:$TARGET"
+      target: release
+      buildArg:
+        ENV: "production"
+        REVISION: "$REVISION"
+      cacheFrom:
+      - textmasterapps/busybox:builder
+      - textmasterapps/busybox:release
+      - textmasterapps/busybox:$REVISION
+      - textmasterapps/busybox:latest

data/lib/minos/artifact.rb

@@ -2,6 +2,8 @@ require 'active_support/core_ext/string/inflections'
 
 module Minos
   class Artifact
+    include Wisper::Publisher
+
     attr_reader :artifact, :options
 
     def initialize(artifact, options: {})
@@ -9,9 +11,13 @@ module Minos
       @options = options
     end
 
+    def name
+      artifact['name']
+    end
+
     def pull
-      caches.each do |cache|
-        docker_pull(cache)
+      caches.each do |name|
+        docker_pull(name)
       end
     end
 
@@ -25,17 +31,22 @@ module Minos
 
     private
 
-    def docker_pull(cache)
-      run "docker inspect #{cache} -f '{{json .ID}}' > /dev/null 2>&1 || docker pull #{cache} 2> /dev/null"
+    def docker_pull(name)
+      broadcast(:pulling_cache_artifact, name)
+      run "docker inspect #{name} -f '{{json .ID}}' > /dev/null 2>&1 || docker pull #{name} 2> /dev/null"
     end
 
     def docker_build
+      broadcast(:building_artifact, name)
       run "docker build #{to_args(docker)} ."
+      broadcast(:artifact_built, name)
     end
 
     def docker_push
       tags.each do |tag|
+        broadcast(:tagging_artifact, "#{image}:#{target}", "#{image}:#{tag}")
         run "docker tag #{image}:#{target} #{image}:#{tag}"
+        broadcast(:pushing_artifact, "#{image}:#{tag}")
         run "docker push #{image}:#{tag}"
       end
     end

data/lib/minos/cli.rb

@@ -18,5 +18,10 @@ module Minos
     def deploy
       invoke 'minos:k8s:deploy', []
     end
+
+    desc "version", "Display Minos version"
+    def version
+      puts Minos::VERSION
+    end
   end
 end

data/lib/minos/docker.rb

@@ -1,5 +1,7 @@
 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"
@@ -8,6 +10,17 @@ module Minos
     def build
       artifacts.each do |a|
         artifact = Artifact.new(a, options: options)
+        artifact
+        .on(:pulling_cache_artifact) do |name|
+          say_status artifact.name, "Pulling #{name}"
+        end
+        .on(:building_artifact) do |name|
+          say_status artifact.name, "Building #{name}"
+        end
+        .on(:artifact_built) do |name|
+          say_status artifact.name, "Successfully built #{name}"
+        end
+
         artifact.pull
         artifact.build
       end
@@ -17,6 +30,14 @@ module Minos
     def push
       artifacts.each do |a|
         artifact = Artifact.new(a, options: options)
+        artifact
+        .on(:tagging_artifact) do |source, target|
+          say_status artifact.name, "Successfully tagged #{source} as #{target}"
+        end
+        .on(:pushing_artifact) do |name|
+          say_status artifact.name, "Pushing #{name}"
+        end
+
         artifact.push
       end
     end

data/lib/minos/version.rb

@@ -1,3 +1,3 @@
 module Minos
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/minos.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'thor'
+require 'wisper'
 
 require 'minos/artifact'
 require 'minos/docker'

data/minos.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", "~> 5.2"
   spec.add_dependency "thor", "~> 0.20"
+  spec.add_dependency "wisper", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minos
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: wisper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +97,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/Dockerfile
+- examples/minos.yaml
 - exe/minos
 - lib/minos.rb
 - lib/minos/artifact.rb