sprinkle 0.3.6 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/lib/sprinkle/installers/group.rb

@@ -0,0 +1,15 @@
+module Sprinkle
+  module Installers
+    class Group < Installer
+      def initialize(package, groupname, options, &block)
+        super package, &block
+        @groupname = groupname
+        @options = options
+      end
+      protected 
+      def install_commands
+        "addgroup #{@options[:flags]} #{@groupname}"
+      end
+    end
+  end
+end

data/lib/sprinkle/installers/runner.rb

@@ -3,8 +3,8 @@ module Sprinkle
 		class Runner < Installer
 			attr_accessor :cmd #:nodoc:
 
-			def initialize(parent, cmd) #:nodoc:
-				super parent
+			def initialize(parent, cmd, &block) #:nodoc:
+			  super parent, {}, &block
 				@cmd = cmd
 			end
 

data/lib/sprinkle/installers/user.rb

@@ -3,8 +3,8 @@ module Sprinkle
     class User < Installer
       def initialize(package, username, options, &block)
         super package, &block
-        @username=username
-        @options =options
+        @username = username
+        @options = options
       end
       protected 
       def install_commands

data/lib/sprinkle/package.rb

@@ -122,7 +122,11 @@ module Sprinkle
         self.instance_eval &block
       end
       def add_user(username, options={},  &block)
-        @installers<<Sprinkle::Installers::User.new(self, username, options, &block)
+        @installers << Sprinkle::Installers::User.new(self, username, options, &block)
+      end
+
+      def add_group(group, options={},  &block)
+        @installers << Sprinkle::Installers::Group.new(self, group, options, &block)
       end
 
       def freebsd_pkg(*names, &block)
@@ -192,7 +196,7 @@ module Sprinkle
       end  
      
       def noop(&block)
-        @installers << Sprinkle::Installers::Noop.new(self, name, options, &block)
+        @installers << Sprinkle::Installers::Runner.new(self, "echo noop", &block)
       end
       
       def push_text(text, path, options = {}, &block)
@@ -207,8 +211,8 @@ module Sprinkle
         @installers << Sprinkle::Installers::Transfer.new(self, source, destination, options, &block)
       end
 
-			def runner(cmd)
-				@installers << Sprinkle::Installers::Runner.new(self, cmd)
+			def runner(cmd, &block)
+				@installers << Sprinkle::Installers::Runner.new(self, cmd, &block)
 			end
 
       def verify(description = '', &block)

data/lib/sprinkle/verifiers/file.rb

@@ -22,7 +22,7 @@ module Sprinkle
         @commands << "grep '#{text}' #{path}"
       end
       def user_present(username) 
