sprinkle 0.7.1.1 → 0.7.2

data/lib/sprinkle/verifiers/package.rb

@@ -1,10 +1,10 @@
 # TODO: remove
 module Sprinkle
   module Verifiers
-    module Package
+    module Package #:nodoc:
       Sprinkle::Verify.register(Sprinkle::Verifiers::Package)
 
-      def has_package(*packages)
+      def has_package(*packages) 
         puts "has_package and has_packages are depreciated"
         raise "please use has_yum and friends instead"
       end

data/lib/sprinkle/verify.rb

@@ -1,5 +1,5 @@
 module Sprinkle
-  # = Verification Methods
+  # = Verify Blocks
   #
   # As documented in Sprinkle::Package, you may define a block on a package
   # which verifies that a package was installed correctly. If this verification
@@ -49,7 +49,7 @@ module Sprinkle
   #
   # To register your verifier, call the register method on Sprinkle::Verify:
   #
-  #   Sprinle::Verify.register(MagicBeansVerifier)
+  #   Sprinkle::Verify.register(MagicBeansVerifier)
   #
   # And now you may use it like any other verifier:
   #

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.7.1.1"
+  Version = "0.7.2"
 end

data/spec/sprinkle/deployment_spec.rb

@@ -25,7 +25,8 @@ describe Sprinkle::Deployment do
 
     it 'should optionally accept installer defaults' do 
       @deployment = create_deployment
-      @deployment.should respond_to(:source)
+      @deployment.source do; end
+      @deployment.defaults.keys.should == [:source]
     end
     
     it 'should provide installer defaults as a proc when requested' do 
@@ -63,8 +64,9 @@ describe Sprinkle::Deployment do
   describe 'when processing policies' do 
     
     before do 
-      @policy = mock(Policy, :process => true)
-      POLICIES = [ @policy ]
+      @policy = mock(Sprinkle::Policy, :process => true)
+      Sprinkle::POLICIES.clear
+      Sprinkle::POLICIES << @policy 
       @deployment = create_deployment
     end
     

data/spec/sprinkle/extensions/rendering_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Package::Rendering, 'rendering' do
-  
+
   before do
+    @root = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
     @package = package :something do
     end
   end
@@ -10,24 +11,38 @@ describe Sprinkle::Package::Rendering, 'rendering' do
   it "should be able to calculate md5s" do
     @package.md5("test").should == "098f6bcd4621d373cade4e832627b4f6"
   end
-  
+
   it "should allow passing locals to template" do
-    t=@package.template("hello <%= world %>", :world => "world")
+    t = @package.template("hello <%= world %>", :world => "world")
     t.should == "hello world"
   end
-  
-  it "should be able to render a file from absolute path" do
-    path=File.join(__FILE__, "../../templates/test.erb")
-    t=@package.render("test")
-    t.should == "hello " 
+
+  it "should allow access to the package context by default" do
+    @package = package :new do
+      @wowser = "wowser"
+    end.instance
+    @package.opts[:world]="world"
+    t=@package.template("hello <%= opts[:world] %> <%= @wowser %>")
+    t.should == "hello world wowser"
   end
-  
+        
   it "should be able to render a file from templates" do
-    @package = package :new do
-      @world = "world"
+    Dir.chdir(@root) do
+      t = @package.render("test")
+      t.should == "hello "
     end
-    t=@package.render("test")
-    t.should == "hello world" 
   end
-    
+
+  it "should be able to render a file from absolute path" do
+    path = File.join(@root, "templates/test.erb")
+    t = @package.render(path)
+    t.should == "hello "
+  end
+  
+  it "should accept binding as second argument" do
+    path = File.join(@root, "templates/locals.erb")
+    t = @package.render(path, :world => "world")
+    t.should == "hello world"
+  end
+
 end

data/spec/sprinkle/installers/file_spec.rb

@@ -14,7 +14,7 @@ describe Sprinkle::Installers::FileInstaller do
     @roles = []
     @deployment = deployment do
       delivery :capistrano
