citrin 0.0.8 → 0.0.9

data/Gemfile

@@ -7,6 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 gem 'rake', '0.9.2.2'
 gem 'rails', '>= 3.1.0'
+gem 'mysql2'
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -45,6 +45,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.4)
+    mysql2 (0.3.11)
     polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.1)
@@ -91,6 +92,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  mysql2
   rails (>= 3.1.0)
   rake (= 0.9.2.2)
   rcov

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/citrin.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{citrin}
-  s.version = "0.0.8"
+  s.name = "citrin"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Mike}]
-  s.date = %q{2012-01-13}
-  s.description = %q{This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch). It creates Apache Configuration, MySQL Databases and Subversion Repositories.}
-  s.email = %q{mike@citrin.ch}
-  s.executables = [%q{citrin}]
+  s.authors = ["Mike"]
+  s.date = "2012-01-15"
+  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.email = "mike@citrin.ch"
+  s.executables = ["citrin"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README",
@@ -35,16 +35,26 @@ Gem::Specification.new do |s|
     "commands/create_webserver",
     "commands/help",
     "commands/remove_railsapp",
+    "etc/citrin.yml",
     "lib/citrin.rb",
+    "lib/citrin/app.rb",
     "lib/citrin/cli.rb",
+    "lib/citrin/commands.rb",
+    "lib/citrin/commands/create_database.rb",
+    "lib/citrin/commands/create_webserver.rb",
+    "lib/citrin/helpers.rb",
+    "templates/dev.database.erb",
+    "templates/dev_virtualhost.erb",
+    "templates/prod.database.erb",
+    "templates/prod_virtualhost.erb",
     "test/helper.rb",
     "test/test_citrin.rb"
   ]
-  s.homepage = %q{http://github.com/firemind/citrin}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.7}
-  s.summary = %q{Client for citrin RailsServer management}
+  s.homepage = "http://github.com/firemind/citrin"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Client for citrin RailsServer management"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -52,6 +62,7 @@ Gem::Specification.new do |s|
     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"])
@@ -60,6 +71,7 @@ Gem::Specification.new do |s|
     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"])
@@ -69,6 +81,7 @@ Gem::Specification.new do |s|
   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"])

data/commands/adjust_permissions

@@ -21,5 +21,5 @@ 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/citrin.conf
-chmod 775 /etc/citrin/citrin.conf
+chgrp rails-dev /etc/citrin.yml
+chmod 660 /etc/citrin.yml

data/commands/create_database

@@ -42,13 +42,6 @@ else
   exit 3
 fi
 
-echo "$fullenv:"
-echo "  adapter: mysql2"
-echo "  encoding: utf8"
-echo "  database: $db_name"
-echo "  username: $db_user"
-echo "  password: $db_user_pw"
-
 echo ""
 echo "and run"
 echo "  RAILS_ENV=$fullenv  rake db:migrate"

data/commands/create_webserver

@@ -1,46 +1,13 @@
 #!/bin/bash
 
 name=$1
-env=$2
-prod_path="/var/www/rails_apps/prod/"
-dev_path="/var/www/rails_apps/dev/"
-path="$dev_path$name"
-if [ -z $name ] ; then
- echo "usage: $0 appname [environment]"
- exit 1;
-fi
-if [ -e $path ] ; then
- echo "Project already exits in $path";
- exit 2;
-fi
-
-if [ -z $env  ] ; then
-  env="prod"
-fi
-
-if [ $env != "prod" -a $env != "dev" ]; then
- echo "usage: $0 dbname env"
- echo "Options for env: prod dev"
- exit 3;
-fi
-
+conf_template=$2
+conffile=$3
+url=$4
+app_root=$5
 
 
 function configure_apache {
-  if [ $env = "prod" ]; then
-    conf_template="/etc/apache2/templates/prod_rails.conf"
-    conffile="/etc/apache2/sites-enabled/prod.$name.conf"
-    url=$name.$(hostname -f)
-    app_root=/var/www/rails_apps/prod/$name
-  elif [  $env = "dev" ]; then
-    conf_template="/etc/apache2/templates/dev_rails.conf"
-    conffile="/etc/apache2/sites-enabled/dev.$name.conf"
-    url=dev.$name.$(hostname -f)
-    app_root=/var/www/rails_apps/dev/$name
-  else
-    echo "Invalid Env"
-    exit 3
-  fi
 
   cp -p $conf_template $conffile
   sed_str=$(echo $app_root | sed -e 's/\(\/\|\\\|&\)/\\&/g')

data/etc/citrin.yml

@@ -0,0 +1,3 @@
+citrin:
+  db_user: root
+  db_pass: blub

data/lib/citrin/app.rb

@@ -0,0 +1,60 @@
+module Citrin
+  class App
+    def initialize(name, env="prod")
+      @name = name
+      @env = env
+      @env ||= "prod"
+    end
+
+    def name
+      @name
+    end
+
+    def env
+      @env
+    end
+
+    def fullenv
+      case(@env)
+        when "prod"
+          return "production"
+        when "dev"
+          return "development"
+        when "test"
+          return "test"
+      else
+        raise "Invalid Environment"
+      end
+    end
+
+    def app_root
+      "/var/www/rails_apps/#{@env}/#{@name}"
+    end
+
+    def url
+      if @env == "dev"
+        "dev.#{@name}.#{`hostname -f`}"
+      elsif @env == "prod"
+        "#{@name}.#{`hostname -f`}"
+      else
+        raise "Invalid Environment"
+      end
+    end
+    def webserver_config_file
+      "/etc/apache2/sites-enabled/#{@env}.#{@name}.conf"
+    end
+
+    def db_name
+      "#{@name}_#{@env}"
+    end
+
+    def db_user
+      "#{@name}_#{@env}"
+    end
+
+    def db_pass
+      @db_pass ||=`pwgen -1`.chomp
+      @db_pass
+    end
+  end
+end

data/lib/citrin/cli.rb

@@ -1,11 +1,26 @@
 require 'citrin'
+require 'citrin/helpers'
+require 'citrin/app'
+require 'citrin/commands'
 
 class Citrin::CLI
+  extend Citrin::Helpers
 
   def self.start(*args)
     command = args.shift.strip rescue "help"
-    if command == "create_svn_rails"
+    Citrin::Commands.load
+    name = args[0]
+    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 "write_config"
+      `cp #{File.dirname(__FILE__)}/../../etc/citrin.yml /etc/citrin.yml`
     else
       puts `#{File.dirname(__FILE__)}/../../commands/#{command} #{args.join(" ")}`
     end

data/lib/citrin/commands/create_database.rb

@@ -0,0 +1,28 @@
+require 'erb'
+module Commands
+  class CreateDatabase
+    extend Citrin::Helpers
+    def self.run(app)
+      @app = app
+      db_queries = %Q{
+        create database #{@app.db_name};
+        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}"`
+
+      template_file = database_template_file(@app.env)
+      template = ERB.new(File.read(template_file), 0, "%<>")
+      result = template.result(binding)
+
+      puts %Q{
+Put this in your config/database.yml
+#{result}
+
+and run
+  RAILS_ENV=#{@app.fullenv} rake db:migrate"
+      }
+      return @app    
+    end
+  end
+end

data/lib/citrin/commands/create_webserver.rb

@@ -0,0 +1,20 @@
+require 'erb'
+module Commands
+  class CreateWebserver
+    extend Citrin::Helpers
+    def self.run(app)
+      @app = app
+      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 ) }
+    
+      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`
+    end
+  end
+end

data/lib/citrin/commands.rb

@@ -0,0 +1,9 @@
+module Citrin
+  module Commands
+    def self.load
+      Dir[File.join(File.dirname(__FILE__), "commands", "*.rb")].each do |file|
+        require file
+      end
+    end
+  end
+end

data/lib/citrin/helpers.rb

@@ -0,0 +1,11 @@
+module Citrin::Helpers
+  def webserver_template_file(env)
+    env ||= "prod"
+    File.dirname(__FILE__)+"/../../templates/#{env}_virtualhost.erb"
+  end
+
+  def database_template_file(env)
+    env ||= "prod"
+    File.dirname(__FILE__)+"/../../templates/#{env}.database.erb"
+  end
+end

data/lib/citrin.rb

@@ -1,6 +1,8 @@
-
+require 'yaml'
 module Citrin
-  def self.do
-    "Hello World from the all mighty helloworld Gem!"
+
+  def self.config
+    refs = open('/etc/citrin.yml') {|f| YAML.load(f) }
+    return refs["citrin"]
   end
 end

data/templates/dev.database.erb

@@ -0,0 +1,6 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  database: <%= @app.db_name %>
+  username: <%= @app.db_user %>
+  password: <%= @app.db_pass %>

data/templates/dev_virtualhost.erb

@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+  ServerName <%= @app.url %>
+  DocumentRoot <%= @app.app_root %>/public
+  RackEnv development
+
+  <Directory <%= @app.app_root %>/public >
+    AllowOverride all
+    Options -MultiViews
+    Options ExecCGI FollowSymLinks
+    Order allow,deny
+     Allow from all
+  </Directory>
+</VirtualHost>

data/templates/prod.database.erb

@@ -0,0 +1,6 @@
+production:
+  adapter: mysql2
+  encoding: utf8
+  database: <%= @app.db_name %>
+  username: <%= @app.db_user %>
+  password: <%= @app.db_pass %>

data/templates/prod_virtualhost.erb

@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+  ServerName <%= @app.url %>
+  DocumentRoot <%= @app.app_root %>/public
+  RackEnv production
+
+  <Directory <%= @app.app_root %>/public >
+    AllowOverride all
+    Options -MultiViews
+    Options ExecCGI FollowSymLinks
+    Order allow,deny
+     Allow from all
+  </Directory>
+</VirtualHost>

data/test/test_citrin.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'helper'
 require 'citrin/cli'
+require 'mysql2'
 
 class TestCitrin < Test::Unit::TestCase
 
@@ -10,6 +11,17 @@ class TestCitrin < Test::Unit::TestCase
 
   def cleanup
     Citrin::CLI.start("remove_railsapp", @appname)
+    @app = Citrin::App.new(@appname)
+    begin
+       # connect to the MySQL server
+       dbh = Mysql2::Client.new(:host => "localhost", :username => Citrin::config['db_user'], :password => Citrin::config['db_pass'] )
+       dbh.query("drop user #{@app.db_user}@localhost;");
+       dbh.query("drop database #{@app.db_name};");
+    rescue
+    ensure
+      # disconnect from server
+      dbh.close if dbh
+    end
   end
 
   should "create webserver config" do
@@ -18,6 +30,27 @@ class TestCitrin < Test::Unit::TestCase
     `cd /var/www/rails_apps/prod/ && rails new #{@appname}`
     statuscode = `curl -sL -w "%{http_code}" "#{@appname}.$(hostname -f)" -o /dev/null`
     assert_equal "200", statuscode