-        @commands << %Q{grep -q -e  \'^#{username}:x\' /etc/passwd && test -d ~#{username}}
+        has_user username
       end
       def matches_local(localfile, remotefile, mode=nil)
         raise "Couldn't find local file #{localfile}" unless ::File.exists?(localfile)

data/lib/sprinkle/verifiers/ruby.rb

@@ -15,10 +15,10 @@ module Sprinkle
         @commands << "ruby -e \"#{files.join(';')}\""
       end
       
-      # Checks if a gem exists by calling "sudo gem list" and grepping against it.
-      def has_gem(name, version=nil)
-        version = version.nil? ? '' : "--version '#{version}'"
-        @commands << "sudo gem list '#{name}' --installed #{version} > /dev/null"
+      # Checks if a gem exists by calling "gem list" and grepping against it.
+      def has_gem(name, version = nil)
+        version = version ? "--version '#{version}'" : '' 
+        @commands << "gem list '#{name}' --installed #{version} > /dev/null"
       end
     end
   end

data/lib/sprinkle/verifiers/users_groups.rb

@@ -0,0 +1,33 @@
+module Sprinkle
+  module Verifiers
+    # = Users and groups Verifier
+    #
+    # Tests for the existance of users and groups.
+    #
+    # == Example Usage
+    #
+    #   verify do
+    #     has_user 'ntp'
+    #     has_user 'noone', :in_group => 'nobody'
+    #     has_group 'nobody'
+    #   end
+    #
+    module UsersGroups
+      Sprinkle::Verify.register(Sprinkle::Verifiers::UsersGroups)
+      
+      # Tests that the user exists
+      def has_user(user, opts = {})
+        if opts[:in_group]
+          @commands << "id -G #{user} | xargs -n1 echo | grep #{opts[:in_group]}"
+        else
+          @commands << "id #{user}"
+        end
+      end
+      
+      # Tests that the group exists
+      def has_group(group)
+        @commands << "id -g #{group}"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'sprinkle'
 
-module Kernel
+class Object
   def logger
     @@__log_file__ ||= StringIO.new
-    @@__log__ = ActiveSupport::BufferedLogger.new @@__log_file__
+    @@__log__ = ActiveSupport::BufferedLogger.new @@__log_file__, ActiveSupport::BufferedLogger::Severity::INFO
   end
 end

data/spec/sprinkle/configurable_spec.rb

@@ -11,6 +11,7 @@ describe Sprinkle::Configurable do
     @configurable = MyPrefix::Configurable.new
     @default = Proc.new { }
     @defaults = { :configurable => @default }
+    @deployment = Object.new
     @deployment.stub!(:defaults).and_return(@defaults)
     @deployment.stub!(:style)
   end

data/spec/sprinkle/package_spec.rb

@@ -8,7 +8,7 @@ describe Sprinkle::Package do
     @empty = Proc.new { }
     @opts = { }
   end
-  
+
   # Kind of a messy way to do this but it works and DRYs out
   # the specs. Checks to make sure an installer is receiving
   # the block passed to it throught the package block.
@@ -21,12 +21,12 @@ describe Sprinkle::Package do
           pre :install, 'preOp'
         end
       end
-      
+
       pre_count = pkg.installers.first.instance_variable_get(:@pre)[:install].length
     }.should change { pre_count }.by(1)
 CODE
   end
-  
+
   # More of Mitchell's meta-programming to dry up specs.
   def create_package_with_blank_verify(n = 1)
     eval(<<CODE)
@@ -142,6 +142,26 @@ CODE
       pkg.installers.first.class.should == Sprinkle::Installers::Gem
     end
 
+    it 'should optionally accept a noop installer' do
+      pkg = package @name do
+        noop do
+        end
+      end
+      pkg.should respond_to(:noop)
+      pkg.installers.first.class.should == Sprinkle::Installers::Runner
+      @installer = pkg.installers.first
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == 'echo noop'
+    end
+
+    it 'should optionally accept an group installer' do
+      pkg = package @name do
+        add_group 'bob'
+      end
+      pkg.should respond_to(:add_group)
+      pkg.installers.first.class.should == Sprinkle::Installers::Group
+    end
+
     it 'should optionally accept a source installer' do
       pkg = package @name do
         source 'archive'
@@ -150,6 +170,14 @@ CODE
       pkg.installers.first.class.should == Sprinkle::Installers::Source
     end
 
+    it 'should optionally accept an user installer' do
+      pkg = package @name do
+        add_user 'bob'
+      end
+      pkg.should respond_to(:add_user)
+      pkg.installers.first.class.should == Sprinkle::Installers::User
+    end
+
     it 'should allow multiple installer steps to be defined and respect order' do
       pkg = package @name do
         source 'archive'
@@ -179,7 +207,7 @@ CODE
       pkg.should respond_to(:source)
       pkg.installers.first.class.should == Sprinkle::Installers::Source
     end
-    
+
     it 'should forward block to installer superclass' do
       check_block_forwarding_on(:source)
     end
@@ -192,13 +220,13 @@ CODE
     end
 
   end
