From 7e13ddfb7cba449d74b0c0fb8b08f508d9d08b8b Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 4 Nov 2012 01:23:22 -0800 Subject: remove unneeded files from vendored supply_drop --- vendor/supply_drop/.gitignore | 4 - vendor/supply_drop/.rvmrc | 1 - vendor/supply_drop/.travis.yml | 4 - vendor/supply_drop/Gemfile | 6 - vendor/supply_drop/Gemfile.lock | 47 -------- vendor/supply_drop/README.md | 128 --------------------- vendor/supply_drop/Rakefile | 24 ---- vendor/supply_drop/test/async_test.rb | 67 ----------- vendor/supply_drop/test/files/manifests/invalid.pp | 1 - vendor/supply_drop/test/files/manifests/valid.pp | 9 -- .../supply_drop/test/files/templates/invalid.erb | 1 - vendor/supply_drop/test/files/templates/valid.erb | 1 - vendor/supply_drop/test/rsync_test.rb | 57 --------- vendor/supply_drop/test/syntax_checker_test.rb | 23 ---- 14 files changed, 373 deletions(-) delete mode 100644 vendor/supply_drop/.gitignore delete mode 100644 vendor/supply_drop/.rvmrc delete mode 100644 vendor/supply_drop/.travis.yml delete mode 100644 vendor/supply_drop/Gemfile delete mode 100644 vendor/supply_drop/Gemfile.lock delete mode 100644 vendor/supply_drop/README.md delete mode 100644 vendor/supply_drop/Rakefile delete mode 100644 vendor/supply_drop/test/async_test.rb delete mode 100644 vendor/supply_drop/test/files/manifests/invalid.pp delete mode 100644 vendor/supply_drop/test/files/manifests/valid.pp delete mode 100644 vendor/supply_drop/test/files/templates/invalid.erb delete mode 100644 vendor/supply_drop/test/files/templates/valid.erb delete mode 100644 vendor/supply_drop/test/rsync_test.rb delete mode 100644 vendor/supply_drop/test/syntax_checker_test.rb (limited to 'vendor/supply_drop') diff --git a/vendor/supply_drop/.gitignore b/vendor/supply_drop/.gitignore deleted file mode 100644 index c2c6428..0000000 --- a/vendor/supply_drop/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -**/*/.vagrant -*.gem -*.swp -**/*/puppet_output.txt diff --git a/vendor/supply_drop/.rvmrc b/vendor/supply_drop/.rvmrc deleted file mode 100644 index b0542b7..0000000 --- a/vendor/supply_drop/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm 1.8.7-p249@supply_drop --create diff --git a/vendor/supply_drop/.travis.yml b/vendor/supply_drop/.travis.yml deleted file mode 100644 index 7751578..0000000 --- a/vendor/supply_drop/.travis.yml +++ /dev/null @@ -1,4 +0,0 @@ -language: ruby -rvm: - - 1.8.7 - - 1.9.2 diff --git a/vendor/supply_drop/Gemfile b/vendor/supply_drop/Gemfile deleted file mode 100644 index b4e0f50..0000000 --- a/vendor/supply_drop/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source :rubygems - -gem 'capistrano', '2.11.2' -gem 'vagrant', '0.9.7' -gem 'rake', '0.8.7' -gem 'puppet', '2.7.1' diff --git a/vendor/supply_drop/Gemfile.lock b/vendor/supply_drop/Gemfile.lock deleted file mode 100644 index c85ee2c..0000000 --- a/vendor/supply_drop/Gemfile.lock +++ /dev/null @@ -1,47 +0,0 @@ -GEM - remote: http://rubygems.org/ - specs: - archive-tar-minitar (0.5.2) - capistrano (2.11.2) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) - childprocess (0.3.1) - ffi (~> 1.0.6) - erubis (2.7.0) - facter (1.6.5) - ffi (1.0.11) - highline (1.6.11) - i18n (0.6.0) - json (1.5.4) - log4r (1.1.10) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.2.2) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) - puppet (2.7.1) - facter (>= 1.5.1) - rake (0.8.7) - vagrant (0.9.7) - archive-tar-minitar (= 0.5.2) - childprocess (~> 0.3.1) - erubis (~> 2.7.0) - i18n (~> 0.6.0) - json (~> 1.5.1) - log4r (~> 1.1.9) - net-scp (~> 1.0.4) - net-ssh (~> 2.2.2) - -PLATFORMS - ruby - -DEPENDENCIES - capistrano (= 2.11.2) - puppet (= 2.7.1) - rake (= 0.8.7) - vagrant (= 0.9.7) diff --git a/vendor/supply_drop/README.md b/vendor/supply_drop/README.md deleted file mode 100644 index 91e86b6..0000000 --- a/vendor/supply_drop/README.md +++ /dev/null @@ -1,128 +0,0 @@ -# supply_drop - -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) - -### Installation - - gem install supply_drop - -or with Bundler - - gem 'supply_drop' - -then at the top of your deploy.rb - - require 'rubygems' - require 'supply_drop' - -### Tasks - - cap puppet:bootstrap:ubuntu - cap puppet:bootstrap:osx - cap puppet:bootstrap:redhat - -This does a simple apt-get install of puppet on the target servers. - - cap puppet:noop - -This will show you a list of the pending changes to be applied server-by-server. - - cap 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:remove_lock - -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. - - role :weird_thing, '33.33.33.33', :nopuppet => true - -### Variables - -There are several variables that can be overriden to change how supply_drop works: - - set :puppet_source, '.' - -defines the base directory containing your puppet configs that will be rsynced to the servers. - - set :puppet_destination, '/tmp/supply_drop' - -defines where on the server the puppet configuration files are synced to. - - set :puppet_command, 'puppet apply' - -allows you to override the puppet command that is run if puppet is not on the path. - - set :puppet_lib, "#{puppet_destination}/modules" - -the value of the PUPPETLIB environment variable, the location of your puppet modules. - - set :puppet_parameters, 'puppet.pp' - -the parameters that are passed to the puppet call. - - set :puppet_excludes, %w(.git .svn) - -these are patterns that are passed as rsync --exclude flags when pushing your puppet configs to the box. - - set :puppet_parallel_rsync, true - -determines whether the rsync commands for multiple servers are run in parallel threads or serially - - set :puppet_parallel_rsync_pool_size, 10 - -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. - -### Handling Legacy Puppet - -Puppet deprecated the implicit invocation of apply [in the 2.6.x series](https://github.com/puppetlabs/puppet/commit/a23cfd869f90ae4456dded6e5a1c82719b128f01). - -The default behavior of supply_drop includes `apply` keyword in its commands, but if you need compatibility with older versions of puppet, set the `puppet_command` variable to omit it. - -You'll need to do this if you see errors like this: - - Could not parse for environment production: Could not find file /home/.../supply_drop/apply.pp - -### How to contribute - -If you write anything complicated, write a test for it. Test that your changes work using vagrant. Send a pull request. Easy peezy. - -### Contributors - -* Paul Hinze [phinze](https://github.com/phinze "github") -* Paul Gross [pgr0ss](https://github.com/pgr0ss "github") -* Drew Olson [drewolson](https://github.com/drewolson "github") -* Dave Pirotte [dpirotte](https://github.com/dpirotte "github") -* 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") diff --git a/vendor/supply_drop/Rakefile b/vendor/supply_drop/Rakefile deleted file mode 100644 index 666b6a4..0000000 --- a/vendor/supply_drop/Rakefile +++ /dev/null @@ -1,24 +0,0 @@ -require 'rake/testtask' - -Rake::TestTask.new do |t| - t.test_files = FileList['test/*_test.rb'] -end - -task :default => :test - -desc "clean" -task :clean do - rm_f Dir.glob("*.gem") -end - -namespace :gem do - desc "build the gem" - task :build => :clean do - sh "gem build supply_drop.gemspec" - end - - desc "push the gem" - task :push => :build do - sh "gem push #{Dir.glob("*.gem").first}" - end -end diff --git a/vendor/supply_drop/test/async_test.rb b/vendor/supply_drop/test/async_test.rb deleted file mode 100644 index 0b9bc3a..0000000 --- a/vendor/supply_drop/test/async_test.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'test/unit' -require File.expand_path('../../lib/supply_drop/util', __FILE__) -require File.expand_path('../../lib/supply_drop/async_enumerable', __FILE__) -require File.expand_path('../../lib/supply_drop/thread_pool', __FILE__) - -class AsyncTest < Test::Unit::TestCase - def teardown - SupplyDrop::Util.thread_pool_size = SupplyDrop::Util::DEFAULT_THREAD_POOL_SIZE - end - - def test_can_enumerate_asynchronously - collection = (1..10).to_a - elapsed = timed do - SupplyDrop::Util.optionally_async(collection, true).each do |item| - sleep 0.1 - end - end - assert elapsed < 1 - end - - def test_can_enumerate_asynchronously_with_map - collection = (1..10).to_a - returned_values = nil - elapsed = timed do - returned_values = SupplyDrop::Util.optionally_async(collection, true).map do |item| - sleep 0.1 - :somevalue - end - end - assert returned_values == Array.new(10, :somevalue) - assert elapsed < 1 - end - - def test_can_enumerate_normally_and_does_not_leak_after_extending - collection = (1..10).to_a - elapsed = timed do - SupplyDrop::Util.optionally_async(collection, true).each do |item| - sleep 0.1 - end - end - assert elapsed < 1 - - elapsed = timed do - SupplyDrop::Util.optionally_async(collection, false).each do |item| - sleep 0.1 - end - end - assert elapsed >= 1 - end - - def test_can_configure_thread_pool_size - collection = (1..10).to_a - SupplyDrop::Util.thread_pool_size = 1 - elapsed = timed do - returned_values = SupplyDrop::Util.optionally_async(collection, true).map do |item| - sleep 0.1 - end - end - assert elapsed >= 1 - end - - def timed - start = Time.now - yield - Time.now - start - end -end diff --git a/vendor/supply_drop/test/files/manifests/invalid.pp b/vendor/supply_drop/test/files/manifests/invalid.pp deleted file mode 100644 index 5ca851c..0000000 --- a/vendor/supply_drop/test/files/manifests/invalid.pp +++ /dev/null @@ -1 +0,0 @@ -class example { diff --git a/vendor/supply_drop/test/files/manifests/valid.pp b/vendor/supply_drop/test/files/manifests/valid.pp deleted file mode 100644 index d8e6486..0000000 --- a/vendor/supply_drop/test/files/manifests/valid.pp +++ /dev/null @@ -1,9 +0,0 @@ -class valid { - file { "/etc/hosts": - ensure => present, - content => "127.0.0.1 localhost", - owner => root, - group => root, - mode => "0644" - } -} diff --git a/vendor/supply_drop/test/files/templates/invalid.erb b/vendor/supply_drop/test/files/templates/invalid.erb deleted file mode 100644 index 615887c..0000000 --- a/vendor/supply_drop/test/files/templates/invalid.erb +++ /dev/null @@ -1 +0,0 @@ -this is a <%= if true %> template diff --git a/vendor/supply_drop/test/files/templates/valid.erb b/vendor/supply_drop/test/files/templates/valid.erb deleted file mode 100644 index 722efea..0000000 --- a/vendor/supply_drop/test/files/templates/valid.erb +++ /dev/null @@ -1 +0,0 @@ -this is a <%= "good" %> template diff --git a/vendor/supply_drop/test/rsync_test.rb b/vendor/supply_drop/test/rsync_test.rb deleted file mode 100644 index b51a6b3..0000000 --- a/vendor/supply_drop/test/rsync_test.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'test/unit' -require File.expand_path('../../lib/supply_drop/rsync', __FILE__) - -class RsyncTest < Test::Unit::TestCase - - def test_build_simple_command - command = SupplyDrop::Rsync.command('bar', 'foo') - assert_equal 'rsync -az bar foo', command - end - - def test_allows_passing_delete - command = SupplyDrop::Rsync.command('bar', 'foo', :delete => true) - assert_equal 'rsync -az --delete bar foo', command - end - - def test_allows_specifying_an_exclude - command = SupplyDrop::Rsync.command('bar', 'foo', :excludes => '.git') - assert_equal 'rsync -az --exclude=.git bar foo', command - end - - def test_ssh_options_keys_only_lists_existing_files - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :keys => [__FILE__, "#{__FILE__}dadijofs"] }) - assert_match /-i #{__FILE__}/, command - end - - def test_ssh_options_ignores_keys_if_nil - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :keys => nil }) - assert_equal 'rsync -az . foo', command - command = SupplyDrop::Rsync.command('bar', 'foo') - assert_equal 'rsync -az bar foo', command - end - - def test_ssh_options_config_adds_flag - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :config => __FILE__ }) - assert_equal %Q[rsync -az -e "ssh -F #{__FILE__}" . foo], command - end - - def test_ssh_options_port_adds_port - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :port => '30022' }) - assert_equal %Q[rsync -az -e "ssh -p 30022" . foo], command - end - - def test_ssh_options_ignores_config_if_nil_or_false - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :config => nil }) - assert_equal 'rsync -az . foo', command - command = SupplyDrop::Rsync.command('.', 'foo', :ssh => { :config => false }) - assert_equal 'rsync -az . foo', command - end - - def test_remote_address_concatinates_things_correctly - assert_equal "user@box.local:/tmp", SupplyDrop::Rsync.remote_address('user', 'box.local', '/tmp') - end - - def test_remote_address_drops_at_when_user_is_nil - assert_equal 'box.local:/tmp', SupplyDrop::Rsync.remote_address(nil, 'box.local', '/tmp') - end -end diff --git a/vendor/supply_drop/test/syntax_checker_test.rb b/vendor/supply_drop/test/syntax_checker_test.rb deleted file mode 100644 index 15f6e73..0000000 --- a/vendor/supply_drop/test/syntax_checker_test.rb +++ /dev/null @@ -1,23 +0,0 @@ -require 'test/unit' -require File.expand_path('../../lib/supply_drop/syntax_checker', __FILE__) - -class SyntaxCheckerTest < Test::Unit::TestCase - - def test_syntax_checks_puppet_files - checker = SupplyDrop::SyntaxChecker.new(File.expand_path('../files', __FILE__)) - errors = checker.validate_puppet_files - assert_equal 1, errors.count - file, error = errors.first - assert_match %r[manifests/invalid.pp$], file - assert_match %r[expected '\}'], error - end - - def test_synatx_checks_erb_files - checker = SupplyDrop::SyntaxChecker.new(File.expand_path('../files', __FILE__)) - errors = checker.validate_templates - assert_equal 1, errors.count - file, error = errors.first - assert_match %r[templates/invalid.erb$], file - assert_match %r[syntax error], error - end -end -- cgit v1.2.3