citrin 0.0.10 → 0.1.1

data/citrin.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "citrin"
-  s.version = "0.0.10"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike"]
-  s.date = "2012-01-18"
-  s.description = "This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch). It creates Apache Configuration, MySQL Databases and Subversion Repositories."
+  s.date = "2015-04-14"
+  s.description = "This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch). It creates Apache vhost configuration and helps create and configure MySQL databases."
   s.email = "mike@citrin.ch"
   s.executables = ["citrin"]
   s.extra_rdoc_files = [
@@ -29,10 +29,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/citrin",
     "citrin.gemspec",
-    "commands/adjust_permissions",
-    "commands/create_database",
-    "commands/create_svn",
-    "commands/create_webserver",
     "commands/help",
     "commands/remove_railsapp",
     "etc/citrin.yml",
@@ -42,51 +38,32 @@ Gem::Specification.new do |s|
     "lib/citrin/commands.rb",
     "lib/citrin/commands/create_database.rb",
     "lib/citrin/commands/create_webserver.rb",
+    "lib/citrin/commands/setup_logrotate.rb",
     "lib/citrin/helpers.rb",
     "templates/dev.database.erb",
     "templates/dev_virtualhost.erb",
     "templates/prod.database.erb",
     "templates/prod_virtualhost.erb",
+    "templates/logrotate.erb",
     "test/helper.rb",
     "test/test_citrin.rb"
   ]
-  s.homepage = "http://github.com/firemind/citrin"
+  s.homepage = "http://github.com/citrininfo/citrin"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
-  s.summary = "Client for citrin RailsServer management"
+  s.summary = "Client for citrin Rails Server management"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["= 0.9.2.2"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_runtime_dependency(%q<mysql2>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["= 3.9.4"])
     else
-      s.add_dependency(%q<rake>, ["= 0.9.2.2"])
-      s.add_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["= 3.9.4"])
     end
   else
-    s.add_dependency(%q<rake>, ["= 0.9.2.2"])
-    s.add_dependency(%q<rails>, [">= 3.1.0"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["= 3.9.4"])
   end
 end
 

data/commands/help

@@ -3,9 +3,8 @@ echo "Usage: citrin command [args]
 Commands are:
   create_database appname [env]
   create_webserver appname [env]
-  create_svn_rails appname [env]
-  create_svn appname
 
 Options for env:
   prod
-  dev"
+  dev
+  (test)"

data/commands/remove_railsapp

@@ -4,7 +4,6 @@ name=$1
 
 prod_path="/var/www/rails_apps/prod/"
 dev_path="/var/www/rails_apps/dev/"
-svn_path=/var/svn/$name/
 path="$dev_path$name"
 if [ -z $name ] ; then
  echo "usage: $0 appname"
@@ -13,7 +12,6 @@ fi
 
 rm -rf $prod_path$name
 rm -rf $dev_path$name
-rm -rf $svn_path
 
 
 rm -f /etc/apache2/sites-enabled/prod.$name.conf

data/lib/citrin/app.rb

@@ -40,10 +40,15 @@ module Citrin
         raise "Invalid Environment"
       end
     end
-    def webserver_config_file
+
+    def webserver_link_file
       "/etc/apache2/sites-enabled/#{@env}.#{@name}.conf"
     end
 
+    def webserver_config_file
+      "/etc/apache2/sites-available/#{@env}.#{@name}.conf"
+    end
+
     def db_name
       "#{@name}_#{@env}"
     end

data/lib/citrin/cli.rb

@@ -13,12 +13,12 @@ class Citrin::CLI
     env = args[1]
     app = Citrin::App.new(name, env)
     case command
-    when "create_svn_rails"
-      puts `#{File.dirname(__FILE__)}/../../commands/create_svn #{args.join(" ")} --with-rails`
     when "create_database"
       return Commands::CreateDatabase.run(app)
     when "create_webserver"
       return Commands::CreateWebserver.run(app)
+    when "setup_logrotate"
+      return Commands::SetupLogrotate.run(app)
     when "write_config"
       `cp #{File.dirname(__FILE__)}/../../etc/citrin.yml /etc/citrin.yml`
     else

data/lib/citrin/commands/create_database.rb

@@ -9,7 +9,7 @@ module Commands
         GRANT ALL ON #{@app.db_user}.* TO '#{@app.db_name}'@'localhost';
         SET PASSWORD FOR '#{@app.db_user}'@'localhost' = PASSWORD('#{@app.db_pass}');
       }