-  
+
   describe 'with an apt installer' do
     it 'should forward block to installer superclass' do
       check_block_forwarding_on(:apt)
     end
   end
-  
+
   describe 'with an rpm installer' do
     it 'should forward block to installer superclass' do
       check_block_forwarding_on(:rpm)
@@ -213,7 +241,7 @@ CODE
       end
       pkg.recommends.should include(:rubygems)
     end
-    
+
     it 'should forward block to installer superclass' do
       check_block_forwarding_on(:gem)
     end
@@ -256,7 +284,7 @@ CODE
       end
 
     end
-    
+
     describe 'with verifications' do
       before do
         @pkg = create_package_with_blank_verify(3)
@@ -264,47 +292,47 @@ CODE
         @installer.stub!(:defaults)
         @installer.stub!(:process)
       end
-      
+
       describe 'with forcing' do
         before do
           # Being explicit
           Sprinkle::OPTIONS[:force] = true
         end
-        
+
         it 'should process verifications only once' do
           @pkg.should_receive(:process_verifications).once
           @pkg.process(@deployment, @roles)
         end
-        
+
         after do
           # Being explicit
           Sprinkle::OPTIONS[:force] = false
         end
       end
-      
+
       describe 'without forcing' do
         before do
           # Being explicit
           Sprinkle::OPTIONS[:force] = false
         end
-        
+
         it 'should process verifications twice' do
           @pkg.should_receive(:process_verifications).once.with(@deployment, @roles, true).and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
           @pkg.should_receive(:process_verifications).once.with(@deployment, @roles).and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
         end
-        
+
         it 'should continue with installation if pre-verification fails' do
           @pkg.should_receive(:process_verifications).twice.and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
           @installer.should_receive(:defaults)
           @installer.should_receive(:process)
         end
-        
+
         it 'should only process verifications once and should not process installer if verifications succeed' do
           @pkg.should_receive(:process_verifications).once.and_return(nil)
           @installer.should_not_receive(:defaults)
           @installer.should_not_receive(:process)
         end
-        
+
         after do
           begin
             @pkg.process(@deployment, @roles)
@@ -314,7 +342,7 @@ CODE
     end
 
   end
-  
+
   describe 'when processing verifications' do
     before do
       @deployment = mock(Sprinkle::Deployment)
@@ -327,7 +355,7 @@ CODE
       @logger = mock(ActiveSupport::BufferedLogger, :debug => true, :debug? => true)
       @logger.stub!(:info)
     end
-    
+
     it 'should request _each_ verification to configure itself against the deployment context' do
       @pkg.verifications.each do |v|
         v.should_receive(:defaults).with(@deployment).once
@@ -341,16 +369,16 @@ CODE
         v.should_receive(:process).with(@roles).once
       end
     end
-    
+
     it 'should enter a log info event to notify user whats happening' do
       @pkg.verifications.each do |v|
         v.stub!(:defaults)
         v.stub!(:process)
       end
-      
+
       @pkg.should_receive(:logger).once.and_return(@logger)
     end
-    
+
     after do
       @pkg.process_verifications(@deployment, @roles)
     end
@@ -419,7 +447,7 @@ CODE
       @v1 = package :v1, :provides => :virtual do; end
       @v2 = package :v2, :provides => :virtual do; end
     end
-    
+
     it 'should select package for an array' do
       @a.should_receive(:select_package).with(:virtual, [@v1,@v2]).and_return(@v1)
       @a.tree do; end
@@ -440,31 +468,31 @@ CODE
     end
 
   end
-  
-  describe 'with verifications' do    
+
+  describe 'with verifications' do
     it 'should create a Sprinkle::Verification object for the verify block' do
       Sprinkle::Verify.should_receive(:new).once
-      
+
       create_package_with_blank_verify
     end
-    
+
     it 'should create multiple Sprinkle::Verification objects for multiple verify blocks' do
       Sprinkle::Verify.should_receive(:new).twice
