serverkit 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf19625178585db94d3e42ad1a098bd428fd835f
-  data.tar.gz: 38a0dfb3bc2943af2b361aa8894ad6d880e835cc
+  metadata.gz: c00c2ac80338e61da1d1b07403cd86449a4a1ac9
+  data.tar.gz: c835c29a91aa4dd642b24b7f9057cd808a208327
 SHA512:
-  metadata.gz: 63a60f19f80a9c9fa81d6e6f1bb6bc8f8325652c53cab16ed45439f4bdefa5c2964fccd0f8bad8a2e6aecaed5957633231ab4a91165042d4e86e084214dd7914
-  data.tar.gz: a5628aa61752352635ef4087d9d9a41ee261a25ba05ebdd4dd9a11332f34327a10ed368ac5eb7b0bedf935bbad51b9973a632811721f82c928ba4ec36cc6eb8f
+  metadata.gz: 7d8390a050502e6348bb951c88a26e47254c3d013a67de78bca8169e23b7b2260a77c1e4f000aed05522f8d306c6a4fccb7202c6fd47abf608a965e485277cb2
+  data.tar.gz: c80d55fc927edf108dfdaae10d2d10bd1b57976ba3aaffe542425da940a155385816ce060e667f81159d5daa07165a79ddff64818b512ae25393eb6404181adf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.3
+- Return exit code 1 if any resource failed
+
 ## 0.3.2
 - Fix git resource on git-clone
 

data/README.md

@@ -171,8 +171,6 @@ A resource must have a type attribute. Currently the following types are availab
 - command
 - file
 - git
-- homebrew
-- homebrew_cask
 - nothing
 - package
 - recipe
@@ -224,6 +222,7 @@ Serverkit finds `Serverkit::Resources::FooBar` resource class from `type: "foo_b
 
 - [serverkit-atom](https://github.com/r7kamura/serverkit-atom)
 - [serverkit-defaults](https://github.com/r7kamura/serverkit-defaults)
+- [serverkit-homebrew](https://github.com/r7kamura/serverkit-homebrew)
 - [serverkit-karabiner](https://github.com/r7kamura/serverkit-karabiner)
 - [serverkit-rbenv](https://github.com/r7kamura/serverkit-rbenv)
 
@@ -232,6 +231,7 @@ Serverkit finds `Serverkit::Resources::FooBar` resource class from `type: "foo_b
 gem "serverkit"
 gem "serverkit-atom"
 gem "serverkit-defaults"
+gem "serverkit-homebrew"
 gem "serverkit-karabiner"
 gem "serverkit-rbenv"
 ```

data/lib/serverkit/actions/apply.rb

@@ -5,20 +5,28 @@ module Serverkit
   module Actions
     class Apply < Base
       def run
-        backends.map do |backend|
+        successful = backends.map do |backend|
           Thread.new do
-            recipe.resources.map(&:clone).map do |resource|
+            resources = recipe.resources.map(&:clone).map do |resource|
               resource.backend = backend
               resource.run_apply
               puts resource.inspect_apply_result
               resource
-            end.select(&:notifiable?).flat_map(&:handlers).uniq.map(&:dup).each do |handler|
+            end
+            handlers = resources.select(&:notifiable?).flat_map(&:handlers).uniq.map(&:clone).map do |handler|
               handler.backend = backend
               handler.run_apply
               puts handler.inspect_apply_result
+              handler
             end
+            resources + handlers
           end
-        end.each(&:join)
+        end.map(&:value).flatten.all?(&:successful?)
+        if successful
+          exit
+        else
+          exit(1)
+        end
       end
     end
   end

data/lib/serverkit/actions/check.rb

@@ -5,15 +5,21 @@ module Serverkit
   module Actions
     class Check < Base
       def run
-        backends.map do |backend|
+        successful = backends.map do |backend|
           Thread.new do
-            recipe.resources.map(&:clone).each do |resource|
+            recipe.resources.map(&:clone).map do |resource|
               resource.backend = backend
               resource.run_check
               puts resource.inspect_check_result
+              resource
             end
           end
-        end.each(&:join)
+        end.map(&:value).flatten.all?(&:successful?)
+        if successful
+          exit
+        else
+          exit(1)
+        end
       end
     end
   end

data/lib/serverkit/resources/base.rb

@@ -86,14 +86,19 @@ module Serverkit
       def run_apply
         unless run_check
           apply
-          @recheck_result = recheck
+          @recheck_result = !!recheck
         end
       end
 
       # @note #check wrapper
       # @return [true, false]
       def run_check
-        @check_result = check
+        @check_result = !!check
+      end
+
+      # @return [true, false]
+      def successful?
+        @check_result == true || @recheck_result == true
       end
 
       # @note recipe resource will override to replace itself with multiple resources

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryo Nakamura