-      `mysql --user=#{Citrin::config['db_user']} --password=#{Citrin::config['db_pass']} -e "#{db_queries}"`
+      `sudo mysql --defaults-extra-file=/root/.my.cnf -u root -e "#{db_queries}"`
 
       template_file = database_template_file(@app.env)
       template = ERB.new(File.read(template_file), 0, "%<>")

data/lib/citrin/commands/create_webserver.rb

@@ -7,14 +7,14 @@ module Commands
       template_file = webserver_template_file(@app.env)
       template = ERB.new(File.read(template_file), 0, "%<>")
       result = template.result(binding)
-      File.open(@app.webserver_config_file, 'w') {|f| f.write(result ) }
+      `sudo sh -c 'echo "#{result}" > #{@app.webserver_config_file}'`
+      `sudo ln -s #{@app.webserver_config_file} #{@app.webserver_link_file}`
     
       puts "Apache VirtualHost Konfiguration unter: #{@app.webserver_config_file}"
       puts "App Root unter: #{@app.app_root}"
       puts "URL: http://#{@app.url}"
 
-      puts "Apache reload"
-      `sudo service apache2 reload 2>&1 > /dev/null`
+      `sudo service apache2 reload`
     end
   end
 end

data/lib/citrin/commands/setup_logrotate.rb

@@ -0,0 +1,15 @@
+require 'erb'
+module Commands
+  class SetupLogrotate
+    extend Citrin::Helpers
+    def self.run(app)
+      @app = app
+      logfile = rails_app_log_file(@app)
+      template_file = logrotate_config_template(@app)
+      template = ERB.new(File.read(template_file), 0, "%<>")
+      result = template.result(binding)
+      `sudo sh -c 'echo "#{result}" > /etc/logrotate.d/rails-app-#{@app.name}'`
+    
+    end
+  end
+end

data/lib/citrin/helpers.rb

@@ -8,4 +8,13 @@ module Citrin::Helpers
     env ||= "prod"
     File.dirname(__FILE__)+"/../../templates/#{env}.database.erb"
   end
+
+  def rails_app_log_file(app)
+    "#{app.app_root}/log/#{app.fullenv}.log"
+  end
+
+  def logrotate_config_template(app)
+    File.dirname(__FILE__)+"/../../templates/logrotate.erb"
+  end
+
 end

data/templates/logrotate.erb

@@ -0,0 +1,7 @@
+<%= logfile %> {
+	daily
+	rotate 12
+	compress
+	delaycompress
+	missingok
+}

data/test/test_citrin.rb

@@ -32,13 +32,6 @@ class TestCitrin < Test::Unit::TestCase
     assert_equal "200", statuscode
   end
 
-  should "create svn config" do
-    Citrin::CLI.start("create_svn", @appname)
-    assert File.exists?("/var/svn/#{@appname}")
-    svn_info=`svn info svn+ssh://$(hostname -f)/var/svn/#{@appname} 2> /dev/null`
-    assert_not_equal "", svn_info
-  end
-
   should "create database" do
    @app=Citrin::CLI.start("create_database", @appname)
    begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citrin
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &20670960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *20670960
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &20670280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *20670280
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: &20669540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *20669540
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &20668920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *20668920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20641700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,42 +21,14 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20641700
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &20640940 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *20640940
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &20639860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *20639860
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &20639060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.9.4
-  type: :development
-  prerelease: false
-  version_requirements: *20639060
+        version: 1.0.0
 description: This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch).
-  It creates Apache Configuration, MySQL Databases and Subversion Repositories.
+  It creates Apache vhost configuration and helps create and configure MySQL databases.
 email: mike@citrin.ch
 executables:
 - citrin
@@ -120,10 +48,6 @@ files:
 - VERSION
 - bin/citrin
 - citrin.gemspec
-- commands/adjust_permissions
-- commands/create_database
-- commands/create_svn
-- commands/create_webserver
 - commands/help
 - commands/remove_railsapp
 - etc/citrin.yml
@@ -133,14 +57,16 @@ files:
 - lib/citrin/commands.rb
 - lib/citrin/commands/create_database.rb
 - lib/citrin/commands/create_webserver.rb
+- lib/citrin/commands/setup_logrotate.rb
 - lib/citrin/helpers.rb
 - templates/dev.database.erb
 - templates/dev_virtualhost.erb
 - templates/prod.database.erb
 - templates/prod_virtualhost.erb
+- templates/logrotate.erb
 - test/helper.rb
 - test/test_citrin.rb
