producer-stdlib 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6807d8926b2ba935351acb4c3c0f184ede8deff7
-  data.tar.gz: f164843bdf28498cef2e8bea7e8081057919112d
+  metadata.gz: 61167336d12da40074cc617c7f73c4068455ea43
+  data.tar.gz: 5124f9aa5afdf16372f77f03e9940c2f084bfdd6
 SHA512:
-  metadata.gz: c7e6e8d3d728ce574554ff8db4152c69db0315b29cbcb19b2c3c217a21785595df9a40fe29e31d960d226ac19761b7a803e84fb55be7f5a5cf7f8976af7bea21
-  data.tar.gz: 9cbebdaf22c7fd154331a6f72fbe929d513c5db9c12303612c3f23e4335c78558b069c62102b335f34dbaf48d4fd01699ddde7131e00687b896cc37e6bd88150
+  metadata.gz: 4600f297b06e66c9d46c6a1f9c1b94d9b55b195896d280fdc4717279b39926cc96dda7ff98787335d860e6987d3d5ae1754ef11c38fb282367848d207f888bf1
+  data.tar.gz: b6fbe67d4ed9e63108e035231f87f544ea6f97cb3fc526ad09a895c6427567a6dd92848a5f55b46a31469509b00893899225e2b6aa31bd30b889872734364185

data/lib/producer/stdlib/freebsd.rb

@@ -20,10 +20,33 @@ module Producer
 
       STDLib.compose_macro :make_conf, :file_write_once, MAKE_CONF_PATH
 
+      STDLib.define_test :rc_conf? do |key, value|
+        file_contains '/etc/rc.conf', "#{key}=#{value}\n"
+      end
+
       STDLib.define_test :rc_enabled? do |service|
         sh "service #{service} enabled > /dev/null"
       end
 
+      STDLib.define_macro :rc_conf_update do |key, value|
+        condition { no_rc_conf? key, value }
+
+        file_replace_content RC_CONF_PATH, /^#{key}=.+$/, "#{key}=#{value}"
+      end
+
+      # FIXME: should update existing values
+      STDLib.define_macro :rc_conf_add do |attributes|
+        attributes.each do |k, v|
+          value = case v
+          when true   then '"YES"'
+          when false  then '"NO"'
+          else '"%s"' % v
+          end
+
+          file_append_once RC_CONF_PATH, "#{k}=#{value}\n"
+        end
+      end
+
       STDLib.define_macro :rc_enable do |service|
         condition { no_rc_enabled? service }
 
@@ -31,14 +54,14 @@ module Producer
         sh "service #{service} start"
       end
 
-      STDLib.define_macro :hostname do |hostname|
-        rc_conf_value = "hostname=#{hostname}"
+      STDLib.define_macro :rc_disable do |service|
+        condition { rc_enabled? service }
 
-        condition { no_file_contains RC_CONF_PATH, rc_conf_value }
-
-        file_replace_content RC_CONF_PATH, /^hostname=.+$/, rc_conf_value
+        rc_conf_update "#{service}_enable", '"NO"'
       end
 
+      STDLib.compose_macro :hostname, :rc_conf_update, 'hostname'
+
       STDLib.define_macro :chsh do |shell|
         condition { no_env? :shell, shell }
 
@@ -94,14 +117,14 @@ module Producer
         condition { no_sh 'pkg -N' }
 
         # FIXME: must not disable signature
-        sh "PACKAGESITE=#{repo_uri} SIGNATURE_TYPE=NONE ASSUME_ALWAYS_YES=YES pkg bootstrap"
-        sh "PACKAGESITE=#{repo_uri} pkg update"
+        sh "env PACKAGESITE=#{repo_uri} SIGNATURE_TYPE=NONE ASSUME_ALWAYS_YES=YES pkg bootstrap"
+        sh "env PACKAGESITE=#{repo_uri} pkg update"
       end
 
       STDLib.define_macro :pkg_install do |pkg|
         condition { no_pkg? pkg }
 
-        sh 'ASSUME_ALWAYS_YES=YES pkg install %s' % pkg
+        sh 'env ASSUME_ALWAYS_YES=YES pkg install %s' % pkg
       end
     end
   end

data/lib/producer/stdlib/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module STDLib
-    VERSION = '0.0.6'.freeze
+    VERSION = '0.0.7'.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.3', '>= 0.3.2'
+  s.add_dependency 'producer-core', '~> 0.3', '>= 0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: producer-core
@@ -19,7 +19,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.9
 description: |
   Standard library for producer (gem: producer-core).
 email: tj@a13.fr