-      installer do; prefix '/usr/bin'; end
+      source do; prefix '/usr/bin'; end
     end
   end
 

data/spec/sprinkle/installers/installer_spec.rb

@@ -14,7 +14,7 @@ describe Sprinkle::Installers::Installer do
     @roles = []
     @deployment = deployment do
       delivery :capistrano
-      installer do; prefix '/usr/bin'; end
+      source do; prefix '/usr/bin'; end
     end
   end
 

data/spec/sprinkle/installers/opensolaris_pkg_spec.rb

@@ -42,10 +42,6 @@ describe Sprinkle::Installers::OpensolarisPkg do
       @installer.send(:install_sequence).should == [ 'op1', 'pkg install ruby', 'op2' ]
     end
 
-    it 'should install a specific version if defined' do
-      pending
-    end
-
   end
 
 end

data/spec/sprinkle/installers/transfer_spec.rb

@@ -14,7 +14,7 @@ describe Sprinkle::Installers::Transfer do
     @roles = []
     @deployment = deployment do
       delivery :capistrano
-      installer do; prefix '/usr/bin'; end
+      source do; prefix '/usr/bin'; end
     end
   end
 

data/spec/sprinkle/package_spec.rb

@@ -66,6 +66,37 @@ CODE
       pkg.version.should == '2.0.2'
     end
 
+    it 'should optionally accept configuration defaults' do
+      pkg = package @name do
+        defaults :some_option => 123, :some_other_option => true
+      end
+      pkg.defaults.should_not be_empty
+      pkg.opts.should eql({:some_option => 123, :some_other_option => true})
+    end
+
+    it 'should merge configuration defaults and additional opts' do
+      pkg = package @name do
+        defaults :some_option => 123, :some_other_option => true
+      end
+      instance = pkg.instance({:some_option => 345, :extra_option => false})
+      instance.opts.should eql({:some_option => 345, :some_other_option => true, :extra_option => false})
+    end
+
+    it 'should be able to use default option as installer argument' do
+      pkg = package @name do
+        defaults :username => 'deploy'
+        add_user opts[:username]
+      end
+      pkg.installers.first.class.should == Sprinkle::Installers::User
+      install_commands = pkg.installers.first.send :install_commands
+      install_commands.should == 'adduser  --gecos ,,, deploy'
+
+      instance = pkg.instance :username => 'deployer'
+
+      install_commands = instance.installers.first.send :install_commands
+      install_commands.should == 'adduser  --gecos ,,, deployer'
+    end
+
     it 'should optionally accept an installer' do
       pkg = package @name do
         gem 'rails'

data/spec/sprinkle/policy_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Policy do
-  include Sprinkle::Policy
+  include Sprinkle::Core
 
   before do
     @name = 'a policy'
@@ -14,7 +14,7 @@ describe Sprinkle::Policy do
     
     it "should raise an error" do
       @deployment = mock(:style => Sprinkle::Actors::Dummy.new {})
-      lambda { @policy.process(@deployment) }.should raise_error(Sprinkle::Policy::NoMatchingServersError)
+      lambda { @policy.process(@deployment) }.should raise_error(Sprinkle::NoMatchingServersError)
     end
   end
 
@@ -44,10 +44,10 @@ describe Sprinkle::Policy do
     end
 
     it 'should add itself to the global policy list' do
-      sz = Sprinkle::Policy::POLICIES.size
+      sz = Sprinkle::POLICIES.size
       p = policy @name, :roles => :app do; end
-      Sprinkle::Policy::POLICIES.size.should == sz + 1
-      Sprinkle::Policy::POLICIES.last.should == p
+      Sprinkle::POLICIES.size.should == sz + 1
+      Sprinkle::POLICIES.last.should == p
     end
 
   end

data/spec/sprinkle/verify_spec.rb

@@ -24,9 +24,6 @@ describe Sprinkle::Verify do
         # 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"
         
@@ -99,10 +96,6 @@ describe Sprinkle::Verify 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

data/spec/templates/locals.erb

@@ -0,0 +1 @@
+hello <%= world %>

data/spec/templates/test.erb

@@ -0,0 +1 @@
+hello <%= @world %>

data/templates/test.erb

@@ -0,0 +1 @@
+hello <%= @world %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -149,6 +149,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .tm_properties
 - .travis.yml
 - CHANGELOG.md
 - CREDITS
@@ -180,6 +181,7 @@ files:
 - examples/rails/packages/search.rb
 - examples/rails/packages/server.rb
 - examples/rails/rails.rb
+- examples/rails/templates/mysql.cnf.erb
 - examples/sprinkle/sprinkle.rb
 - inner.rb
 - lib/sprinkle.rb
@@ -189,6 +191,7 @@ files:
 - lib/sprinkle/actors/local.rb
 - lib/sprinkle/actors/ssh.rb
 - lib/sprinkle/actors/vlad.rb
+- lib/sprinkle/core.rb
 - lib/sprinkle/deployment.rb
 - lib/sprinkle/errors/pretty_failure.rb
 - lib/sprinkle/errors/remote_command_failure.rb
@@ -238,14 +241,12 @@ files:
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
 - lib/sprinkle/utility/log_recorder.rb
-- lib/sprinkle/verifiers/directory.rb
 - lib/sprinkle/verifiers/executable.rb
 - lib/sprinkle/verifiers/file.rb
 - lib/sprinkle/verifiers/package.rb
 - lib/sprinkle/verifiers/permission.rb
 - lib/sprinkle/verifiers/process.rb
 - lib/sprinkle/verifiers/ruby.rb
-- lib/sprinkle/verifiers/symlink.rb
 - lib/sprinkle/verifiers/test.rb
 - lib/sprinkle/verify.rb
 - lib/sprinkle/version.rb
@@ -294,7 +295,10 @@ files:
 - spec/sprinkle/script_spec.rb
 - spec/sprinkle/sprinkle_spec.rb
 - spec/sprinkle/verify_spec.rb
+- spec/templates/locals.erb
+- spec/templates/test.erb
 - sprinkle.gemspec
+- templates/test.erb
 - test.rb
 - work/inner.rb
 homepage: https://github.com/sprinkle-tool/sprinkle
@@ -365,3 +369,5 @@ test_files:
 - spec/sprinkle/script_spec.rb
 - spec/sprinkle/sprinkle_spec.rb
 - spec/sprinkle/verify_spec.rb
+- spec/templates/locals.erb
+- spec/templates/test.erb

data/lib/sprinkle/verifiers/directory.rb

@@ -1,16 +0,0 @@
-module Sprinkle
-  module Verifiers
-    # = Directory Verifier
-    #
-    # Defines a verify which can be used to test the existence of a 
-    # directory.
-    module Directory
-      Sprinkle::Verify.register(Sprinkle::Verifiers::Directory)
-      
-      # Tests that the directory <tt>dir</tt> exists.
-      def has_directory(dir)
-        test "-d #{dir}"
-      end
-    end
-  end
-end

data/lib/sprinkle/verifiers/symlink.rb

@@ -1,30 +0,0 @@
-module Sprinkle
-  module Verifiers
-    # = Symlink Verifier
-    #
-    # Contains a verifier to check the existance of a symbolic link.
-    # 
-    # == Example Usage
-    #
-    # First, checking for the existence of a symlink:
-    #
-    #   verify { has_symlink '/usr/special/secret/pointer' }
-    #
-    # Second, checking that the symlink points to a specific place:
-    #
-    #   verify { has_symlink '/usr/special/secret/pointer', '/usr/local/realfile' }
-    module Symlink
-      Sprinkle::Verify.register(Sprinkle::Verifiers::Symlink)
-      
-      # Checks that <tt>symlink</tt> is a symbolic link. If <tt>file</tt> is 
-      # given, it checks that <tt>symlink</tt> points to <tt>file</tt>
-      def has_symlink(symlink, file = nil)
-        if file.nil?
-          test "-L #{symlink}"
-        else
-          test "'#{file}' = `readlink #{symlink}`"
-        end
-      end
-    end
-  end
-end