-homepage: http://github.com/firemind/citrin
+homepage: http://github.com/citrininfo/citrin
 licenses:
 - MIT
 post_install_message: 
@@ -153,9 +79,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 746247548110366803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Client for citrin RailsServer management
+summary: Client for citrin Rails Server management
 test_files: []

data/commands/adjust_permissions

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-chgrp -R rails-dev /var/svn/
-chmod 775 /var/svn/
-
-chgrp -R rails-dev /etc/apache2/templates
-chmod 775 /etc/apache2/templates
-
-chgrp -R rails-dev /etc/apache2/sites-enabled
-chmod 775 /etc/apache2/sites-enabled
-
-chgrp -R rails-dev /etc/apache2/sites-available
-chmod 775 /etc/apache2/sites-available
-
-chgrp -R rails-dev /var/www/rails_apps/prod
-chmod 775 /var/www/rails_apps/prod
-
-chgrp -R rails-dev /var/www/rails_apps/prod
-chmod 775 /var/www/rails_apps/prod
-
-chgrp -R rails-dev /var/www/rails_apps/dev
-chmod 775 /var/www/rails_apps/dev
-
-chgrp rails-dev /etc/citrin.yml
-chmod 660 /etc/citrin.yml

data/commands/create_database

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-dbuser=$(grep mysql-user /etc/citrin/citrin.conf | split -d"=" -f 2)
-dbpwd=$(grep mysql-password /etc/citrin/citrin.conf | split -d"=" -f 2 )
-name=#{args[0]}
-env=#{args[1]}
-if [ -z $name  ] ; then
- echo "usage: $0 appname [env]"
- exit 1;
-fi
-if [ -z $env  ] ; then
-  env="prod"
-fi
-
-if [ $env != "prod" -a $env != "dev" -a $env != "test" ]; then
- echo "usage: $0 appname env"
- echo "Options for env: prod dev test"
- exit 2;
-fi
-
-db_name="${name}_$env"
-db_user="${name}_$env"
-db_user_pw=$(pwgen -1)
-mysql --user $dbuser --password=$dbpwd -e "create database $db_name;"
-#echo "Database $db_name created"
-
-mysql --user $dbuser --password=$dbpwd -e "GRANT ALL ON $db_user.* TO '$db_name'@'localhost';"
-mysql --user $dbuser --password=$dbpwd -e "SET PASSWORD FOR '$db_user'@'localhost' = PASSWORD('$db_user_pw');"
-#echo "User $db_user with password $db_user_pw created"
-
-
-echo "Put this in your config/database.yml"
-
-if [ $env = "prod" ]; then
- fullenv="production"
-elif [  $env = "dev" ]; then
- fullenv="development"
-elif [  $env = "test" ]; then
- fullenv="test"
-else
-  echo "Invalid Env"
-  exit 3
-fi
-
-echo ""
-echo "and run"
-echo "  RAILS_ENV=$fullenv  rake db:migrate"

data/commands/create_svn

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-name=$1
-if [ -z $name  ] ; then
- echo "usage: $0 appname [env] [options]"
- exit 1;
-fi
-
-env=$2
-if [ -z $env  ] ; then
-  env="prod"
-fi
-
-proj_owner=www-data
-svn_path=/var/svn/$name/
-
-function create_svn {
-  echo "CREATING SVN"
-  svnadmin create $svn_path
-  chown -R $USER.rails-dev $svn_path
-
-  echo "svn co svn+ssh://$(hostname -f)$svn_path"
-}
-
-create_svn
-
-for var1 in "$@"
-do
-case $var1 in
-  --with-rails)
-   cd /var/www/rails_apps/$env/
-   svn co svn+ssh://$(hostname -f)$svn_path $name/
-   rails new $name
-   ;;
-  esac
-done

data/commands/create_webserver

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-name=$1
-conf_template=$2
-conffile=$3
-url=$4
-app_root=$5
-
-
-function configure_apache {
-
-  cp -p $conf_template $conffile
-  sed_str=$(echo $app_root | sed -e 's/\(\/\|\\\|&\)/\\&/g')
-  sed -i "s/PROJECT_ROOT/$sed_str/g" $conffile
-  sed -i "s/URL/$url/g" $conffile
-
-  echo ""
-  echo "Apache VirtualHost Konfiguration unter: $conffile"
-  echo "App Root unter: $app_root"
-  echo "URL: http://$url"
-
-
-  echo "Apache reload"
-  sudo service apache2 reload 2>&1 > /dev/null 
-}
-
-configure_apache