-      
+
       create_package_with_blank_verify(2)
     end
-    
+
     it 'should add each Sprinkle::Verificaton object to the @verifications array' do
       @pkg = create_package_with_blank_verify(3)
       @pkg.verifications.length.should eql(3)
     end
-    
+
     it 'should initialize Sprinkle::Verification with the package name, description, and block' do
       Sprinkle::Verify.should_receive(:new) do |pkg, desc|
         pkg.name.should eql(@name)
         desc.should eql('stuff happens')
       end
-      
+
       # We do a should_not raise_error because if a block was NOT passed, an error
       # is raised. This is specced in verification_spec.rb
       lambda { create_package_with_blank_verify }.should_not raise_error

data/spec/sprinkle/verify_spec.rb

@@ -14,6 +14,18 @@ describe Sprinkle::Verify do
 
         # Check a directory exists
         has_directory 'mydir'
+        
+        # Check for a user
+        has_user "bob"
+        
+        # Check for user with old API
+        user_present "someuser"
+        
+        # Check for user in a group
+        has_user "alf", :in_group => "alien"
+        
+        # Check for a group
+        has_group "bobgroup"
 
         # Check a symlink exists
         has_symlink 'mypointer'
@@ -64,6 +76,22 @@ describe Sprinkle::Verify do
     it 'should do a "test -d" on the has_directory check' do
       @verification.commands.should include('test -d mydir')
     end
+    
+    it 'should use id to check for user in group' do
+      @verification.commands.should include("id -G alf | xargs -n1 echo | grep alien")
+    end
+    
+    it 'should use id to check for user' do
+      @verification.commands.should include('id bob')
+    end
+    
+    it 'should use id to check for user via user_present' do
+      @verification.commands.should include('id someuser')
+    end
+
+    it 'should use id to check for group' do
+      @verification.commands.should include('id -g bobgroup')
+    end
 
     it 'should do a "test -L" to check something is a symbolic link' do
       @verification.commands.should include('test -L mypointer')
@@ -90,7 +118,7 @@ describe Sprinkle::Verify do
     end
 
     it 'should check that a ruby gem is installed' do
-      @verification.commands.should include("sudo gem list 'rails' --installed --version '2.1.0' > /dev/null")
+      @verification.commands.should include("gem list 'rails' --installed --version '2.1.0' > /dev/null")
     end
 
     it 'should check that an RPM is installed' do

data/sprinkle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sprinkle"
-  s.version = "0.3.6"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter"]
-  s.date = "2011-09-10"
+  s.date = "2011-09-18"
   s.description = "Ruby DSL based software provisioning tool"
   s.email = "crafterm@redartisan.com"
   s.executables = ["sprinkle"]
@@ -65,10 +65,10 @@ Gem::Specification.new do |s|
     "lib/sprinkle/installers/freebsd_pkg.rb",
     "lib/sprinkle/installers/freebsd_portinstall.rb",
     "lib/sprinkle/installers/gem.rb",
+    "lib/sprinkle/installers/group.rb",
     "lib/sprinkle/installers/install_package.rb",
     "lib/sprinkle/installers/installer.rb",
     "lib/sprinkle/installers/mac_port.rb",
-    "lib/sprinkle/installers/noop.rb",
     "lib/sprinkle/installers/openbsd_pkg.rb",
     "lib/sprinkle/installers/opensolaris_pkg.rb",
     "lib/sprinkle/installers/pacman.rb",
@@ -96,7 +96,7 @@ Gem::Specification.new do |s|
     "lib/sprinkle/verifiers/rpm.rb",
     "lib/sprinkle/verifiers/ruby.rb",
     "lib/sprinkle/verifiers/symlink.rb",
-    "lib/sprinkle/verifiers/user.rb",
+    "lib/sprinkle/verifiers/users_groups.rb",
     "lib/sprinkle/verify.rb",
     "script/console",
     "script/destroy",