-    cleanup
+  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
+     # connect to the MySQL server
+     dbh = Mysql2::Client.new(:host => "localhost", :username => @app.db_user, :password => @app.db_pass, :database => @app.db_name )
+   rescue Mysql2::Error => e
+     puts "Error message: #{e.error}"
+     fail "Can't connect to created DB"
+   ensure
+     # disconnect from server
+     dbh.close if dbh
+   end
+   cleanup
   end
 end

metadata

@@ -1,142 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: citrin
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Mike
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19474140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *19474140
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &19473400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19473400
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &19472840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *19472840
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &19472140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *19472140
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &19471200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *19471200
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &19470420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
+  version_requirements: *19470420
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &19469520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *19469520
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &19468760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 9
-        - 4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.9.4
-  version_requirements: *id007
-description: This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch). It creates Apache Configuration, MySQL Databases and Subversion Repositories.
+  type: :development
+  prerelease: false
+  version_requirements: *19468760
+description: This Gem helps you manage your citrin RailsServer (http://www.rails-server.ch).
+  It creates Apache Configuration, MySQL Databases and Subversion Repositories.
 email: mike@citrin.ch
-executables: 
+executables:
 - citrin
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -153,42 +126,46 @@ files:
 - commands/create_webserver
 - commands/help
 - commands/remove_railsapp
+- etc/citrin.yml
 - lib/citrin.rb
+- lib/citrin/app.rb
 - lib/citrin/cli.rb
+- lib/citrin/commands.rb
+- lib/citrin/commands/create_database.rb
+- lib/citrin/commands/create_webserver.rb
+- lib/citrin/helpers.rb
+- templates/dev.database.erb
+- templates/dev_virtualhost.erb
+- templates/prod.database.erb
+- templates/prod_virtualhost.erb
 - test/helper.rb
 - test/test_citrin.rb
 homepage: http://github.com/firemind/citrin
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 717151115472232295
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client for citrin RailsServer management
 test_files: []
-