chef-container 0.0.1 → 0.0.2.pre.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc12321d54dbb1a3a9900f6ff3c413b37abde82
-  data.tar.gz: 3ec5ee8c121b5004b3d9921f3d6ba450664817e7
+  metadata.gz: d71498b231ebf09e380f743f26230be576ca6e9b
+  data.tar.gz: 8df8ffc772c998c64aae9548a2963244853e1670
 SHA512:
-  metadata.gz: 2b250a250bbbe7acf170c889f109eedbab47a2c5260d496c71087d09e0dd6e35aa5fab4f074159902110e1d893c215a8e8cfc94cb868086d7fa678b230f9c06a
-  data.tar.gz: 411b0a469251abdf85f89bf2adf201235bb921f32b6f94c5a108d6e921779e77f4278289c1b420491e7982203b7b56dde6f90e4ffd9ebebb5ada6102cc0ef2b9
+  metadata.gz: 2d0450ec3edafaeb03f8e704e46741785e972ad572fbd74eb829111f2ce6cf71a6dd1f15e8e3b40805c5013df820931516b021566f824d156b866c93183ef7c4
+  data.tar.gz: b7821cac01ff4497e334a2077432d0f9e552365b81a80cb020d65df17148ba7ef28a0ec65049e5f71e66d75ddb38261ff09bc9b9be92f9043dc992bf197ad6cb

data/chef-container.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'chef', '~> 11.0'
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/chef/container.rb

@@ -1,16 +1,22 @@
 require 'chef/container/version'
-require 'chef/provider/service/chef_container'
+require 'chef/resource/container_service_runit'
+require 'chef/provider/container_service_runit'
+require 'chef/provider/service/container'
 
 class Chef
   class Recipe
-    def container_init(name, &block)
+    def container_service(name, &block)
       begin
         # Find the corresponding `service` resource and override the provider
-        @service_resource = resources("service[#{name}]")
-        @orig_provider = @service_resource.provider
-        @service_resource.provider = Chef::Provider::Service::ChefContainer
+        service_resource = resources("service[#{name}]")
+        service_resource.provider = Chef::Provider::Service::ChefContainer
+
+        # Setup the runit service
+        runit_service = Chef::Resource::ContainerServiceRunit.new(service_resource.service_name, @run_context)
+        runit_service.instance_eval(&block) if block
+        runit_service.run_action(:enable)
       rescue Chef::Exceptions::ResourceNotFound => e
-        Chef::Log.info "Resource service[#{@service_name}] not found."
+        Chef::Log.info "Resource service[#{name}] not found."
         raise e
       else
         # other exception

data/lib/chef/container/runit.rb

@@ -1,106 +1,10 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 class Chef
   module Container
     module Runit
-      attr_reader :sv_bin
-      attr_reader :sv_dir
-      attr_reader :service_dir
-
-      def setup
-        @sv_bin = '/opt/chef/embedded/bin/sv'
-        @sv_dir = '/opt/chef/embedded/sv'
-        @service_dir = '/opt/chef/embedded/service'
-
-        Chef::Log.debug "Creating sv_dir for #{new_resource.name}"
-        sv_dir.run_action(:create)
-
-        Chef::Log.debug "Creating run_script for #{new_resource.name}"
-        run_script.run_action(:create)
-
-        Chef::Log.debug "Setting up svlog for #{new_resource.name}"
-        default_log_dir.run_action(:create)
-        log_dir.run_action(:create)
-        log_run_script.run_action(:create)
-      end
-
-      #
-      # Helper Resource Methods
-      #
-      def sv_dir_name
-        ::File.join(@service_resource.sv_dir, new_resource.service_name)
-      end
-
-      def service_dir_name
-        ::File.join(new_resource.service_dir, new_resource.service_name)
-      end
-
-      def run_script_content(command)
-        "#!/bin/sh\n#{command} 2&>1"
-      end
-
-      def log_run_script_content
-        "#!/bin/sh\nexec svlogd -tt /var/log/#{new_resource.service_name}"
-      end
-
-      #
-      # Helper Resources
-      #
-      def sv_dir
-        return @sv_dir unless @sv_dir.nil?
-        @sv_dir = Chef::Resource::Directory.new(sv_dir_name, run_context)
-        @sv_dir.recursive(true)
-        @sv_dir.mode(00755)
-        @sv_dir
-      end
-
-      def run_script
-        return @run_script unless @run_script.nil?
-        @run_script = Chef::Resource::File.new(::File.join(sv_dir_name, 'run'), run_context)
-        @run_script.content(run_script_content(new_resource.command))
-        @run_script.mode(00755)
-        @run_script
-      end
-
-      def default_log_dir
-        return @default_log_dir unless @default_log_dir.nil?
-        @default_log_dir = Chef::Resource::Directory.new(::File.join("/var/log/#{new_resource.service_name}"), run_context)
-        @default_log_dir.recursive(true)
-        @default_log_dir.mode(00755)
-        @default_log_dir
-      end
-
-      def log_dir 
-        return @log_dir unless @log_dir.nil?
-        @log_dir = Chef::Resource::Directory.new(::File.join(sv_dir_name, 'log'), run_context)
-        @log_dir.recursive(true)
-        @log_dir.mode(00755)
-        @log_dir
-      end
-
-      def log_run_script
-        return @log_run_script unless @log_run_script.nil?
-        @log_run_script = Chef::Resource::File.new(::File.join(sv_dir_name, 'log', 'run'))
-        @log_run_script.content(log_run_script_content)
-        @log_run_script.mode(00755)
-        @log_run_script
-      end
-
+      SV_BIN = '/opt/chef/embedded/bin/sv'
+      SV_DIR = '/opt/chef/embedded/sv'
+      SERVICE_DIR = '/opt/chef/embedded/service'
     end
   end
 end

