rubber 2.1.2 → 2.2.0

data/test/encryption_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
+require 'rubber/encryption'
+
+class EncryptionTest < Test::Unit::TestCase
+  include Rubber::Encryption
+  
+  should "generate a unique encryption key" do
+    k1, k2 = generate_encrypt_key, generate_encrypt_key
+    assert k1
+    assert k2
+    assert k1 != k2
+  end
+  
+  context "encryption" do
+  
+    setup do
+      @key = generate_encrypt_key
+    end
+  
+    should "encrypt data" do
+      pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+      data = "hello"
+      e = encrypt(data, @key)
+      assert e
+      assert e.size > 0
+      assert e != data
+    end
+
+    should "decrypt data" do
+      pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+      data = "hello"
+      e = encrypt(data, @key)
+      d = decrypt(e, @key)
+      assert data == d
+    end
+    
+    should "pretty print large data" do
+      pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+      data = "foo" * 100
+      e = encrypt(data, @key)
+      assert e =~ /\n/
+    end
+    
+    should "roundtrip large data" do
+      pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+      data = "foo" * 100
+      e = encrypt(data, @key)
+      d = decrypt(e, @key)
+      assert data == d
+    end
+    
+  end
+  
+end
+

data/test/environment_test.rb

@@ -139,6 +139,20 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal "secret_val", e['secret_key'], 'env should have gotten setting from secret file'    
   end
 
+  def test_obfuscated_secret_env
+    pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
+    e = env.bind()
+    assert_nil e['rubber_secret'], 'env should not have secret set'
+    
+    fixture_dir = File.expand_path("#{File.dirname(__FILE__)}/fixtures/obfuscated")
+    env = Rubber::Configuration::Environment.new(fixture_dir, 'test')
+    e = env.bind()
+    assert_equal "#{fixture_dir}/secret.yml", e['rubber_secret'], 'env should have secret set'
+    assert_equal "secret_val", e['secret_key'], 'env should have gotten setting from secret file'    
+  end
+
   def test_nested_ref
     env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/nested", 'test')
     e = env.bind()

data/test/fixtures/obfuscated/rubber.yml

@@ -0,0 +1,3 @@
+
+rubber_secret: "#{File.expand_path(__FILE__ + '/../../../test/fixtures/obfuscated/secret.yml')}"
+rubber_secret_key: "d87b9e15c741655d16fb72c3b0b57b7b"

data/test/fixtures/obfuscated/secret.yml

@@ -0,0 +1 @@
+U8VwQr9NY9ftpSCKBxjQnERDxrfB/BKiQo+v+L6Fz7E=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,7 @@ files:
 - lib/rubber/dns/dyndns.rb
 - lib/rubber/dns/nettica.rb
 - lib/rubber/dns/zerigo.rb
+- lib/rubber/encryption.rb
 - lib/rubber/environment.rb
 - lib/rubber/generator.rb
 - lib/rubber/instance.rb
@@ -286,14 +287,16 @@ files:
 - templates/base/Capfile
 - templates/base/config/deploy.rb
 - templates/base/config/rubber/common/crontab
+- templates/base/config/rubber/common/gemrc
 - templates/base/config/rubber/common/ntp-sysctl.conf
 - templates/base/config/rubber/common/ntp.conf
 - templates/base/config/rubber/common/rsyslog.conf
 - templates/base/config/rubber/common/rubber.profile
+- templates/base/config/rubber/common/ruby.profile
 - templates/base/config/rubber/deploy-setup.rb
 - templates/base/config/rubber/deploy-util.rb
 - templates/base/config/rubber/rubber-dns.yml
-- templates/base/config/rubber/rubber-rvm.yml
+- templates/base/config/rubber/rubber-ruby.yml
 - templates/base/config/rubber/rubber.yml
 - templates/base/script/rubber
 - templates/base/templates.rb
@@ -335,19 +338,15 @@ files:
 - templates/complete_mongrel_mysql/templates.yml
 - templates/complete_passenger/config/rubber/role/haproxy/haproxy-passenger.conf
 - templates/complete_passenger/config/rubber/rubber-complete.yml
-- templates/complete_passenger/templates.rb
 - templates/complete_passenger/templates.yml
 - templates/complete_passenger_mysql/templates.yml
 - templates/complete_passenger_nginx/config/rubber/role/haproxy/haproxy-passenger.conf
 - templates/complete_passenger_nginx/config/rubber/rubber-complete.yml
-- templates/complete_passenger_nginx/templates.rb
 - templates/complete_passenger_nginx/templates.yml
 - templates/complete_passenger_nginx_mysql/templates.yml
 - templates/complete_passenger_nginx_postgresql/templates.yml
 - templates/complete_passenger_postgresql/templates.yml
-- templates/complete_unicorn_nginx/config/rubber/role/haproxy/haproxy-unicorn.conf
 - templates/complete_unicorn_nginx/config/rubber/rubber-complete.yml
-- templates/complete_unicorn_nginx/templates.rb
 - templates/complete_unicorn_nginx/templates.yml
 - templates/complete_unicorn_nginx_mysql/templates.yml
 - templates/complete_unicorn_nginx_postgresql/templates.yml
@@ -373,14 +372,18 @@ files:
 - templates/graphite/config/rubber/deploy-graphite.rb
 - templates/graphite/config/rubber/role/collectd/graphite-collectd.conf
 - templates/graphite/config/rubber/role/graphite_server/carbon.conf
+- templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf
 - templates/graphite/config/rubber/role/graphite_server/graphite_server-upstart.conf
+- templates/graphite/config/rubber/role/graphite_server/monit-graphite_server.conf
 - templates/graphite/config/rubber/role/graphite_server/storage-schemas.conf
 - templates/graphite/config/rubber/role/graphite_web/crontab
 - templates/graphite/config/rubber/role/graphite_web/dashboard.conf
 - templates/graphite/config/rubber/role/graphite_web/dashboard.html
-- templates/graphite/config/rubber/role/graphite_web/graphite-vhost.conf
 - templates/graphite/config/rubber/role/graphite_web/graphite.wsgi
+- templates/graphite/config/rubber/role/graphite_web/graphite_web-upstart.conf
 - templates/graphite/config/rubber/role/graphite_web/local_settings.py
+- templates/graphite/config/rubber/role/graphite_web/monit-graphite_web.conf
+- templates/graphite/config/rubber/role/graphite_web/uwsgi.ini
 - templates/graphite/config/rubber/rubber-graphite.yml
 - templates/graphite/templates.yml
 - templates/graylog/config/initializers/graylog.rb
@@ -577,6 +580,15 @@ files:
 - templates/resque_scheduler/lib/tasks/resque-scheduler.rake
 - templates/resque_scheduler/templates.rb
 - templates/resque_scheduler/templates.yml
+- templates/sidekiq/config/rubber/deploy-sidekiq.rb
+- templates/sidekiq/config/rubber/role/sidekiq/monit-sidekiq.conf
+- templates/sidekiq/config/rubber/rubber-sidekiq.yml
+- templates/sidekiq/templates.rb
+- templates/sidekiq/templates.yml
+- templates/solr/config/rubber/common/solr_sunspot.yml
+- templates/solr/config/rubber/deploy-solr.rb
+- templates/solr/config/rubber/rubber-solr.yml
+- templates/solr/templates.yml
 - templates/sphinx/config/rubber/common/sphinx.yml
 - templates/sphinx/config/rubber/deploy-sphinx.rb
 - templates/sphinx/config/rubber/role/sphinx/crontab
@@ -588,6 +600,7 @@ files:
 - templates/torquebox/config/rubber/role/app/mod_proxy_cluster.load
 - templates/torquebox/config/rubber/role/app/mod_slotmem.load
 - templates/torquebox/config/rubber/role/app/torquebox-apache-vhost.conf
+- templates/torquebox/config/rubber/role/torquebox/graylog-logging-module.xml
 - templates/torquebox/config/rubber/role/torquebox/monit-torquebox.conf
 - templates/torquebox/config/rubber/role/torquebox/standalone-ha.xml
 - templates/torquebox/config/rubber/role/torquebox/standalone.conf
@@ -620,8 +633,10 @@ files:
 - test/cloud/fog_test.rb
 - test/command_test.rb
 - test/commands/cron_test.rb
+- test/commands/util_test.rb
 - test/dns/aws_test.rb
 - test/dns/zerigo_test.rb
+- test/encryption_test.rb
 - test/environment_test.rb
 - test/fixtures/basic/common/bar.conf
 - test/fixtures/basic/common/foo.conf
@@ -643,6 +658,8 @@ files:
 - test/fixtures/instance_expansion/instance-test.yml
 - test/fixtures/instance_expansion/rubber.yml
 - test/fixtures/nested/rubber.yml
+- test/fixtures/obfuscated/rubber.yml
+- test/fixtures/obfuscated/secret.yml
 - test/fixtures/secret/rubber.yml
 - test/fixtures/secret/secret.yml
 - test/generator_test.rb
@@ -664,7 +681,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1263821507028843624
+      hash: -1895405216543771761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -673,7 +690,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1263821507028843624
+      hash: -1895405216543771761
 requirements: []
 rubyforge_project: rubber
 rubygems_version: 1.8.24
@@ -688,8 +705,10 @@ test_files:
 - test/cloud/fog_test.rb
 - test/command_test.rb
 - test/commands/cron_test.rb
+- test/commands/util_test.rb
 - test/dns/aws_test.rb
 - test/dns/zerigo_test.rb
+- test/encryption_test.rb
 - test/environment_test.rb
 - test/fixtures/basic/common/bar.conf
 - test/fixtures/basic/common/foo.conf
@@ -711,6 +730,8 @@ test_files:
 - test/fixtures/instance_expansion/instance-test.yml
 - test/fixtures/instance_expansion/rubber.yml
 - test/fixtures/nested/rubber.yml
+- test/fixtures/obfuscated/rubber.yml
+- test/fixtures/obfuscated/secret.yml
 - test/fixtures/secret/rubber.yml
 - test/fixtures/secret/secret.yml
 - test/generator_test.rb

data/templates/base/config/rubber/rubber-rvm.yml

@@ -1,42 +0,0 @@
-# rvm needs some extra packages to compile/install ruby runtimes
-# curl is required.
-# patch is required (for ree, some ruby head's).
-# For JRuby (if you wish to use it) you will need:
-#   aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
-# For MRI & ree (if you wish to use it) you will need:
-#   aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev git-core
-# For IronRuby (if you wish to use it) you will need:
-#   aptitude install curl mono-2.0-devel
-
-packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline6-dev, libxml2-dev, libyaml-dev]
-
-# REQUIRED: the version of rvm itself
-rvm_version: 1.13.0
-
-# REQUIRED: Set to the rvm version string for the ruby version you wish to use
-# Run "rvm list known" to see the list of possible options
-rvm_ruby: 1.9.3-p194
-
-# OPTIONAL: Extra args to pass to rvm when installing ruby
-# rvm_install_options: "--patch falcon,debug --force-autoconf -j 3"
-
-# REQUIRED: Set to version of RubyGems you want RVM to install. Note that older RVMs do not
-# know about newer RubyGems.  So you may need to bump your rvm_version to get the latest RubyGems release.
-rubygems_version: 1.8.23
-
-# REQUIRED: Set to version of rake you want RVM to install.
-rake_version: 0.9.2.2
-
-# When rvm is installed as root, and you set the default, it symlinks ruby executables
-# into /usr/local/rvm
-ruby_prefix: /usr/local/rvm
-
-rvm_prefix: /usr/local/rvm
-  
-# lets us setup global environment to use rvm (also needed when running sudo)
-rvm_prepare: "source #{rvm_prefix}/scripts/rvm"
-
-# dirty hack to get the rvm gem home rather than bundler gem home
-# When we run rubber:config it loads rails/bundler, which forces the bundler gem home, yet deployment only gems
-# like passenger need to be installed in rvm gem home rather than bundler
-rvm_gem_home: "#{$rubber_rvm_gem_home ||= `unset GEM_HOME; bash -l -c 'rvm gemdir'`.strip}"

data/templates/complete_passenger/templates.rb

@@ -1,9 +0,0 @@
-database_engines = ['mysql', 'postgresql']
-if ! database_engines.any? {|d| @template_dependencies.include?(d)}
-  db = Rubber::Util::prompt("DATABASE",
-                            "The database engine to use (#{database_engines.join(', ')})",
-                            true,
-                            'mysql')
-  template_dependencies << db
-end
-

data/templates/complete_passenger_nginx/templates.rb

@@ -1,8 +0,0 @@
-database_engines = ['mysql', 'postgresql']
-if ! database_engines.any? {|d| @template_dependencies.include?(d)}
-  db = Rubber::Util::prompt("DATABASE",
-                            "The database engine to use (#{database_engines.join(', ')})",
-                            true,
-                            'mysql')
-  template_dependencies << db
-end

data/templates/complete_unicorn_nginx/config/rubber/role/haproxy/haproxy-unicorn.conf

@@ -1,21 +0,0 @@
-<%
-  @path = "/etc/haproxy/haproxy.cfg"
-  @additive = ["# start haproxy unicorn", "# end haproxy unicorn"]
-%>
-
-<%
-  backend_hosts = rubber_instances.for_role('app').collect { |i| i.name }
-%>
-
-listen unicorn_proxy 0.0.0.0:<%= rubber_env.web_port %>
-  option forwardfor
-  <% backend_hosts.each do |server| %>
-    server <%= server %> <%= server %>:<%= rubber_env.unicorn_listen_port %> maxconn <%= rubber_env.max_app_connections %> check
-  <% end %>
-
-listen unicorn_proxy_ssl 0.0.0.0:<%= rubber_env.web_ssl_port %>
-  mode tcp
-  option forwardfor
-  <% backend_hosts.each do |server| %>
-    server <%= server %> <%= server %>:<%= rubber_env.unicorn_listen_ssl_port %> maxconn <%= rubber_env.max_app_connections %> check
-  <% end %>

data/templates/complete_unicorn_nginx/templates.rb

@@ -1,8 +0,0 @@
-database_engines = ['mysql', 'postgresql']
-if ! database_engines.any? {|d| @template_dependencies.include?(d)}
-  db = Rubber::Util::prompt("DATABASE",
-                            "The database engine to use (#{database_engines.join(', ')})",
-                            true,
-                            'mysql')
-  template_dependencies << db
-end

data/templates/graphite/config/rubber/role/graphite_web/graphite-vhost.conf

@@ -1,62 +0,0 @@
-<%
-  @path = '/etc/apache2/sites-available/graphite'
-  @post = <<-SCRIPT
-    a2ensite graphite
-  SCRIPT
-%>
-
-# This needs to be in your server's config somewhere, probably
-# the main httpd.conf
-# NameVirtualHost *:80
-
-# This line also needs to be in your server's config.
-# LoadModule wsgi_module modules/mod_wsgi.so
-
-# You may need to manually edit this file to fit your needs.
-# This configuration assumes the default installation prefix
-# of /opt/graphite/, if you installed graphite somewhere else
-# you will need to change all the occurances of /opt/graphite/
-# in this file to your chosen install location.
-
-Listen <%= rubber_env.graphite_web_port %>
-<VirtualHost *:<%= rubber_env.graphite_web_port %>>
-        ServerName <%= rubber_env.full_host %>
-        DocumentRoot "/opt/graphite/webapp"
-        ErrorLog /opt/graphite/storage/log/webapp/error.log
-        CustomLog /opt/graphite/storage/log/webapp/access.log common
-
-        # I've found that an equal number of processes & threads tends
-        # to show the best performance for Graphite (ymmv).
-        WSGIDaemonProcess graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120
-        WSGIProcessGroup graphite
-
-        # XXX You need to set this up!
-        # Read http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGISocketPrefix
-        # WSGISocketPrefix /var/run/apache2/
-
-        # XXX You will need to create this file! There is a graphite.wsgi.example
-        # file in this directory that you can safely use, just copy it to graphite.wgsi
-        WSGIScriptAlias / /opt/graphite/conf/graphite.wsgi
-
-        Alias /content/ /opt/graphite/webapp/content/
-        <Location "/content/">
-                SetHandler None
-        </Location>
-
-        # XXX In order for the django admin site media to work you
-        # must change @DJANGO_ROOT@ to be the path to your django
-        # installation, which is probably something like:
-        # /usr/lib/python2.6/site-packages/django
-        Alias /media/ "/usr/lib/pymodules/python2.6/django/contrib/admin/media/"
-        <Location "/media/">
-                SetHandler None
-        </Location>
-
-        # The graphite.wsgi file has to be accessible by apache. It won't
-        # be visible to clients because of the DocumentRoot though.
-        <Directory /opt/graphite/conf/>
-                Order deny,allow
-                Allow from all
-        </Directory>
-
-</VirtualHost>