@@ -117,7 +117,6 @@ Gem::Specification.new do |s|
     "spec/sprinkle/installers/gem_spec.rb",
     "spec/sprinkle/installers/installer_spec.rb",
     "spec/sprinkle/installers/mac_port_spec.rb",
-    "spec/sprinkle/installers/noop_spec.rb",
     "spec/sprinkle/installers/openbsd_pkg_spec.rb",
     "spec/sprinkle/installers/opensolaris_pkg_spec.rb",
     "spec/sprinkle/installers/push_text_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -137,10 +137,10 @@ files:
 - lib/sprinkle/installers/freebsd_pkg.rb
 - lib/sprinkle/installers/freebsd_portinstall.rb
 - lib/sprinkle/installers/gem.rb
+- lib/sprinkle/installers/group.rb
 - lib/sprinkle/installers/install_package.rb
 - lib/sprinkle/installers/installer.rb
 - lib/sprinkle/installers/mac_port.rb
-- lib/sprinkle/installers/noop.rb
 - lib/sprinkle/installers/openbsd_pkg.rb
 - lib/sprinkle/installers/opensolaris_pkg.rb
 - lib/sprinkle/installers/pacman.rb
@@ -168,7 +168,7 @@ files:
 - lib/sprinkle/verifiers/rpm.rb
 - lib/sprinkle/verifiers/ruby.rb
 - lib/sprinkle/verifiers/symlink.rb
-- lib/sprinkle/verifiers/user.rb
+- lib/sprinkle/verifiers/users_groups.rb
 - lib/sprinkle/verify.rb
 - script/console
 - script/destroy
@@ -189,7 +189,6 @@ files:
 - spec/sprinkle/installers/gem_spec.rb
 - spec/sprinkle/installers/installer_spec.rb
 - spec/sprinkle/installers/mac_port_spec.rb
-- spec/sprinkle/installers/noop_spec.rb
 - spec/sprinkle/installers/openbsd_pkg_spec.rb
 - spec/sprinkle/installers/opensolaris_pkg_spec.rb
 - spec/sprinkle/installers/push_text_spec.rb

data/lib/sprinkle/installers/noop.rb

@@ -1,20 +0,0 @@
-module Sprinkle
-  module Installers
-    # = Noop Installer
-    #
-    # This installer does nothing, it's simply useful for running pre / post hooks by themselves. 
-    # 
-    class Noop < Installer
-      def initialize(parent, name, options = {}, &block) #:nodoc:
-        super parent, options, &block
-      end
-
-      protected
-
-        def install_commands #:nodoc:
-          'echo noop'
-        end
-
-    end
-  end
-end

data/lib/sprinkle/verifiers/user.rb

@@ -1,15 +0,0 @@
-module Sprinkle
-  module Verifiers
-    # = User Verifier
-    # This was added so we dont have to verify a file to see if user was created
-    # Defines a verify which can be used to test the existence of a user.
-    module Users
-      Sprinkle::Verify.register(Sprinkle::Verifiers::Users)
-      
-      # Tests that the user exists
-      def has_user(user)
-        @commands << "id #{user}"
-      end
-    end
-  end
-end

data/spec/sprinkle/installers/noop_spec.rb

@@ -1,23 +0,0 @@
-require File.expand_path("../../spec_helper", File.dirname(__FILE__))
-
-describe Sprinkle::Installers::Noop do
-
-  before do
-    @package = mock(Sprinkle::Package, :name => 'spec')
-  end
-
-  def create_noop(names, options = {}, &block)
-    Sprinkle::Installers::Noop.new(@package, options, &block)
-  end
-
-  describe 'during installation' do
-
-    it 'should always be empty' do
-      @installer = create_noop 'spec'
-      @install_commands = @installer.send :install_commands
-      @install_commands.should == 'echo noop'
-    end
-
-  end
-
-end