producer-stdlib 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12668879dd856f64bc93fbd6da0e6052e864ac3a
-  data.tar.gz: 269b27e52519a682a76bd0ae188a03150f3012a3
+  metadata.gz: 72c4348461bc2a8c12dcd47ee307e8604cc50fa1
+  data.tar.gz: a3ede50542093af7e758db40fbd03404f2d426f5
 SHA512:
-  metadata.gz: ad2be9732b1b07866e1f0791c1989951c2706d55dbfc4f81ec9649459e395772e3ee8837ce27fb962150b6b23b5d855da21f312a30d89895ef95618a7830c6b2
-  data.tar.gz: e35a30d4052332c235472304933c48629b5605a92525c167b12fe85f99d36ef38e6d9d98e56f4074d3287a4d4981b3d46910580e8eb7d87cfe6c6b76752ddb67
+  metadata.gz: 65092fab528abd92d9dda816f860d0a6659bb50c2d649ac55d4b3c163c41c24b9a17068978fa728ce5400b2bb29868ef5450ed663b2a5fc5488fd68e0f6b5d63
+  data.tar.gz: 0dd96d62208c5cc855a39d3c623bbec20f3e2cb28795a3c93f2637f16b226376051ab654416f93fde9233f9f112dade25e66e224a54b2a0ef62083423bf2fffa

data/lib/producer/stdlib.rb

@@ -5,6 +5,10 @@ module Producer
         ::Producer::Core::Recipe.define_macro(name, block)
       end
 
+      def compose_macro(*args)
+        ::Producer::Core::Recipe.compose_macro(*args)
+      end
+
       def define_test(name, &block)
         ::Producer::Core::Condition.define_test(name, block)
       end

data/lib/producer/stdlib/freebsd.rb

@@ -10,14 +10,24 @@ module Producer
       MAKE_CONF_PATH      = '/etc/make.conf'.freeze
 
 
-      STDLib.define_test(:rc_enabled?) do |service|
+      STDLib.compose_macro :loader_conf, :file_write_once, LOADER_CONF_PATH
+
+      STDLib.compose_macro :rc_conf, :file_write_once, RC_CONF_PATH
+
+      STDLib.compose_macro :sysctl_conf, :file_write_once, SYSCTL_CONF_PATH
+
+      STDLib.compose_macro :periodic_conf, :file_write_once, PERIODIC_CONF_PATH
+
+      STDLib.compose_macro :make_conf, :file_write_once, MAKE_CONF_PATH
+
+      STDLib.define_test :rc_enabled? do |service|
         sh "service #{service} enabled > /dev/null"
       end
 
       STDLib.define_macro :rc_enable do |service|
         condition { no_rc_enabled? service }
 
-        file_append RC_CONF_PATH, %{\n#{service}_enable=\"YES\"\n}
+        file_append RC_CONF_PATH, %{\n#{service}_enable="YES"\n}
         sh "service #{service} start"
       end
 
@@ -29,41 +39,6 @@ module Producer
         file_replace_content RC_CONF_PATH, /^hostname=.+$/, rc_conf_value
       end
 
-      # FIXME: refactor with file_add macro?
-      STDLib.define_macro :loader_conf do |conf|
-        condition { no_file_contains LOADER_CONF_PATH, conf }
-
-        file_append LOADER_CONF_PATH, "\n%s" % conf
-      end
-
-      # FIXME: refactor with file_add macro?
-      STDLib.define_macro :rc_conf do |conf|
-        condition { no_file_contains RC_CONF_PATH, conf }
-
-        file_append RC_CONF_PATH, "\n%s" % conf
-      end
-
-      # FIXME: refactor with file_add macro?
-      STDLib.define_macro :sysctl_conf do |conf|
-        condition { no_file_contains SYSCTL_CONF_PATH, conf }
-
-        file_append SYSCTL_CONF_PATH, "\n%s" % conf
-      end
-
-      # FIXME: refactor with file_add macro?
-      STDLib.define_macro :periodic_conf do |conf|
-        condition { no_file_contains PERIODIC_CONF_PATH, conf }
-
-        file_append PERIODIC_CONF_PATH, "\n%s" % conf
-      end
-
-      # FIXME: refactor with file_add macro?
-      STDLib.define_macro :ports_config do |config|
-        condition { no_file_contains MAKE_CONF_PATH, config }
-
-        file_write MAKE_CONF_PATH, config
-      end
-
       STDLib.define_macro :chsh do |shell|
         condition { no_env? :shell, shell }
 

data/lib/producer/stdlib/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module STDLib
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
   end
 end

data/producer-stdlib.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split $/
 
-    s.add_dependency 'producer-core', '~> 0.2', '>= 0.2.13'
+    s.add_dependency 'producer-core', '~> 0.3', '>= 0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Thibault Jouan
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.3.2
 description: |
   Standard library for producer (gem: producer-core).
 email: tj@a13.fr