data/lib/chef/container/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Container
-    VERSION = "0.0.1"
+    VERSION = "0.0.2-dev"
   end
 end

data/lib/chef/provider/container_service_runit.rb

@@ -0,0 +1,84 @@
+#
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'chef/provider/lwrp_base'
+
+class Chef
+  class Provider
+    class ContainerServiceRunit < Chef::Provider::LWRPBase
+
+      def whyrun_supported?
+        true
+      end
+
+      use_inline_resources
+
+      action :enable do
+        converge_by "Creating sv_dir for #{new_resource.name}" do
+          directory sv_dir_name do
+            recursive true
+            mode '0755'
+          end
+        end
+
+        converge_by "Creating run_script for #{new_resource.name}" do
+          file ::File.join(sv_dir_name, 'run') do
+            content run_script_content
+            mode '0755'
+          end
+        end
+
+        converge_by "Setting up svlog for #{new_resource.name}" do
+          directory "/var/log/#{new_resource.service_name}" do
+            recursive true
+            mode '0755'
+          end
+
+          directory ::File.join(sv_dir_name, 'log') do
+            recursive true
+            mode '0755'
+          end
+
+          file ::File.join(sv_dir_name, 'log', 'run') do
+            content log_run_script_content
+            mode '0755'
+          end
+        end
+      end
+
+
+      #
+      # Helper Resource Methods
+      #
+      def sv_dir_name
+        ::File.join(new_resource.sv_dir, new_resource.service_name)
+      end
+
+      def service_dir_name
+        ::File.join(new_resource.service_dir, new_resource.service_name)
+      end
+
+      def run_script_content
+        "#!/bin/sh\n#{new_resource.command} 2&>1"
+      end
+
+      def log_run_script_content
+        "#!/bin/sh\nexec svlogd -tt /var/log/#{new_resource.service_name}"
+      end
+      
+    end
+  end
+end

data/lib/chef/provider/service/{chef_container.rb → container.rb}

@@ -26,8 +26,12 @@ require 'chef/container/runit'
 class Chef
   class Provider
     class Service
+      # container_service
       class ChefContainer < Chef::Provider::Service
-        include Chef::Container::Runit
+
+        def initialize(*args)
+          super
+        end
 
         #
         # Override Service Actions
@@ -51,25 +55,25 @@ class Chef
         end
 
         def disable_service
