minos 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed42480e69026ee8407a729c8448ab478dda30a41df536fd33dbf54ab34b14da
-  data.tar.gz: c28143cbd6fbe7a9b66bcb70b8efd15d0b1e2e14402ce3546a5de2258b3a63df
+  metadata.gz: 16d9e1c975cffe66051de530f3c23e82da366fc9e9234d05443247e1b3604a74
+  data.tar.gz: cedb8b896002b8d7ff781be86dff32638dd26534b25c89ccc3162a372ab52956
 SHA512:
-  metadata.gz: '019fcfb42de45eeb468ffbc16258c65f9ed5cf26f58c74ff7ab6c5d3b25de055b47793eefe417968d68641b1c8976980b835e0cd4eee4a3b501b4c2fcd8b3455'
-  data.tar.gz: 9d86167b076b6d232e3c3d67e90b4b261cb95be76db440f3ea35f60a31d76cc9bd517b2eaa28b01d3c1bb270ef90642af7d314a4baf45718961a7da8087e34c2
+  metadata.gz: d7af5313b2c0ce554531f3c02f880b6c1f131bf8a1fcd45a92e5b371c3652c6db37748ab1339692cb55057c75e0ac336e9dcde38c5be0dfe3dd6d2016b3b2e7e
+  data.tar.gz: b96b385c7b9bbdc565de89007b939a68f539a3afaf8b700ab64f306cbbf62b3508c426e8c8aed24a16b12c64ef9fa76ea574ffd0b57742318ff4af7e829dfa35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minos (0.3.3)
+    minos (0.3.4)
       activesupport (~> 5.2)
       dry-matcher (~> 0.7)
       dry-monads (~> 1.2)
@@ -17,6 +17,7 @@ GEM
       tzinfo (~> 1.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
+    diff-lcs (1.3)
     dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.1)
@@ -33,6 +34,19 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -46,6 +60,7 @@ DEPENDENCIES
   minos!
   pry
   rake (~> 10.0)
+  rspec
 
 BUNDLED WITH
    1.17.3

data/examples/Dockerfile.invalid

@@ -0,0 +1,27 @@
+######################
+# Stage: builder
+FROM nginx as builder
+
+ENV HOME /home/app
+WORKDIR $HOME
+
+RUN touch builder
+RUN exit 1
+
+CMD ["ls", "-l"]
+
+###############################
+# Stage release
+FROM nginx 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.invalid.yaml

@@ -0,0 +1,32 @@
+build:
+  artifacts:
+  - name: builder
+    image: textmasterapps/nginx
+    tags:
+    - "$TARGET-$REVISION"
+    - "$TARGET-latest"
+    docker:
+      file: ./examples/Dockerfile.invalid
+      tag: "$IMAGE:$TARGET" # $IMAGE and $TARGET are automatically populated as env vars for you
+      target: builder
+      cacheFrom:
+      - textmasterapps/nginx:builder
+      - textmasterapps/nginx:builder-$REVISION
+      - textmasterapps/nginx:builder-latest
+  - name: release
+    image: textmasterapps/nginx
+    tags:
+    - "$REVISION" # you can reference ENV variables from your shell
+    - "latest"
+    docker:
+      file: ./examples/Dockerfile.invalid
+      tag: "$IMAGE:$TARGET"
+      target: release
+      buildArg:
+        ENV: "production"
+        REVISION: "$REVISION"
+      cacheFrom:
+      - textmasterapps/nginx:builder
+      - textmasterapps/nginx:release
+      - textmasterapps/nginx:$REVISION
+      - textmasterapps/nginx:latest

data/lib/minos/artifact.rb

@@ -4,6 +4,7 @@ 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)
@@ -45,9 +46,9 @@ module Minos
         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
+
+        return Success()
       }]
     end
 
@@ -57,9 +58,10 @@ module Minos
         print "Building #{target}...", color: color
         if run "docker build --rm #{Minos::Utils.to_args(docker)} .", color: color
           print "Successfully built #{target}", color: color
+          return Success()
         else
-          print "Failed building #{target}", :red
-          raise StandardError.new($?)
+          print "Failed building #{target}", color: :red
+          return Failure($?)
         end
       }]
     end
@@ -70,9 +72,10 @@ module Minos
         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
+          return Success()
         else
-          print "Failed pushing #{image}:#{tag}", :red
-          raise StandardError.new($?)
+          print "Failed pushing #{image}:#{tag}", color: :red
+          return Failure($?)
         end
       }]
     end

data/lib/minos/cli.rb

@@ -7,7 +7,7 @@ module Minos
     option :only, type: :array, default: [], desc: "Process only given artifacts"
     option :except, type: :array, default: [], desc: "Process all but given artifacts"
     def build
-      artifacts.each do |a|
+      artifacts.map do |a|
         artifact = Artifact.new(a, options: options)
         artifact.build
       end
@@ -18,7 +18,7 @@ module Minos
     option :only, type: :array, default: [], desc: "Process only given artifacts"
     option :except, type: :array, default: [], desc: "Process all but given artifacts"
     def push
-      artifacts.each do |a|
+      artifacts.map do |a|
         artifact = Artifact.new(a, options: options)
         artifact.push
       end

data/lib/minos/version.rb

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

data/minos.gemspec

@@ -31,4 +31,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"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minos
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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'
 description: Easy and repeatable Kubernetes deployment based on Docker images
 email:
 - pierre-louis@textmaster.com
@@ -127,6 +141,8 @@ files:
 - bin/console
 - bin/setup
 - examples/Dockerfile
+- examples/Dockerfile.invalid
+- examples/minos.invalid.yaml
 - examples/minos.yaml
 - exe/minos
 - lib/minos.rb