supply_drop 0.17.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8744bb6f0cd2db85f0924ea55a9035fbb781506a
-  data.tar.gz: 8c2d3aa1e1a1ebad32f70f454980b394da188ac1
+  metadata.gz: d3b27cb3b06d1f255fa46628af3ca982d2132226
+  data.tar.gz: d68003e29224e7eaab419a3e5c8f2a66f819ffa7
 SHA512:
-  metadata.gz: 49fdb53d029171c3c7dcdd13264da21181e11f8f2ef8c8b55f33f0eacf75b3b8eaebd3d040496c1a0235eba44d0b9f2539598f67478fa93681e2a52dd9b13a59
-  data.tar.gz: e0bf5cbb600db204ce1d33a61ab4da829291c81429244acab4c40e2651a4141b2900a31325cac2f3f848fdd4991ff3b2b7b6551c86722b2cb8a469a1181c95c5
+  metadata.gz: 0e7aac0f6412780ba6bfb3e380253187e07a3a3cab6cce1987c9798f915271699ad8c67f3a1f3f817978dad493b9360202607281c96f969a903c238a37f7fc13
+  data.tar.gz: 3d9f198bbddcf4c7be91229336b12e8554922a78554c25dbe0214c25b5700038770f91725052eefadd92f4debe86c3c1bf486d47a3f72799bcc86cf3cc061fa2

data/README.md

@@ -1,5 +1,7 @@
 # supply_drop
 
+*THIS IS THE DOCUMENTATION FOR THE 1.x VERSION OF SUPPLY DROP THAT IS COMPATIBLE WITH CAPISTRANO 3.x. 0.x [docs](https://github.com/pitluga/supply_drop/tree/cap-2x) available on the cap-2x branch*
+
 supply_drop is a capistrano plugin to facitiate provisioning servers with puppet, without using the puppet server. It works by simply rsyncing your puppet configuration files to your servers and running puppet apply. It strives to allow you to write idiomatic puppet scripts while being as lightweight as possible.
 
 [![Build Status](https://secure.travis-ci.org/pitluga/supply_drop.png)](http://travis-ci.org/pitluga/supply_drop)
@@ -14,43 +16,38 @@ or with Bundler
 
 then at the top of your deploy.rb
 
-    require 'rubygems'
     require 'supply_drop'
 
 ### Tasks
 
-    cap puppet:bootstrap:debian
-    cap puppet:bootstrap:ubuntu
-    cap puppet:bootstrap:osx
-    cap puppet:bootstrap:redhat
+    cap staging puppet:bootstrap:debian
+    cap staging puppet:bootstrap:ubuntu
+    cap staging puppet:bootstrap:osx
+    cap staging puppet:bootstrap:redhat
 
 This does a simple apt-get install of puppet on the target servers.
 
-    cap puppet:bootstrap:puppetlabs:debian
-    cap puppet:bootstrap:puppetlabs:ubuntu
+    cap staging puppet:bootstrap:puppetlabs:debian
+    cap staging puppet:bootstrap:puppetlabs:ubuntu
 
 This is the same as above, but it grabs the most recent versions of puppet via apt repositories provided by puppetlabs.
 
-    cap puppet:noop
+    cap staging puppet:noop
 
 This will show you a list of the pending changes to be applied server-by-server.
 
-    cap puppet:apply
+    cap staging puppet:apply
 
 Applies the pending changes to all the servers.
 
-    cap puppet:syntax_check
-
-Locally syntax checks all the puppet files and erb templates. Requires you to have puppet installed locally.
-
-    cap puppet:unlock
+    cap staging puppet:unlock
 
 Remove any stale lock files created by supply_drop when locking is used and something went wrong.
 
 
-You can specify that one of your servers should not be puppeted by setting the :nopuppet flag to true, like so. It will then be skipped by all the above commands.
+Only servers in the puppet role will be puppeted.
 
-    role :weird_thing, '33.33.33.33', :nopuppet => true
+    role :puppet, '33.33.33.33'
 
 ### Variables
 
@@ -88,23 +85,6 @@ determines whether the rsync commands for multiple servers are run in parallel t
 
 sets the maximum number of rsync commands that are run concurrently
 
-    set :puppet_syntax_check, false
-
-when true, will syntax check your puppet files and erb templates before rsyncing them to your servers. This is an
-experimental feature and is quite slow at the moment.
-
-    set :puppet_stream_output, false
-
-will write the incremental output from the hosts to the screen instead of waiting until complete and printing by host.
-
-    set :puppet_write_to_file, nil
-
-a file to additionally write puppet output to, useful for large noops with small scrollbacks.
-
-    set :puppet_runner, nil
-
-allows you to specify the user to execute the puppet command as. Like running sudo -u puppet args from the command line.
-
     set :puppet_lock_file, '/tmp/puppet.lock'
 
 sets a lockfile on each remote host to prevent multiple users from puppeting the same node simultaneously. Set to nil to disable locking. You can alternately temporarily disable locking by setting the NO_PUPPET_LOCKING environment variable to any value.
@@ -136,6 +116,7 @@ If you write anything complicated, write a test for it. Test that your changes w
 * Mike Pilat [mikepilat](https://github.com/mikepilat "github")
 * Dan Manges [dan-manges](https://github.com/dan-manges "github") (one soda's worth)
 * Brian Cosgrove [cosgroveb](https://github.com/cosgroveb "github")
+* Troy Howard [thoward](https://github.com/thoward "github")
 
 Copyright (c) 2012-2013 Tony Pitluga
 

data/lib/supply_drop.rb

@@ -1,12 +1,17 @@
 require 'supply_drop/rsync'
 require 'supply_drop/async_enumerable'
-require 'supply_drop/plugin'
-require 'supply_drop/syntax_checker'
 require 'supply_drop/thread_pool'
 require 'supply_drop/util'
-require 'supply_drop/writer/batched'
-require 'supply_drop/writer/file'
-require 'supply_drop/writer/streaming'
 require 'supply_drop/tasks'
 
-Capistrano.plugin :supply_drop, SupplyDrop::Plugin
+set :puppet_source, '.'
+set :puppet_destination, '/var/tmp/supply_drop'
+set :puppet_command, 'puppet apply'
+set :puppet_lib, lambda { "#{fetch(:puppet_destination)}/modules" }
+set :puppet_parameters, lambda { fetch(:puppet_verbose) ? '--debug --trace --color false puppet.pp' : '--color false puppet.pp' }
+set :puppet_verbose, false
+set :puppet_excludes, %w(.git .svn)
+set :puppet_parallel_rsync, true
+set :puppet_parallel_rsync_pool_size, 10
+set :puppet_runner, nil
+set :puppet_lock_file, '/tmp/puppet.lock'

data/lib/supply_drop/tasks.rb

@@ -1,148 +1,215 @@
-Capistrano::Configuration.instance.load do
-  namespace :puppet do
-    set :puppet_source, '.'
-    set :puppet_destination, '/tmp/supply_drop'
-    set :puppet_command, 'puppet apply'
-    set :puppet_lib, lambda { "#{puppet_destination}/modules" }
-    set :puppet_parameters, lambda { puppet_verbose ? '--debug --trace puppet.pp' : 'puppet.pp' }
-    set :puppet_verbose, false
-    set :puppet_excludes, %w(.git .svn)
-    set :puppet_stream_output, false
-    set :puppet_parallel_rsync, true
-    set :puppet_parallel_rsync_pool_size, 10
-    set :puppet_syntax_check, false
-    set :puppet_write_to_file, nil
-    set :puppet_runner, nil
-    set :puppet_lock_file, '/tmp/puppet.lock'
-    set :hiera_package, nil
-
-    namespace :bootstrap do
-      desc "installs puppet and hiera via rubygems on an osx host"
-      task :osx do
+namespace :puppet do
+  task :defaults do
+  end
+
+  namespace :bootstrap do
+    desc "installs puppet via rubygems on an osx host"
+    task :osx do
+      on roles(:puppet) do
         if fetch(:use_sudo, true)
-          run "#{sudo} gem install puppet hiera --no-ri --no-rdoc"
+          sudo :gem, "install puppet --no-ri --no-rdoc"
         else
-          run "gem install puppet --no-ri --no-rdoc"
+          execute :gem, "install puppet --no-ri --no-rdoc"
         end
       end
+    end
+
+    desc "installs puppet via apt on an ubuntu or debian host"
+    task :ubuntu do
+      on roles(:puppet) do
+        execute :mkdir, "-p #{fetch(:puppet_destination)}"
+        sudo "apt-get update"
+        sudo "apt-get install -y puppet rsync"
+      end
+    end
 
-      desc "installs puppet via apt on a debian host"
-      task :debian do
-        run "mkdir -p #{puppet_destination}"
-        run "#{sudo} apt-get update"
-        run "#{sudo} apt-get install -y puppet #{hiera_package} rsync"
+    desc "installs puppet via yum on a centos/red hat host"
+    task :redhat do
+      on roles(:puppet) do
+        execute :mkdir, "-p #{fetch(:puppet_destination)}"
+        sudo :yum, "-y install puppet rsync"
       end
+    end
 
-      desc "installs puppet via apt on an ubuntu host"
+    namespace :puppetlabs do
+      desc "setup the puppetlabs repo, then install via the normal method"
       task :ubuntu do
-        run "mkdir -p #{puppet_destination}"
-        run "#{sudo} apt-get update"
-        run "#{sudo} apt-get install -y puppet #{hiera_package} rsync"
+        on roles(:puppet) do
+          execute :echo, :deb, "http://apt.puppetlabs.com/ $(lsb_release -sc) main | #{sudo} tee /etc/apt/sources.list.d/puppet.list"
+          execute :echo, :deb, "http://apt.puppetlabs.com/ $(lsb_release -sc) dependencies | #{sudo} tee -a /etc/apt/sources.list.d/puppet.list"
+          sudo "apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30"
+          puppet.bootstrap.ubuntu
+        end
       end
 
-      desc "installs puppet via yum on a centos/red hat host"
+      desc "setup the puppetlabs repo, then install via the normal method"
       task :redhat do
-        run "mkdir -p #{puppet_destination}"
-        run "#{sudo} yum -y install puppet rsync"
+        info "PuppetLabs::RedHat bootstrap is not implemented yet"
       end
+    end
+  end
 
-      namespace :puppetlabs do
-        desc "setup the puppetlabs repo, then install via the normal method"
-        task :ubuntu do
-          set :hiera_package, "hiera"
-          run "echo deb http://apt.puppetlabs.com/ $(lsb_release -sc) main | #{sudo} tee /etc/apt/sources.list.d/puppet.list"
-          run "echo deb http://apt.puppetlabs.com/ $(lsb_release -sc) dependencies | #{sudo} tee -a /etc/apt/sources.list.d/puppet.list"
-          run "#{sudo} apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30"
-          puppet.bootstrap.ubuntu
-        end
+  desc "runs puppet with --noop flag to show changes"
+  task :noop do
+    begin
+      on roles(:puppet) do
+        lock
+        prepare
+      end
+      run_locally do
+        update_code
+      end
+      on roles(:puppet) do
+        puppet(:noop)
+      end
+    ensure
+      on roles(:puppet) do
+        unlock
+      end
+    end
+  end
 
-        desc "setup the puppetlabs repo, then install via the normal method"
-        task :debian do
-          set :hiera_package, "hiera"
-          run "echo deb http://apt.puppetlabs.com/ $(lsb_release -sc) main | #{sudo} tee /etc/apt/sources.list.d/puppet.list"
-          run "echo deb http://apt.puppetlabs.com/ $(lsb_release -sc) dependencies | #{sudo} tee -a /etc/apt/sources.list.d/puppet.list"
-          run "#{sudo} apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30"
-          puppet.bootstrap.debian
-        end
+  desc "an atomic way to noop and apply changes while maintaining a lock"
+  task :noop_apply do
+    begin
+      on roles(:puppet) do
+        lock
+        prepare
+      end
+      run_locally do
+        update_code
+      end
 
-        desc "setup the puppetlabs repo, then install via the normal method"
-        task :redhat do
-          logger.info "PuppetLabs::RedHat bootstrap is not implemented yet"
-        end
+      on roles(:puppet) do
+        puppet(:noop)
       end
-    end
 
-    desc "checks the syntax of all *.pp and *.erb files"
-    task :syntax_check do
-      checker = SupplyDrop::SyntaxChecker.new(puppet_source)
-      logger.info "Syntax Checking..."
-      errors = false
-      checker.validate_puppet_files.each do |file, error|
-        logger.important "Puppet error: #{file}"
-        logger.important error
-        errors = true
-      end
-      checker.validate_templates.each do |file, error|
-        logger.important "Template error: #{file}"
-        logger.important error
-        errors = true
-      end
-      raise "syntax errors" if errors
-    end
+      q = "Apply changes?".to_sym
+      ask(q, "y/N")
 
-    desc "pushes the current puppet configuration to the server"
-    task :update_code, :except => { :nopuppet => true } do
-      syntax_check if puppet_syntax_check
-      supply_drop.rsync
+      if (fetch(q).strip.downcase == "y")
+        puts "Applying changes"
+        on roles(:puppet) do
+          puppet(:apply)
+        end
+      end
+    ensure
+      on roles(:puppet) do
+        unlock
+      end
     end
+  end
 
-    desc "runs puppet with --noop flag to show changes"
-    task :noop, :except => { :nopuppet => true } do
-      supply_drop.lock
-      transaction do
-        on_rollback { supply_drop.unlock }
-        supply_drop.prepare
+  desc "alias for noop_apply"
+  task :noopply => :noop_apply
+
+  desc "applies the current puppet config to the server"
+  task :apply do
+    begin
+      on roles(:puppet) do
+        lock
+        prepare
+      end
+      run_locally do
         update_code
-        supply_drop.noop
-        supply_drop.unlock
+      end
+      on roles(:puppet) do
+        puppet(:apply)
+      end
+    ensure
+      on roles(:puppet) do
+        unlock
       end
     end
+  end
 
-    desc "an atomic way to noop and apply changes while maintaining a lock"
-    task :noop_apply, :except => { :nopuppet => true } do
-      supply_drop.lock
-      transaction do
-        on_rollback { supply_drop.unlock }
-        supply_drop.prepare
-        update_code
-        supply_drop.noop
-        supply_drop.apply if Capistrano::CLI.ui.agree("Apply? (yes/no) ")
-        supply_drop.unlock
-      end
+  desc "clears the puppet lockfile on the server."
+  task :remove_lock do
+    on roles(:puppet) do
+      warn "WARNING: puppet:remove_lock is deprecated, please use puppet:unlock instead"
+      unlock
     end
+  end
 
-    desc "applies the current puppet config to the server"
-    task :apply, :except => { :nopuppet => true } do
-      supply_drop.lock
-      transaction do
-        on_rollback { supply_drop.unlock }
-        supply_drop.prepare
-        update_code
-        supply_drop.apply
-        supply_drop.unlock
-      end
+  desc "clears the puppet lockfile on the server."
+  task :unlock do
+    on roles(:puppet) do
+      unlock
     end
+  end
+
+  private
+
+  def update_code
+    SupplyDrop::Util.thread_pool_size = fetch(:puppet_parallel_rsync_pool_size)
+    servers = SupplyDrop::Util.optionally_async(roles(:puppet), fetch(:puppet_parallel_rsync))
+    global_overrides = {}
+    global_overrides[:user] = fetch(:user, ENV['USER'])
+    global_overrides[:port] = fetch(:port) if any?(:port)
+    failed_servers = servers.map do |server|
+      server_overrides = {}
+      server_overrides[:user] = server.user if server.user
+      server_overrides[:port] = server.port if server.port
+      rsync_cmd = SupplyDrop::Rsync.command(
+        fetch(:puppet_source),
+        SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.hostname, fetch(:puppet_destination)),
+        :delete => true,
+        :excludes => fetch(:puppet_excludes),
+        :ssh => (fetch(:ssh_options) || {}).merge(server.properties.ssh_options||{}).merge(global_overrides.merge(server_overrides))
+      )
+      info rsync_cmd
+      server.hostname unless system rsync_cmd
+    end.compact
+
+    raise "rsync failed on #{failed_servers.join(',')}" if failed_servers.any?
+  end
 
-    desc "clears the puppet lockfile on the server."
-    task :remove_lock, :except => { :nopuppet => true} do
-      logger.important "WARNING: puppet:remove_lock is depricated, please use puppet:unlock instead"
-      supply_drop.unlock
+  def prepare
+    execute :mkdir, "-p #{fetch(:puppet_destination)}"
+    sudo :chown, "-R $USER: #{fetch(:puppet_destination)}"
+  end
+
+  def apply
+    puppet(:apply)
+  end
+
+  def lock
+    if should_lock?
+      execute <<-CHECK_LOCK
+if [ -f #{fetch(:puppet_lock_file)} ]; then stat -c "#{red_text("Puppet in progress, #{fetch(:puppet_lock_file)} owned by %U since %x")}" #{fetch(:puppet_lock_file)} >&2
+exit 1
+fi
+echo 'ok'
+exit 0
+      CHECK_LOCK
+
+      execute :touch, "#{fetch(:puppet_lock_file)}"
     end
+  end
+
+  def unlock
+    sudo :rm, "-f #{fetch(:puppet_lock_file)}; true" if should_lock?
+  end
 
-    desc "clears the puppet lockfile on the server."
-    task :unlock, :except => { :nopuppet => true} do
-      supply_drop.unlock
+  def should_lock?
+    fetch(:puppet_lock_file) && !ENV['NO_PUPPET_LOCK']
+  end
+
+  def puppet(command = :noop)
+    puppet_cmd = "#{fetch(:puppet_command)} --modulepath=#{fetch(:puppet_lib)} #{fetch(:puppet_parameters)}"
+    flag = command == :noop ? '--noop' : ''
+
+    within fetch(:puppet_destination) do
+      begin
+        sudo "#{puppet_cmd} #{flag}"
+        info "Puppet #{command} complete."
+      rescue
+        error "Puppet #{command} failed."
+      end
     end
   end
-end
 
+  def red_text(text)
+    "\033[0;31m#{text}\033[0m"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supply_drop
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Tony Pitluga
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.21
+        version: 3.0.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.21
+        version: 3.0.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: See http://github.com/pitluga/supply_drop
 email:
 - tony.pitluga@gmail.com
@@ -37,15 +43,10 @@ files:
 - Rakefile
 - lib/supply_drop.rb
 - lib/supply_drop/async_enumerable.rb
-- lib/supply_drop/plugin.rb
 - lib/supply_drop/rsync.rb
-- lib/supply_drop/syntax_checker.rb
 - lib/supply_drop/tasks.rb
 - lib/supply_drop/thread_pool.rb
 - lib/supply_drop/util.rb
-- lib/supply_drop/writer/batched.rb
-- lib/supply_drop/writer/file.rb
-- lib/supply_drop/writer/streaming.rb
 homepage: http://github.com/pitluga/supply_drop
 licenses:
 - MIT
@@ -61,12 +62,12 @@ 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.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Masterless puppet with capistrano

data/lib/supply_drop/plugin.rb

@@ -1,96 +0,0 @@
-module SupplyDrop
-  module Plugin
-
-    def rsync
-      SupplyDrop::Util.thread_pool_size = puppet_parallel_rsync_pool_size
-      servers = SupplyDrop::Util.optionally_async(find_servers_for_task(current_task), puppet_parallel_rsync)
-      overrides = {}
-      overrides[:user] = fetch(:user, ENV['USER'])
-      overrides[:port] = fetch(:port) if exists?(:port)
-      failed_servers = servers.map do |server|
-        rsync_cmd = SupplyDrop::Rsync.command(
-          puppet_source,
-          SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
-          :delete => true,
-          :excludes => puppet_excludes,
-          :ssh => ssh_options.merge(server.options[:ssh_options]||{}).merge(overrides)
-        )
-        logger.debug rsync_cmd
-        server.host unless system rsync_cmd
-      end.compact
-
-      raise "rsync failed on #{failed_servers.join(',')}" if failed_servers.any?
-    end
-
-    def prepare
-      run "mkdir -p #{puppet_destination}"
-      run "#{sudo} chown -R $USER: #{puppet_destination}"
-    end
-
-    def noop
-      puppet(:noop)
-    end
-
-    def apply
-      puppet(:apply)
-    end
-
-    def lock
-      if should_lock?
-        run <<-CHECK_LOCK
-if [ -f #{puppet_lock_file} ]; then
-    stat -c "#{red_text("Puppet in progress, #{puppet_lock_file} owned by %U since %x")}" #{puppet_lock_file} >&2;
-    exit 1;
-fi
-        CHECK_LOCK
-
-        run "touch #{puppet_lock_file}"
-      end
-    end
-
-    def unlock
-      run "#{sudo} rm -f #{puppet_lock_file}; true" if should_lock?
-    end
-
-    private
-
-    def should_lock?
-      puppet_lock_file && !ENV['NO_PUPPET_LOCK']
-    end
-
-    def puppet(command = :noop)
-      puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
-      flag = command == :noop ? '--noop' : ''
-
-      writer = if puppet_stream_output
-                 SupplyDrop::Writer::Streaming.new(logger)
-               else
-                 SupplyDrop::Writer::Batched.new(logger)
-               end
-
-      writer = SupplyDrop::Writer::File.new(writer, puppet_write_to_file) unless puppet_write_to_file.nil?
-
-      begin
-        run "#{puppet_cmd} #{flag}" do |channel, stream, data|
-          writer.collect_output(channel[:host], data)
-        end
-        logger.debug "Puppet #{command} complete."
-      ensure
-        writer.all_output_collected
-      end
-    end
-
-    def red_text(text)
-      "\033[0;31m#{text}\033[0m"
-    end
-
-    def sudo_cmd
-      if fetch(:use_sudo, true)
-        sudo(:as => puppet_runner)
-      else
-        logger.info "NOTICE: puppet_runner configuration invalid when use_sudo is false, ignoring..." unless puppet_runner.nil?
-        ''
-      end
-    end
-  end
-end

data/lib/supply_drop/syntax_checker.rb

@@ -1,21 +0,0 @@
-module SupplyDrop
-  class SyntaxChecker
-    def initialize(path)
-      @path = path
-    end
-
-    def validate_puppet_files
-      Dir.glob("#{@path}/**/*.pp").map do |puppet_file|
-        output = `puppet parser validate #{puppet_file}`
-        $?.to_i == 0 ? nil : [puppet_file, output]
-      end.compact
-    end
-
-    def validate_templates
-      Dir.glob("#{@path}/**/*.erb").map do |template_file|
-        output = `erb -x -T '-' #{template_file} | ruby -c 2>&1`
-        $?.to_i == 0 ? nil : [template_file, output]
-      end.compact
-    end
-  end
-end

data/lib/supply_drop/writer/batched.rb

@@ -1,22 +0,0 @@
-module SupplyDrop
-  module Writer
-    class Batched
-      def initialize(logger)
-        @outputs = {}
-        @logger = logger
-      end
-
-      def collect_output(host, data)
-        @outputs[host] ||= ""
-        @outputs[host] << data
-      end
-
-      def all_output_collected
-        @outputs.keys.sort.each do |host|
-          @logger.info "Puppet output for #{host}"
-          @logger.debug @outputs[host], host
-        end
-      end
-    end
-  end
-end

data/lib/supply_drop/writer/file.rb

@@ -1,23 +0,0 @@
-module SupplyDrop
-  module Writer
-    class File
-      def initialize(writer, file)
-        @wrapped_writer = writer
-        @logger = Capistrano::Logger.new(:output => file)
-        @logger.level = Capistrano::Logger::TRACE
-        @file_writer = Batched.new(@logger)
-      end
-
-      def collect_output(host, data)
-        @wrapped_writer.collect_output(host, data)
-        @file_writer.collect_output(host, data)
-      end
-
-      def all_output_collected
-        @wrapped_writer.all_output_collected
-        @file_writer.all_output_collected
-        @logger.close
-      end
-    end
-  end
-end

data/lib/supply_drop/writer/streaming.rb

@@ -1,16 +0,0 @@
-module SupplyDrop
-  module Writer
-    class Streaming
-      def initialize(logger)
-        @logger = logger
-      end
-
-      def collect_output(host, data)
-        @logger.debug data, host
-      end
-
-      def all_output_collected
-      end
-    end
-  end
-end