-          shell_out("#{@sv_bin} down #{service_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
-          shell_out!("#{@sv_bin} start #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} start #{service_dir_name}")
         end
 
         def stop_service
-          shell_out!("#{@sv_bin} stop #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} stop #{service_dir_name}")
         end
 
         def restart_service
-          shell_out!("#{@sv_bin} restart #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} restart #{service_dir_name}")
         end
 
         def reload_service
-          shell_out!("#{@sv_bin} force-reload #{service_dir_name}")
+          shell_out!("#{Chef::Container::Runit::SV_BIN} force-reload #{service_dir_name}")
         end
 
 
@@ -77,11 +81,11 @@ class Chef
         # Helper Resource Methods
         #
         def sv_dir_name
-          ::File.join(@sv_dir, new_resource.service_name)
+          ::File.join(Chef::Container::Runit::SV_DIR, new_resource.service_name)
         end
 
         def service_dir_name 
-          ::File.join(@service_dir, new_resource.service_name)
+          ::File.join(Chef::Container::Runit::SERVICE_DIR, new_resource.service_name)
         end
 
 

data/lib/chef/resource/container_service_runit.rb

@@ -0,0 +1,36 @@
+#
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'chef/resource/lwrp_base'
+require 'chef/container/runit'
+
+class Chef
+  class Resource
+    class ContainerServiceRunit < Chef::Resource::LWRPBase
+      self.resource_name = "container_service_runit"
+
+      actions :enable, :disable
+      default_action :enable
+
+      attribute :service_name, :kind_of => String, :name_attribute => true
+      attribute :command, :kind_of => String, :required => true
+      attribute :sv_bin, :kind_of => String, :default => Chef::Container::Runit::SV_BIN
+      attribute :sv_dir, :kind_of => String, :default => Chef::Container::Runit::SV_DIR
+      attribute :service_dir, :kind_of => String, :default => Chef::Container::Runit::SERVICE_DIR
+
+    end
+  end
+end

data/spec/data/cookbooks/foo/recipes/default.rb

@@ -5,6 +5,6 @@ service 'apache2' do
   action :start
 end
 
-container_init 'apache2' do
+container_service 'apache2' do
   command 'apachectl -k start'
 end

data/spec/data/cookbooks/foo/recipes/runit.rb

@@ -0,0 +1,6 @@
+
+require 'chef/container'
+
+container_service_runit 'apache2' do
+  command 'apachectl -k start'
+end

data/spec/functional/container_service_runit_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'chefspec'
+
+describe "container_service_runit" do
+  cookbook_dir = ::File.expand_path("../../data/cookbooks", __FILE__)
+  let(:chef_run) { ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04', cookbook_path: cookbook_dir, step_into: ['container_service_runit']).converge('foo::runit') }
+
+  it "should create sv_dir" do
+    expect(chef_run).to create_directory "/opt/chef/embedded/sv/apache2"
+  end
+
+  it "should create run_script" do
+    expect(chef_run).to create_file "/opt/chef/embedded/sv/apache2/run"
+  end
+  
+  it "should setup svlog" do
+    expect(chef_run).to create_directory "/var/log/apache2"
+    expect(chef_run).to create_directory "/opt/chef/embedded/sv/apache2/log"
+    expect(chef_run).to create_file "/opt/chef/embedded/sv/apache2/log/run"
+  end
+end

data/spec/functional/container_service_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'chefspec'
+
+describe "container_service" do
+  cookbook_dir = ::File.expand_path("../../data/cookbooks", __FILE__)
+  let(:chef_run) { ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04', cookbook_path: cookbook_dir) }
+
+  it "replaces the provider of the corresponding service resource with Chef::Provider::Service::ChefContainer" do
+    chef_run.converge('foo::default')
+    service_resource = chef_run.run_context.resource_collection.find("service[apache2]")
+    expect(service_resource.provider).to eql(Chef::Provider::Service::ChefContainer)
+  end
+end

data/spec/spec_helper.rb

@@ -20,4 +20,3 @@ require 'chef/recipe'
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $:.unshift(File.expand_path("../lib", __FILE__))
 $:.unshift(File.dirname(__FILE__))
-

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chef-container
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2.pre.dev
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,18 +64,20 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - chef-container.gemspec
 - lib/chef/container.rb
 - lib/chef/container/runit.rb
 - lib/chef/container/version.rb
-- lib/chef/provider/service/chef_container.rb
-- spec/container_init_recipe_spec.rb
-- spec/container_init_resource_spec.rb
+- lib/chef/provider/container_service_runit.rb
+- lib/chef/provider/service/container.rb
+- lib/chef/resource/container_service_runit.rb
 - spec/data/cookbooks/foo/metadata.rb
 - spec/data/cookbooks/foo/recipes/default.rb
+- spec/data/cookbooks/foo/recipes/runit.rb
+- spec/functional/container_service_runit_spec.rb
+- spec/functional/container_service_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opscode/chef-container
 licenses:
@@ -78,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -88,8 +104,9 @@ signing_key:
 specification_version: 4
 summary: A library for controlling services using Chef's chef-container package.
 test_files:
-- spec/container_init_recipe_spec.rb
-- spec/container_init_resource_spec.rb
 - spec/data/cookbooks/foo/metadata.rb
 - spec/data/cookbooks/foo/recipes/default.rb
+- spec/data/cookbooks/foo/recipes/runit.rb
+- spec/functional/container_service_runit_spec.rb
+- spec/functional/container_service_spec.rb
 - spec/spec_helper.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Tom Duffield
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/spec/container_init_recipe_spec.rb

@@ -1,61 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'chef/container'
-
-describe Chef::Recipe do
-  
-  before(:each) do
-    @cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
-    cl = Chef::CookbookLoader.new(@cookbook_repo)
-    cl.load_cookbooks
-    @cookbook_collection = Chef::CookbookCollection.new(cl)
-    @node = Chef::Node.new
-    @node.normal[:tags] = Array.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
-    @recipe = Chef::Recipe.new("foo", "bar", @run_context)
-
-    # Stubs
-    sv_bin = '/opt/chef/embedded/bin/sv'
-    File.stub(:exist?).with(sv_bin).and_return(true)
-    File.stub(:executable?).with(sv_bin).and_return(true)
-    Chef::Mixin::ShellOut.stub(:shell_out).with("#{sv_bin} status /opt/chef/embedded/service/apache2") 
-
-   
-    # Shell/ext.rb is on the run path, and it defines
-    # Chef::Recipe#resources to call pp, which we don't want when
-    # we're running tests.
-    @recipe.stub(:pp)
-  end
-
-  describe "container_init" do
-    it "replaces the provider of the corresponding service resource with Chef::Provider::Service::ChefContainer" do
-      @recipe.service "apache2" do
-        action [:enable, :start]
-      end
-
-      @recipe.container_init "apache2" do
-        action :enable
-      end
-
-      service_resource = @run_context.resource_collection.find("service[apache2]")
-      expect(service_resource.provider).to eql(Chef::Provider::Service::ChefContainer)
-    end 
-  end
-end