chef-container 0.0.2.pre.dev8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b917fa5a57a4eb4c245bc85365b75b5bc3788cae
-  data.tar.gz: 7a88c8f76e74a88bdbe8c94eb07e1cbd969120d4
+  metadata.gz: d3d10df2c7b071d4eece86403d9dc3be7304912c
+  data.tar.gz: 362c74abd1317fec6059adda1beb9cdb8d15b83f
 SHA512:
-  metadata.gz: 2c86ee28f8422c7760ebb1a4ec6cc14b1a3c3757b19d4baf816fba5ce8d94dcf81d9f5dd4772bb9f6ddbe62f56e00060003f2e12041e1ba56bfa47fd1c01fce3
-  data.tar.gz: 1f37dfff9a06eb572fff46635e6fbaa7635c457a9fea195425fee13bf26399b52f4a739a41d44b5be2b0241d2fab901f7a78a62e17cd4f925dd0a0d343238651
+  metadata.gz: 482039af7d12eb4f5f8d81bf0a66c5e73a31f96308af6a45ac3d908a44d32f18a58b7212bc3783e8d524f2695b624ff907c27f35def76c2a82e6d322b8fe5183
+  data.tar.gz: 0b97e49d87015c71666f8b3497b69065b2c7e83e06dd8cb8bc7840095a3548b4f51330fdf1f419618c43b63657ff45ac7df25b1279dee4be064374e6bea0bae4

data/lib/chef/container/runit.rb

@@ -2,9 +2,10 @@
 class Chef
   module Container
     module Runit
+      RUNSV_BIN = '/opt/chef/embedded/bin/runsv'
       SV_BIN = '/opt/chef/embedded/bin/sv'
-      SV_DIR = '/opt/chef/embedded/sv'
-      SERVICE_DIR = '/opt/chef/embedded/service'
+      SV_DIR = '/opt/chef/sv'
+      SERVICE_DIR = '/opt/chef/service'
     end
   end
 end

data/lib/chef/container/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Container
-    VERSION = "0.0.2-dev8"
+    VERSION = "0.1.0"
   end
 end

data/lib/chef/provider/container_service_runit.rb

@@ -72,11 +72,14 @@ class Chef
       end
 
       def run_script_content
-        "#!/bin/sh\nexec #{new_resource.command} 2&>1"
+        "#!/bin/sh
+exec 2>&1
+exec #{new_resource.command} 2>&1"
       end
 
       def log_run_script_content
-        "#!/bin/sh\nexec svlogd -tt /var/log/#{new_resource.service_name}"
+        "#!/bin/sh
+exec svlogd -tt /var/log/#{new_resource.service_name}"
       end
       
     end

data/lib/chef/provider/service/container.rb

@@ -32,6 +32,8 @@ class Chef
 
         def initialize(*args)
           super
+          @service_link = nil
+          @new_resource.supports[:status] = true
         end
 
         def load_current_resource
@@ -80,23 +82,28 @@ class Chef
         end
 
         def start_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} start #{sv_dir_name}")
+          if ::File.exists?(service_dir_name)
+            shell_out!("#{Chef::Container::Runit::SV_BIN} start #{service_dir_name}")
+          else
+            service_link.run_action(:create)
+            shell_out!("#{Chef::Container::Runit::RUNSV_BIN} #{service_dir_name} &")
+          end
         end
 
         def stop_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} stop #{sv_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} stop #{service_dir_name}")
         end
 
         def restart_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} restart #{sv_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} restart #{service_dir_name}")
         end
 
         def reload_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} force-reload #{sv_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} force-reload #{service_dir_name}")
         end
 
         def running?
-          cmd = shell_out("#{Chef::Container::Runit::SV_BIN} status #{sv_dir_name}")
+          cmd = shell_out("#{Chef::Container::Runit::SV_BIN} status #{service_dir_name}")
           (cmd.stdout =~ /^run:/ && cmd.exitstatus == 0)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-container
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre.dev8
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -94,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2