chef 0.7.10 → 0.7.12

data/lib/chef/provider/deploy/revision.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# 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
+  class Provider
+    class Deploy
+      class Revision < Chef::Provider::Deploy
+        
+        def all_releases
+          sorted_releases
+        end
+        
+        protected
+        
+        def release_created(release)
+          sorted_releases { |r| r << release }
+        end
+        
+        def release_deleted(release)
+          sorted_releases { |r| r.delete(release)}
+        end
+        
+        def release_slug
+          scm_provider.revision_slug
+        end
+        
+        private
+        
+        def sorted_releases
+          cache = load_cache
+          if block_given?
+            yield cache
+            save_cache(cache)
+          end
+          cache
+        end
+        
+        def load_cache
+          begin
+            JSON.parse(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
+          rescue
+            Chef::Exceptions::FileNotFound
+            save_cache([])
+          end
+        end
+        
+        def save_cache(cache)
+          Chef::FileCache.store("revision-deploys/#{new_resource.name}", cache.to_json)
+          cache
+        end
+        
+      end
+    end
+  end
+end

data/lib/chef/provider/deploy/timestamped.rb

@@ -0,0 +1,33 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# 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
+  class Provider
+    class Deploy
+      class Timestamped < Chef::Provider::Deploy
+        
+        protected
+        
+        def release_slug
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        end
+        
+      end
+    end
+  end
+end

data/lib/chef/provider/git.rb

@@ -0,0 +1,194 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 2008 Opscode, 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/log'
+require 'chef/provider'
+require 'chef/mixin/command'
+require 'fileutils'
+
+class Chef
+  class Provider
+    class Git < Chef::Provider
+      
+      include Chef::Mixin::Command
+      
+      def load_current_resource
+        @current_resource = Chef::Resource::Git.new(@new_resource.name)
+        if current_revision = find_current_revision
+          @current_resource.revision current_revision
+        end
+      end
+      
+      def action_checkout
+        clone
+        checkout
+        enable_submodules
+      end
+      
+      def action_export
+        action_checkout
+        FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
+      end
+      
+      def action_sync
+        if !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination) == ['.','..']
+          action_checkout
+        else
+          sync
+          enable_submodules
+        end
+      end
+      
+      def find_current_revision
+        if ::File.exist?(::File.join(cwd, ".git"))
+          status, result, error_message = output_of_command("git rev-parse HEAD", run_options(:cwd=>cwd))
+          
+          # 128 is returned when we're not in a git repo. this is fine
+          unless [0,128].include?(status.exitstatus)
+            handle_command_failures(status, "STDOUT: #{result}\nSTDERR: #{error_message}")
+          end
+        end
+        sha_hash?(result) ? result : nil
+      end
+      
+      def clone
+        remote = @new_resource.remote
+
+        args = []
+        args << "-o #{remote}" unless remote == 'origin'
+        args << "--depth #{@new_resource.depth}" if @new_resource.depth
+        
+        Chef::Log.info "Cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
+        
+        clone_cmd = "#{git} clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
+        run_command(run_options(:command => clone_cmd))
+      end
+      
+      def checkout
+        sha_ref = revision_sha
+        Chef::Log.info "Checking out branch: #{@new_resource.revision} reference: #{sha_ref}"
+        # checkout into a local branch rather than a detached HEAD
+        run_command(run_options(:command => "#{git} checkout -b deploy #{sha_ref}", :cwd => @new_resource.destination))
+      end
+      
+      def enable_submodules
+        if @new_resource.enable_submodules
+          Chef::Log.info "Enabling git submodules"
+          command = "#{git} submodule init && #{git} submodule update"
+          run_command(run_options(:command => command, :cwd => @new_resource.destination))
+        end
+      end
+      
+      def sync
+        revision = revision_sha
+        sync_command = []
+
+        # Use git-config to setup a remote tracking branches. Could use
+        # git-remote but it complains when a remote of the same name already
+        # exists, git-config will just silenty overwrite the setting every
+        # time. This could cause wierd-ness in the remote cache if the url
+        # changes between calls, but as long as the repositories are all
+        # based from each other it should still work fine.
+        if @new_resource.remote != 'origin'
+          Chef::Log.info  "Configuring remote tracking branches for repository #{@new_resource.repository} "+
+                          "at remote #{@new_resource.remote}"
+          sync_command << "#{git} config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
+          sync_command << "#{git} config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
+        end
+
+        # since we're in a local branch already, just reset to specified revision rather than merge
+        sync_command << "#{git} fetch #{@new_resource.remote} && #{git} reset --hard #{revision}"
+        Chef::Log.info "Fetching updates from #{new_resource.remote} and resetting to revison #{revision}"
+        run_command(run_options(:command => sync_command.join(" && "), :cwd => @new_resource.destination))
+      end
+      
+      def revision_sha
+        @revision_sha ||= begin
+          assert_revision_not_remote
+          
+          if sha_hash?(@new_resource.revision)
+            @revision_sha = @new_resource.revision 
+          else
+            resolved_reference = remote_resolve_reference
+            @revision_sha = extract_revision(resolved_reference)
+          end
+        end
+      end
+      
+      alias :revision_slug :revision_sha
+      
+      def remote_resolve_reference
+        command = scm('ls-remote', @new_resource.repository, @new_resource.revision)
+        Chef::Log.debug("Executing #{command}")
+        begin
+          status, result, error_message = output_of_command(command, run_options)
+          handle_command_failures(status, "STDOUT: #{result}\nSTDERR: #{error_message}")
+        rescue RuntimeError => e
+          raise RuntimeError, e.message + "\n" + "Could not access the remote Git repository. "+
+                "If this is a private repository, please verify that the deploy key for your application " +
+                "has been added to your remote Git account."
+        end
+        result
+      end
+      
+      private
+      
+      def run_options(run_opts={})
+        run_opts[:user] = @new_resource.user if @new_resource.user
+        run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
+        run_opts
+      end
+      
+      def cwd
+        @new_resource.destination
+      end
+      
+      def scm(*args)
+        [git, *args].compact.join(" ")
+      end
+
+      def git
+        'git'
+      end
+      
+      def sha_hash?(string)
+        string =~ /^[0-9a-f]{40}$/
+      end
+      
+      def assert_revision_not_remote
+        if @new_resource.revision =~ /^origin\//
+          reference = @new_resource.revision
+          error_text =  "Deploying remote branches is not supported. " +
+                        "Specify the remote branch as a local branch for " +
+                        "the git repository you're deploying from " + 
+                        "(ie: '#{reference.gsub('origin/', '')}' rather than '#{reference}')."
+          raise RuntimeError, error_text
+        end
+      end
+      
+      def extract_revision(resolved_reference)
+        unless resolved_reference =~ /^([0-9a-f]{40})\s+(\S+)/
+          raise "Unable to resolve reference for '#{resolved_reference}' on repository '#{@new_resource.repository}'."
+        end
+        $1
+      end
+      
+    end
+  end
+end

data/lib/chef/provider/group.rb

@@ -27,8 +27,8 @@ class Chef
       include Chef::Mixin::Command
       attr_accessor :group_exists
       
-      def initialize(node, new_resource)
-        super(node, new_resource)
+      def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+        super(node, new_resource, collection, definitions, cookbook_loader)
         @group_exists = true
       end
       

data/lib/chef/provider/group/gpasswd.rb

@@ -0,0 +1,50 @@
+#
+# Author:: AJ Christensen (<aj@opscode.com>)
+# Copyright:: Copyright (c) 2008 OpsCode, 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/group/groupadd'
+
+class Chef
+  class Provider
+    class Group
+      class Gpasswd < Chef::Provider::Group::Groupadd
+        
+        def load_current_resource
+          super
+
+          raise Chef::Exceptions::Group, "Could not find binary /usr/bin/gpasswd for #{@new_resource}" unless ::File.exists?("/usr/bin/gpasswd")
+        end
+
+        def modify_group_members
+          unless @new_resource.members.empty?
+            if(@new_resource.append)
+              @new_resource.members.each do |member|
+                Chef::Log.debug("#{@new_resource}: appending member #{member} to group #{@new_resource.group_name}")
+                run_command(:command => "gpasswd -a #{member} #{@new_resource.group_name}")
+              end
+            else
+              Chef::Log.debug("#{@new_resource}: setting group members to #{@new_resource.members.join(', ')}")
+              run_command(:command => "gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+            end
+          else
+            Chef::Log.debug("#{@new_resource}: not changing group members, the group has no members")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/group/groupadd.rb

@@ -26,8 +26,7 @@ class Chef
           
           [ "/usr/sbin/groupadd",
             "/usr/sbin/groupmod",
-            "/usr/sbin/groupdel",
-            "/usr/bin/gpasswd" ].each do |required_binary|
+            "/usr/sbin/groupdel" ].each do |required_binary|
             raise Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary)
           end
         end
@@ -54,21 +53,8 @@ class Chef
         end
         
         def modify_group_members
-          unless @new_resource.members.empty?
-            if(@new_resource.append)
-              @new_resource.members.each do |member|
-                Chef::Log.debug("#{@new_resource}: appending member #{member} to group #{@new_resource.group_name}")
-                run_command(:command => "gpasswd -a #{member} #{@new_resource.group_name}")
-              end
-            else
-              Chef::Log.debug("#{@new_resource}: setting group members to #{@new_resource.members.join(', ')}")
-              run_command(:command => "gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
-            end
-          else
-            Chef::Log.debug("#{@new_resource}: not changing group members, the group has no members")
-          end
+          raise Chef::Exceptions::Group, "you must override modify_group_members in #{self.to_s}"
         end
-        
         # Little bit of magic as per Adam's useradd provider to pull the assign the command line flags
         #
         # ==== Returns

data/lib/chef/provider/group/usermod.rb

@@ -0,0 +1,57 @@
+#
+# Author:: AJ Christensen (<aj@opscode.com>)
+# Copyright:: Copyright (c) 2008 OpsCode, 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/group/groupadd'
+
+class Chef
+  class Provider
+    class Group
+      class Usermod < Chef::Provider::Group::Groupadd
+        
+        def load_current_resource
+          super
+
+          raise Chef::Exceptions::Group, "Could not find binary /usr/sbin/usermod for #{@new_resource}" unless ::File.exists?("/usr/sbin/usermod")
+        end
+
+        def modify_group_members
+          case node[:platform]
+          when "openbsd", "netbsd"
+            append_flags = "-G"
+          when "solaris"
+            append_flags = "-a -G"
+          end
+
+          unless @new_resource.members.empty?
+            if(@new_resource.append)
+              @new_resource.members.each do |member|
+                Chef::Log.debug("#{@new_resource}: appending member #{member} to group #{@new_resource.group_name}")
+                run_command(:command => "usermod #{append_flags} #{@new_resource.group_name} #{member}" )
+
+              end
+            else
+              raise Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}"
+            end
+          else
+            Chef::Log.debug("#{@new_resource}: not changing group members, the group has no members")
+          end
+        end
+      end
+    end
+  end
+end