minos 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e990511ea43438c9374a1205d0a15417da89a57ed4c57c190e1bfa36b72946d
-  data.tar.gz: 1e7d4a3d6acbcbac2eab3705eb197fa9712e6bda4fe44f8c627801498483846f
+  metadata.gz: f3edf8ef19ced58587308297037a6e8b97f52bc7c8ac7b3860103f75590ce1ee
+  data.tar.gz: 0eae29c964734492960f12f895bcd6427a682bf7072bbffc19c40af64ae1dd02
 SHA512:
-  metadata.gz: 4e810c0cef87e648d29673b417461cf2e8b1a4dd4481372baa00eeccfafdc2fe63824b4b7165158f49d013bf8acfec6d70897626b3e8607fd8dc7068131337d1
-  data.tar.gz: 4561bf59c5110afd9e6f87ac21d0b16e481a5d6a334ca68d14c02f12b70d49ad7895813f5d24d19d2283929264acb1d3e6b18749bced538c05e5f8dc46a9e5c2
+  metadata.gz: 80205457db0bd8e437564c0327bcea5ce5f1c103e2366d51169256068579326c92899291a13e4d2f4dc2f97d57a6799fd6dab2936f15b269c2117cf2e086f454
+  data.tar.gz: ed251dbd5fbf9e06495afe41d16127b7115f0ea5474f8d45ea8f9c963f015b80ab7fb8ef2b3c69f39bf3b84783cb1dfe6b4ccbc03e89ae8dc17b142319db8506

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    minos (0.2.1)
+    minos (0.3.1)
       activesupport (~> 5.2)
+      dry-matcher (~> 0.7)
+      dry-monads (~> 1.2)
       thor (~> 0.20)
-      wisper (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -15,6 +16,14 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     concurrent-ruby (1.1.4)
+    dry-core (0.4.7)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.1)
+    dry-matcher (0.7.0)
+    dry-monads (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer
     i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
@@ -23,7 +32,6 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    wisper (2.0.0)
 
 PLATFORMS
   ruby

data/lib/minos.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'thor'
-require 'wisper'
+require "dry/monads/result"
+require "dry/matcher/result_matcher"
 
 require 'minos/artifact'
 require 'minos/docker'

data/lib/minos/artifact.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/string/inflections'
 
 module Minos
   class Artifact
-    include Wisper::Publisher
+    include Dry::Monads::Result::Mixin
 
     attr_reader :artifact, :options
 
@@ -16,8 +16,8 @@ module Minos
     end
 
     def pull
-      caches.each do |name|
-        docker_pull(name)
+      caches.map do |cache|
+        docker_pull(cache)
       end
     end
 
@@ -31,23 +31,29 @@ module Minos
 
     private
 
-    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"
+    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
     end
 
     def docker_build
-      broadcast(:building_artifact, name)
-      run "docker build #{to_args(docker)} ."
-      broadcast(:artifact_built, name)
+      if run "docker build #{to_args(docker)} ."
+        Success(name)
+      else
+        Failure(name)
+      end
     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}"
+      tags.map do |tag|
+        if run "docker tag #{image}:#{target} #{image}:#{tag} && docker push #{image}:#{tag}"
+          Success("#{image}:#{tag}")
+        else
+          Failure("#{image}:#{tag}")
+        end
       end
     end
 

data/lib/minos/docker.rb

@@ -10,19 +10,30 @@ 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}"
+
+        # 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
 
-        artifact.pull
-        artifact.build
+        # 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
 
@@ -30,15 +41,17 @@ 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}"
+        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
-
-        artifact.push
       end
     end
 

data/lib/minos/version.rb

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

data/minos.gemspec

@@ -25,7 +25,8 @@ 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_dependency "dry-matcher", "~> 0.7"
+  spec.add_dependency "dry-monads", "~> 1.2"
 
   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.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: dry-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement