sprinkle 0.6.1.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0f1d6725ca74e75f617bcc041b6cfa9479e42cda
+  data.tar.gz: 350bc1e155ea7094583102db987f3b6faa282306
+SHA512:
+  metadata.gz: 9be3e0863b8e304adef43e50a097b96c1aaf1c722dbc8da97d67a2c89b690ce88e3b6a5d7e2b3277dee57215e75ebe5efc6fed603c994693ba8f7c18484724fc
+  data.tar.gz: c20aa43749c3d10ccbc0659072e38fa286db9b87f71033af1bbd2199074751c57cff319b0905e75049c6fc8c0484e303dba0037c21d4dc121aafa5dcf04d14e8

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+*   A users own post :install hooks should happen after a file has completely been moved
+    (when using sudo this was not the case)
+    
+    *Koen Punt*
+
+*   Remove the Deployment module from Object.  
+
+    If anyone is relying on the behavior of placing their deployment block in a required 
+    file then they will first need to manually add the module back to the Object class
+    themselves.  Polluting Object is generally bad.
+
+    *Josh Goebel*
+    
 *   Add support for specifying the Net::SSH keys property
 
     *Chris Kimpton*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sprinkle (0.5)
+    sprinkle (0.6.1.1)
       activesupport (>= 2.0.2)
       capistrano (>= 2.5.5)
       highline (>= 1.4.0)
@@ -13,14 +13,14 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    capistrano (2.14.2)
+    capistrano (2.15.4)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     diff-lcs (1.1.3)
-    highline (1.6.16)
+    highline (1.6.18)
     i18n (0.6.1)
     json (1.7.5)
     multi_json (1.7.2)
@@ -28,10 +28,10 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
+    net-ssh (2.6.7)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    open4 (1.1.0)
+    open4 (1.3.0)
     rake (10.0.4)
     rdoc (3.12)
       json (~> 1.4)

data/lib/sprinkle.rb

@@ -28,13 +28,13 @@ module Sprinkle
   OPTIONS = { :testing => false, :verbose => false, :force => false }
 end
 
-# Object is extended to give the package, policy, and deployment methods. To
-# read about each method, see the corresponding module which is included.
+# Object is extended to Add the package and policy methods. To read about 
+# each method, see the corresponding module which is included.
 #--
 # Define a logging target and understand packages, policies and deployment DSL
 #++
 class Object
-  include Sprinkle::Package, Sprinkle::Policy, Sprinkle::Deployment
+  include Sprinkle::Package, Sprinkle::Policy
 
   def logger # :nodoc:
     # ActiveSupport::BufferedLogger was deprecated and replaced by ActiveSupport::Logger in Rails 4.

data/lib/sprinkle/deployment.rb

@@ -29,6 +29,10 @@ module Sprinkle
   # they will say so on their corresponding documentation page. See
   # Sprinkle::Installers
   #
+  # The deployment block must be included in the script file passed to the 
+  # sprinkle executable.  It may not be loaded from a required file unless you 
+  # first manually include the Sprinkle::Deployment module in the Object class.
+  #
   # <b>Only one deployment block is on any given sprinkle script</b>
   module Deployment
     # The method outlined above which specifies deployment specific information

data/lib/sprinkle/extensions/attributes.rb

@@ -22,7 +22,7 @@ module Sprinkle
     private 
     
     def read_from_package(m)
-      @package.send(m) if @package.respond_to?(m)
+      @package.send(m) if @package.respond_to?(m) and @package.method(m).arity.abs < 2
     end
     
     def option?(sym)

data/lib/sprinkle/installers/transfer.rb

@@ -99,11 +99,12 @@ module Sprinkle
         @orig_destination = destination
         super parent, options, &block
         @binding = options[:binding]
-        # perform the transfer in two steps if we're using sudo
-        if sudo?
+        if sudo? # perform the transfer in two steps if we're using sudo
           final = @destination
           @destination = "/tmp/sprinkle_#{File.basename(@destination)}"
-          post :install, "#{sudo_cmd}mv #{@destination} #{final}"
+          # make sure we push the move ahead of any other post install tasks
+          # a user may have requested
+          post(:install).unshift ["#{sudo_cmd}mv #{@destination} #{final}"]
         end
         owner(options[:owner]) if options[:owner]
         mode(options[:mode]) if options[:mode]

data/lib/sprinkle/script.rb

@@ -4,6 +4,8 @@ module Sprinkle
   # Sprinkle::Script gives you a way to programatically run a given
   # sprinkle script. 
   class Script
+    include Sprinkle::Deployment
+    
     # Run a given sprinkle script. This method is <b>blocking</b> so
     # it will not return until the sprinkling is complete or fails.
     #--

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.6.1.1"
+  Version = "0.6.2"
 end

data/spec/sprinkle/installers/freebsd_pkg_spec.rb

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

data/spec/sprinkle/installers/gem_spec.rb

@@ -9,7 +9,9 @@ describe Sprinkle::Installers::Gem do
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
-    @package = mock(Sprinkle::Package, :name => gem, :version => version)
+    # @package = mock(Sprinkle::Package, :name => gem, :version => version)
+    @package = Package.new "test" do; end
+    @package.version version
     Sprinkle::Installers::Gem.new(@package, gem, options, &block)
   end
 
@@ -18,6 +20,12 @@ describe Sprinkle::Installers::Gem do
     before do
       @installer = create_gem @gem, @version, @options
     end
+    
+    it "should return nil if no source is not configured" do
+      @options.delete(:source)
+      @installer = create_gem @gem, @version, @options
+      @installer.source.should == nil
+    end
 
     it 'should accept a single package to install' do
       @installer.gem.should == @gem

data/spec/sprinkle/installers/openbsd_pkg_spec.rb

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

data/spec/sprinkle/installers/transfer_spec.rb

@@ -72,6 +72,23 @@ describe Sprinkle::Installers::Transfer do
       # end
 
     end
+    
+    context 'pre/post with sudo' do
+      before do
+        @installer = create_transfer @source, @destination do
+          @options[:sudo]= true
+          pre :install, 'op1'
+          post :install, 'op2'
+        end
+        @installer_commands = @installer.install_sequence
+        @delivery = @installer.delivery
+      end
+
+      it "should call the pre and post install commands around the file transfer" do
+        @installer_commands.should == ["op1",:TRANSFER, 
+          "sudo mv /tmp/sprinkle_destination destination", "op2"]
+      end
+    end
 
     context 'multiple pre/post commands' do
       before do

data/spec/sprinkle/script_spec.rb

@@ -6,6 +6,10 @@ describe Sprinkle::Script, 'class' do
     Sprinkle::Script.should respond_to(:sprinkle)
   end
   
+  it 'should respond to deployment' do
+    Sprinkle::Script.new.should respond_to(:deployment)
+  end
+  
 end
 
 describe Sprinkle::Script, 'when given a script' do

data/spec/sprinkle/sprinkle_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 describe Sprinkle do
 
   it 'should automatically extend Object to support package, policy and deployment DSL keywords' do
-    %w( package policy deployment ).each do |keyword|
+    %w( package policy ).each do |keyword|
       Object.should respond_to(keyword.to_sym)
     end
   end

data/sprinkle.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   
+  s.license = "MIT"
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.6.1.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Marcus Crafter
@@ -10,118 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.5
 description: Ruby DSL based software provisioning tool
@@ -268,28 +253,28 @@ files:
 - spec/sprinkle/verify_spec.rb
 - sprinkle.gemspec
 homepage: https://github.com/sprinkle-tool/sprinkle
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sprinkle
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby DSL based software provisioning tool
 test_files:
 - spec/fixtures/my_file.txt