chef-container 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d10df2c7b071d4eece86403d9dc3be7304912c
-  data.tar.gz: 362c74abd1317fec6059adda1beb9cdb8d15b83f
+  metadata.gz: 82bc1bcdeba795d1a39aca62bc28bc36e001655a
+  data.tar.gz: dbcbe47207290a73c98ac994c24b57f415688491
 SHA512:
-  metadata.gz: 482039af7d12eb4f5f8d81bf0a66c5e73a31f96308af6a45ac3d908a44d32f18a58b7212bc3783e8d524f2695b624ff907c27f35def76c2a82e6d322b8fe5183
-  data.tar.gz: 0b97e49d87015c71666f8b3497b69065b2c7e83e06dd8cb8bc7840095a3548b4f51330fdf1f419618c43b63657ff45ac7df25b1279dee4be064374e6bea0bae4
+  metadata.gz: 8c4d6ad5f9f60b8a560ce237684066c35b2f66352f69cae7efd338f891963fecd7ca82bdf4de2a4c447c72af4f56dea2d4e31c06ef0c171a4145503ac8075ee5
+  data.tar.gz: 232ae2343b256746a081f64d59811b54101f7ed8748843f38453a9e2722615ad2d48cafcdf69331517b3c967646e77a3ea1193948f7e5d3b58e7c41d0ea33f95

data/lib/chef/container/version.rb

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

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

@@ -33,6 +33,7 @@ class Chef
         def initialize(*args)
           super
           @service_link = nil
+          @service_endpoint = sv_dir_name
           @new_resource.supports[:status] = true
         end
 
@@ -60,6 +61,7 @@ class Chef
         def enable_service
           Chef::Log.debug("Creating symlink in service_dir for #{new_resource.service_name}")
           service_link.run_action(:create)
+          @service_endpoint = service_dir_name
 
           Chef::Log.debug("waiting until named pipe #{service_dir_name}/supervise/ok exists.")
           until ::FileTest.pipe?("#{service_dir_name}/supervise/ok")
@@ -75,35 +77,34 @@ class Chef
         end
 
         def disable_service
-          shell_out("#{Chef::Container::Runit::SV_BIN} down #{sv_dir_name}")
+          shell_out("#{Chef::Container::Runit::SV_BIN} down #{service_dir_name}")
           Chef::Log.debug("#{new_resource} down")
           FileUtils.rm(service_dir_name)
           Chef::Log.debug("#{new_resource} service symlink removed")
         end
 
         def start_service
-          if ::File.exists?(service_dir_name)
-            shell_out!("#{Chef::Container::Runit::SV_BIN} start #{service_dir_name}")
+          if enabled?
+            shell_out!("#{Chef::Container::Runit::SV_BIN} start #{@service_endpoint}")
           else
-            service_link.run_action(:create)
-            shell_out!("#{Chef::Container::Runit::RUNSV_BIN} #{service_dir_name} &")
+            shell_out!("#{Chef::Container::Runit::RUNSV_BIN} #{@service_endpoint} &")
           end
         end
 
         def stop_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} stop #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} stop #{@service_endpoint}")
         end
 
         def restart_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} restart #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} restart #{@service_endpoint}")
         end
 
         def reload_service
-          shell_out!("#{Chef::Container::Runit::SV_BIN} force-reload #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} force-reload #{@service_endpoint}")
         end
 
         def running?
-          cmd = shell_out("#{Chef::Container::Runit::SV_BIN} status #{service_dir_name}")
+          cmd = shell_out("#{Chef::Container::Runit::SV_BIN} status #{@service_endpoint}")
           (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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef