test_server 0.3.2 → 0.3.4

data/script/precompile

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+#RAILS_ENV=production rake -f Rakefile.rails assets:precompile
+rake -f Rakefile.rails assets:precompile

data/share/archlinux/Gemfile.rb.erb

@@ -1,5 +1,12 @@
+# Used to speed up package building if
+# using https://github.com/dg-vrnetze/gem_server
+source 'http://localhost:8082'
+
+# Fallback
 source 'https://rubygems.org'
 
-<% eval(File.read(File.expand_path('../../../test_server.gemspec', __FILE__))).dependencies.each do |r| -%>
-gem '<%= r.name %>'
+gem '<%= lookup('SOFTWARE_NAME') %>', '<%= lookup('SOFTWARE_VERSION') %>'
+
+<% eval(File.read(lookup('GEMSPEC'))).dependencies.each do |r| -%>
+gem '<%= r.name %>', '<%= r.requirement %>'
 <% end -%>

data/share/archlinux/PKGBUILD.sh.erb

@@ -6,24 +6,30 @@ pkgdesc="test server for proxy testing"
 arch=(i686 x86_64)
 url="https://github.com/dg-vrnetze/${pkgname}"
 license=('MIT')
-depends=('ruby' 'libatomic_ops')
+depends=('ruby')
 install=${pkgname}.install
-makedepends=(rubygems filegen phantomjs)
-source=(http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem)
+makedepends=('rubygems' 'filegen' 'phantomjs' 'ruby-bundler' 'libatomic_ops')
+source=(<%= lookup('source') %>)
 backup=etc/${pkgname}/config.yaml
-#source=($pkgname-$pkgver.gem)
+backup=etc/${pkgname}/database.yml
+backup=etc/${pkgname}/secrets.yml
 noextract=($pkgname-$pkgver.gem)
 <%= lookup('sha') %>
 
 package() {
-  cd "$srcdir"
+  cd "$pkgdir"
 
-  _library_dir=/usr/lib/${pkgname}
+  _ruby_api_version=$(ruby -e "puts Gem.ruby_api_version")
+  _bundle_library_dir=/usr/lib/${pkgname}
+
+  _library_dir=${_bundle_library_dir}/ruby/${_ruby_api_version}
   _gem_directory="${_library_dir}/gems/${pkgname}-${pkgver}"
   _share_dir="${_gem_directory}/share"
   _systemd_dir=/usr/lib/systemd/system
   _bin_dir=/usr/bin
   _data_dir=/var/${pkgname}/data
+  _database_dir=${_data_dir}/db
+  _files_dir=${_data_dir}/files
   _log_dir=/var/log/${pkgname}
   _config_dir=/etc/${pkgname}
   _examples_dir=/usr/share/${pkgname}/examples
@@ -37,60 +43,121 @@ package() {
   _service_group=$pkgname
   _service_environment_file=${_defaults_dir}/${pkgname}
   _access_log_file=${_log_dir}/access.log
+  _error_log_file=${_log_dir}/error.log
   _debug_mode=false
   _log_level=warn
   _environment=production
   _listen_statement=tcp://127.0.0.1:8000
   _reload_config_signal=USR1
-  _sass_cache_dir=$_cache_dir
+  _sass_cache_dir=${_cache_dir}/sass
   _pid_file=${_run_dir}/pid
-  _executable_file=${pkgdir}${_bin_dir}/${pkgname}
+  _executable_file=${_bin_dir}/${pkgname}
   _gem_file="${_gem_directory}/Gemfile"
+  _bundle_config_directory=${_gem_directory}/.bundle
+  _bundle_config_file=${_bundle_config_directory}/config
+  _systemd_service_file=${_systemd_dir}/${pkgname}.service
+  _bundle_without_groups="test:development:doc:profile"
+  _database_configuration_file=${_config_dir}/database.yml
+  _database_configuration_link=${_gem_directory}/config/database.yml
+  _secrets_file=${_config_dir}/secrets.yml
+  _secrets_link=${_gem_directory}/config/secrets.yml
 
   install -d ${pkgdir}$_library_dir 
   install -d ${pkgdir}$_bin_dir 
   install -d ${pkgdir}$_systemd_dir 
   install -d -m 770 ${pkgdir}$_data_dir
+  install -d -m 770 ${pkgdir}$_database_dir
+  install -d -m 770 ${pkgdir}$_files_dir
   install -d ${pkgdir}$_log_dir
   install -d ${pkgdir}$_config_dir
-  #install -d ${pkgdir}$_run_dir
   install -d ${pkgdir}$_tmp_files_dir
   install -d ${pkgdir}$_sass_cache_dir
   install -d ${pkgdir}$_defaults_dir
+  install -d ${pkgdir}$_bundle_config_directory
 
-
-  msg "Starting download of gems. Don't get alert if the download takes a lot of time. Since rubygems 2.2.0 a new algorithm to resolve dependencies is used. Upgrade to > 2.2.0 via sudo /usr/bin/gem update --system to improve performance."
+  msg "Starting download of gems. Don't get alert if the download takes a lot of time. Since rubygems 2.2.0 a new algorithm to resolve dependencies is used. Upgrade to > 2.2.0 via \"sudo /usr/bin/gem update --system\" to improve performance."
 
   set -x
 
-  GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" /usr/bin/gem install --ignore-dependencies --env-shebang --wrappers --no-ri --no-rdoc --no-prerelease --install-dir ${pkgdir}${_library_dir} $pkgname-$pkgver.gem bundler
-
-  filegen ${pkgdir}${_share_dir}/archlinux/Gemfile.rb.erb > ${pkgdir}${_gem_file}
-  rm ${pkgdir}${_gem_file}.lock
-
-  GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" bundle install --gemfile ${pkgdir}${_gem_file} --without test development
-
-  GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" /usr/bin/gem install --env-shebang --wrappers --no-ri --no-rdoc --no-prerelease --install-dir ${pkgdir}${_library_dir} puma
-
+  # Gem includes all files needed to build package
+  /usr/bin/gem install \
+    --env-shebang \
+    --no-ri \
+    --no-rdoc \
+    --no-prerelease \
+    --install-dir ${pkgdir}${_library_dir} \
+    <%= lookup('package') %>
+
+  # Installation of gems is done by using bundler because `test_server` is a
+  # rails-application which requires a valid Gemfile.lock which can be
+  # generated by bundler
+  SOFTWARE_NAME=$pkgname \
+    SOFTWARE_VERSION=$pkgver \
+    RUBYLIB="${pkgdir}${_gem_directory}/lib" \
+    GEMSPEC="${pkgdir}${_gem_directory}/${pkgname}.gemspec" \
+    filegen ${pkgdir}${_share_dir}/archlinux/Gemfile.rb.erb > ${pkgdir}${_gem_file} 
+
+  # Remove old lock
+  rm -f ${pkgdir}${_gem_file}.lock
+
+  # Install gems
+  no_proxy='localhost' \
+    /usr/bin/bundle install \
+    --gemfile ${pkgdir}${_gem_file} \
+    --without $_bundle_without_groups \
+    --path "${pkgdir}${_bundle_library_dir}" \
+    --no-binstubs
+
+  ## Generate assets for production environment
+  #RAILS_ENV=production \
+  #  BUNDLE_GEMFILE=${pkgdir}${_gem_file} \
+  #  BUNDLE_PATH=${pkgdir}${_library_dir} \
+  #  BUNDLE_WITHOUT=$_bundle_without_groups \
+  #  BUNDLE_FROZEN=1 \
+  #  /usr/bin/bundle exec rake \
+  #  -f ${pkgdir}${_gem_directory}/Rakefile.rails \
+  #  assets:precompile
+
+  # some files did not get a read bit while precompiling
+  find ${pkgdir}${_gem_directory}/public/assets -type f -exec chmod a+r {} \;
+
+  ## Overwrite bundler-config because it uses absolutes path written during
+  ## package building
+  #SOFTWARE_LIB=${_library_dir} \
+  #  filegen ${pkgdir}${_share_dir}/archlinux/bundle_config.yaml.erb > ${pkgdir}${_bundle_config_file}
+  # Delete bundler config otherwise the environment variables (BUNDLE_*) in
+  # starter do not have an effect
+  rm ${pkgdir}${_bundle_config_file}
+
+  # A temp directory under /run is needed to run `test_server`
   RUN_DIR=$_run_dir \
     SERVICE_USER=$_service_user \
     SERVICE_GROUP=$_service_group \
-    filegen  ${pkgdir}${_share_dir}/archlinux/tmpfiles.conf.erb > ${pkgdir}${_tmp_files_file}
+    filegen  ${pkgdir}${_share_dir}/systemd/tmpfiles.conf.erb > ${pkgdir}${_tmp_files_file}
+
+  chmod 644 ${pkgdir}${_tmp_files_file}
 
+  # Generate `test_server`-service file for systemd
   COMMAND="${_executable_file} serve" \
-    DESCRIPTION='Server to proxy tests'
+    DESCRIPTION='Server to proxy tests' \
     SERVICE_USER=$_service_user \
     SERVICE_GROUP=$_service_group \
     DEFAULTS_FILE=$_service_environment_file \
-    filegen  ${pkgdir}${_share_dir}/systemd/${pkgname}.service.erb > ${pkgdir}$_systemd_dir/${pkgname}.service
+    filegen  ${pkgdir}${_share_dir}/systemd/${pkgname}.service.erb > ${pkgdir}${_systemd_service_file}
+
+  chmod 644 ${pkgdir}${_systemd_service_file}
 
+  # Generate /etc/default/test_server-file
   VARIABLES="HOME=/home/$_service_user" \
     filegen  ${pkgdir}${_share_dir}/archlinux/defaults.sh.erb > ${pkgdir}${_service_environment_file}
 
-  chmod 644 ${pkgdir}${_tmp_files_file}
+  chmod 644 ${pkgdir}${_service_environment_file}
 
+  # Generate default configuration for `test_server`
   ACCESS_LOG=$_access_log_file \
+    ERROR_LOG=$_error_log_file \
     CONFIG_FILE=$_config_file \
+    SECRETS_FILE=$_secrets_file \
     DEBUG_MODE=$_debug_mode \
     ENVIRONMENT=$_environment \
     LISTEN=$_listen_statement \
@@ -102,19 +169,39 @@ package() {
 
   chmod 644 ${pkgdir}${_config_file}
 
-  SOFTWARE_BINARY=$_library_dir/gems/${pkgname}-${pkgver}/bin/${pkgname} \
-    SOFTWARE_LIB=/usr/lib/${pkgname} \
-    filegen  ${pkgdir}${_share_dir}/archlinux/startup.sh.erb > $_executable_file
+  # Generate Database configuration
+  DATABASE_DIRECTORY=$_database_dir \
+    filegen  ${pkgdir}${_share_dir}/archlinux/database.yml.erb > ${pkgdir}${_database_configuration_file}
+
+  ln -fs  ${_database_configuration_file} ${pkgdir}${_database_configuration_link}
+
+  chmod 640 ${pkgdir}${_database_configuration_file}
+
+  # Generate Secrets for your application
+  filegen  ${pkgdir}${_share_dir}/archlinux/secrets.yml.erb > ${pkgdir}${_secrets_file}
+
+  ln -fs  ${_secrets_file} ${pkgdir}${_secrets_link}
+
+  chmod 640 ${pkgdir}${_secrets_file}
+
+  # Generate wrapper to set all environment variables correctly to make
+  # bundler find installed ruby gems
+  SOFTWARE_BINARY=${_gem_directory}/bin/${pkgname} \
+    SOFTWARE_LIB=${_library_dir} \
+    BUNDLE_WITHOUT_GROUPS=$_bundle_without_groups \
+    GEMFILE=${_gem_file} \
+    filegen  ${pkgdir}${_share_dir}/archlinux/startup.sh.erb > ${pkgdir}${_executable_file}
 
   chmod a+x ${pkgdir}/${_bin_dir}/${pkgname}
 
+  # Delete tempfiles
   rm -rf ${pkgdir}/${_library_dir}/cache
   rm -rf ${pkgdir}/${_library_dir}/{build_info,doc}
 
-  install -D -m644 ${pkgdir}/$_share_dir/systemd/${pkgname}.service ${pkgdir}/$_systemd_dir/${pkgname}.service
-  #install -D -m644 ${pkgdir}/$_share_dir/systemd/${pkgname}.socket ${pkgdir}/$_systemd_dir
-
+  # Install license
   install -D -m644 ${pkgdir}${_share_dir}/../LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  set +x
 }
 
 # vim:set ts=2 sw=2 et:

data/share/archlinux/bundle_config.yaml.erb

@@ -0,0 +1,3 @@
+BUNDLE_PATH: <%= lookup('SOFTWARE_LIB') %>
+BUNDLE_WITHOUT: <%= lookup('WITHOUT_GROUPS') %>
+BUNDLE_FROZEN: true

data/share/archlinux/config.yaml.erb

@@ -1,6 +1,8 @@
 ---
 :access_log: <%= lookup('ACCESS_LOG') %>
+:error_log: <%= lookup('ERROR_LOG') %>
 :config_file: <%= lookup('CONFIG_FILE') %>
+:secrets_file: <%= lookup('SECRETS_FILE') %>
 :debug_mode: <%= lookup('DEBUG_MODE') %>
 :environment: <%= lookup('ENVIRONMENT') %>
 :listen: <%= lookup('LISTEN') %>

data/share/archlinux/database.yml.erb

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: <%= lookup('DATABASE_DIRECTORY') %>/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: <%= lookup('DATABASE_DIRECTORY') %>/test.sqlite3
+
+production:
+  <<: *default
+  database: <%= lookup('DATABASE_DIRECTORY') %>/production.sqlite3

data/share/archlinux/secrets.yml.erb

@@ -0,0 +1,20 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+<%- require 'securerandom' -%>
+development:
+  secret_key_base: <%= SecureRandom.hex(128) %>
+
+test:
+  secret_key_base: <%= SecureRandom.hex(128) %>
+
+production:
+  secret_key_base: <%= SecureRandom.hex(128) %>

data/share/archlinux/startup.sh.erb

@@ -4,6 +4,11 @@ export GEM_ROOT='<%= lookup('SOFTWARE_LIB') %>'
 export GEM_PATH='<%= lookup('SOFTWARE_LIB') %>'
 export GEM_HOME='<%= lookup('SOFTWARE_LIB') %>'
 
+export BUNDLE_PATH='<%= lookup('SOFTWARE_LIB') %>'
+export BUNDLE_WITHOUT='<%= lookup('BUNDLE_WITHOUT_GROUPS') %>'
+export BUNDLE_FROZEN=1
+export BUNDLE_GEMFILE='<%= lookup('GEMFILE') %>'
+
 export PATH="<%= lookup('SOFTWARE_LIB') %>/bin:$PATH"
 
 exec <%= lookup('SOFTWARE_BINARY') %> $*

data/share/archlinux/test_server.install

@@ -8,6 +8,11 @@ _data_dir=/var/${pkgname}/data
 _log_dir=/var/log/${pkgname}
 _cache_dir=/var/cache/${pkgname}
 _sass_cache_directory=$_cache_dir
+_database_dir=${_data_dir}/db
+_files_dir=${_data_dir}/files
+_config_dir=/etc/${pkgname}
+_database_configuration_file=${_config_dir}/database.yml
+_secrets_file=${_config_dir}/secrets.yml
 
 post_install() {
   if ! getent group $_admin_group >/dev/null; then
@@ -18,13 +23,22 @@ post_install() {
     useradd -m $_service_user
   fi
 
-  for path in $_log_dir $_sass_cache_directory; do
+  for path in $_log_dir $_sass_cache_directory $_data_dir $_database_dir $_files_dir; do
     chown -R $_service_user:$_service_group $path
   done
 
   # Admins are allowed to write, service is allowd to read, others can do nothing
-  chown :$_admin_group $_data_dir 
-  setfacl -m g:$_service_group:rx $_data_dir
+  chown :$_admin_group $_files_dir 
+  setfacl -m g:$_service_group:rx $_files_dir
+
+  # Allow the web application to read database configuration file
+  chown :$_service_group $_database_configuration_file 
+
+  # Allow the web application to read secrets file
+  chown :$_service_group $_secrets_file 
+  
+  # Create run directories
+  systemd-tmpfiles --create
 
   echo ""
   echo "Please place a config file at one of the following places:"
@@ -35,6 +49,8 @@ post_install() {
   echo ""
   echo "The package contains a \"config.yaml\" which has been placed at /etc/test_server/config.yaml during package install. Feel free to modify it."
   echo ""
+  echo "Make sure you add your admins to the admin group \"$_admin_group\" to enable those to upload files used for testing via scp."
+  echo ""
 }
 
 post_upgrade() {
@@ -62,4 +78,7 @@ post_remove() {
   if ! getent passwd $_service_user >/dev/null; then
     userdel $_service_user
   fi
+
+  # Delete run directories
+  systemd-tmpfiles --clean
 }

data/spec/controllers/errors_controller_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper'
-
-describe TestServer::ErrorsController do
-
-  describe "GET 'not_found'" do
-    it "returns http success" do
-      get 'not_found'
-      response.should be_success
-    end
-  end
-
-end
+#require 'spec_helper'
+#
+#describe TestServer::ErrorsController do
+#
+#  describe "GET 'not_found'" do
+#    it "returns http success" do
+#      get 'not_found'
+#      response.should be_success
+#    end
+#  end
+#
+#end

data/test_server.gemspec

@@ -3,6 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'test_server/version'
+require 'pathname'
 
 Gem::Specification.new do |spec|
   spec.name          = 'test_server'
@@ -11,9 +12,13 @@ Gem::Specification.new do |spec|
   spec.email         = ['dg1@vrnetze.de']
   spec.summary       = %q{Test server for proxies}
   spec.description   = %q{Test server for proxies}
-  #spec.license       = 'MIT'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  base_path = File.expand_path('..', __FILE__)
+  git_files   = `git ls-files -z`.split("\x0")
+  asset_files = Dir.glob(File.join(base_path, 'public', 'assets', '**', '*')).keep_if { |f| File.file? f }.collect { |f| Pathname.new(f).relative_path_from(Pathname.new(base_path)).to_s }
+
+  spec.files         = git_files + asset_files
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -37,8 +42,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sass-rails', '~> 4.0.3'
   spec.add_runtime_dependency 'sqlite3'
   spec.add_runtime_dependency 'therubyracer'
+  spec.add_runtime_dependency 'sprockets-rails', '~> 2.1.3'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'turbolinks'
   spec.add_runtime_dependency 'breadcrumbs_on_rails'
   spec.add_runtime_dependency 'uglifier', '>= 1.3.0'
+  spec.add_runtime_dependency 'bundler', '~> 1.6.2'
+  spec.add_runtime_dependency 'puma', '~> 2.8.2'
+  spec.add_runtime_dependency 'pry'
+  spec.add_runtime_dependency 'pry-rails'
+  spec.add_runtime_dependency 'pry-debugger'
 end