ratchetify 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afde081629aaaa295943f37ede29bf2490b0766a
-  data.tar.gz: fed743747185f2660f79ffa135aa75bb796bb811
+  metadata.gz: 1a4b8fdc1b6691a5ca19a8c95f91378178668bf7
+  data.tar.gz: e301d5942f39c709b69c8f434dab192d63882fae
 SHA512:
-  metadata.gz: 4a1c0bb35a467d6092a41a62bc4dc7c688c7b1df6359357b1ee2c6786b8a3d40d6fc9f5815b9acf19211232998fa93d7491f7e084c7b0edcd5a0400a1ea9abbb
-  data.tar.gz: 07d6841650e7e9479c16849fc7c3e0cdec5fcb4a54bcb086dd1b7b5a1e748a862b81a802ad1bd48b43989594fb6ea0de8e6eb87810645c54c06a1a64985cf03d
+  metadata.gz: 7d620f93eee909490c77afcb898ef4842997f91cbe23a058c15e559dc2de18b125142c68f19489f0437fd2e0e5a2d25cb9aaf97da8f9459976cfca4135ce29e2
+  data.tar.gz: ce3371bd8f427d0113de5a38db17d00d20784af94a999a6961cae738534aecf3944fa7d3c82a7edc1e905357e090094fd7caf1edbad592fdb1898916152b0476

data/lib/ratchetify/db.rb

@@ -0,0 +1,49 @@
+
+Capistrano::Configuration.instance.load do
+  
+  require 'capistrano'
+  require 'ratchetify/helpers'
+  
+  desc "Tasks to create / drop a database (mysql)"
+  namespace :db do
+    
+    task :create do
+      
+      # extract user & password
+      my_cnf = capture('cat ~/.my.cnf')
+      
+      my_cnf.match(/^user=(\w+)/)
+      mysql_user = $1
+      my_cnf.match(/^password=(\w+)/)
+      mysql_pwd = $1
+      
+      # create the database
+      mysql_database = "#{user}_#{application}" # 'application' MUST NOT contain any '-' !!!
+      run "mysql -e 'CREATE DATABASE IF NOT EXISTS #{mysql_database} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
+      
+      # create the database.yml file
+      database_yml = <<-EOF
+production:
+  adapter: mysql2
+  encoding: utf8
+  database: #{mysql_database}
+  pool: 15
+  username: #{mysql_user}
+  password: #{mysql_pwd}
+  host: localhost
+  socket: /var/lib/mysql/mysql.sock
+  timeout: 10000
+
+EOF
+      # upload the database.yml file
+      put database_yml, "#{deploy_dir}/config/database.yml"
+      
+    end # task :create
+    
+    task :drop do
+      mysql_database = "#{user}_#{application}" # 'application' MUST NOT contain any '-' !!!
+      run "mysql -e 'DROP DATABASE IF EXISTS #{mysql_database};'"
+    end
+        
+  end
+end

data/lib/ratchetify/php.rb

@@ -12,7 +12,7 @@ Capistrano::Configuration.instance.load do
   desc "Deploy an app for the first time"
   namespace :create do
     
-    desc "Deploy an wordpress blog to uberspace"
+    desc "Deploy a PHP app to uberspace"
     task :php do
       create_repo
       create_database

data/lib/ratchetify/rails.rb

@@ -6,19 +6,20 @@ Capistrano::Configuration.instance.load do
   require 'ratchetify/setup'
   require 'ratchetify/domain'
   require 'ratchetify/service'
+  require 'ratchetify/db'
   
   before "create:rails", "setup:environment"
+  before "create:rails", "db:create"
   after "create:rails", "service:create"
+  after "create:rails", "service:create_reverse_proxy"
   after "create:rails", "domain:add"
   
   desc "Deploy an app for the first time"
   namespace :create do
     
-    desc "Deploy an RAILS app to uberspace"
+    desc "Deploy a RAILS app to uberspace"
     task :rails do
       create_repo
-      create_and_configure_database
-      create_reverse_proxy
       config_rails_app
       finalize
     end
@@ -40,55 +41,6 @@ Capistrano::Configuration.instance.load do
       
     end # task :create_repo
     
-    task :create_and_configure_database do
-      
-      # extract user & password
-      my_cnf = capture('cat ~/.my.cnf')
-      
-      my_cnf.match(/^user=(\w+)/)
-      mysql_user = $1
-      my_cnf.match(/^password=(\w+)/)
-      mysql_pwd = $1
-      
-      # create the database
-      mysql_database = "#{user}_#{application}" # 'application' MUST NOT contain any '-' !!!
-      run "mysql -e 'CREATE DATABASE IF NOT EXISTS #{mysql_database} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
-      
-      # create the database.yml file
-      database_yml = <<-EOF
-production:
-  adapter: mysql2
-  encoding: utf8
-  database: #{mysql_database}
-  pool: 15
-  username: #{mysql_user}
-  password: #{mysql_pwd}
-  host: localhost
-  socket: /var/lib/mysql/mysql.sock
-  timeout: 10000
-
-EOF
-      # upload the database.yml file
-      put database_yml, "#{deploy_dir}/config/database.yml"
-      
-    end # task :create_and_configure_database
-    
-    task :create_reverse_proxy do
-      
-      # .htaccess      
-      htaccess = <<-EOF
-RewriteEngine On
-RewriteBase /
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ http://localhost:#{daemon_port}/$1 [P]
-EOF
-
-      # place the .htaccess file
-      put htaccess, "#{deploy_dir}/.htaccess"
-      run "chmod +r #{deploy_dir}/.htaccess"
-      
-    end # task :create_reverse_proxy
-    
     task :config_rails_app do
       # run bundle install first
       run "cd #{deploy_dir} && bundle install --path ~/.gem"

data/lib/ratchetify/service.rb

@@ -36,7 +36,7 @@ Capistrano::Configuration.instance.load do
 export HOME=/home/#{user}
 source $HOME/.bash_profile
 cd #{deploy_dir}
-exec /home/#{user}/.gem/ruby/#{ruby_version}/bin/bundle exec thin start -p #{daemon_port} -e production 2>&1
+exec /home/#{user}/.gem/ruby/#{:ruby_api_version}/bin/bundle exec thin start -p #{daemon_port} -e production 2>&1
 EOF
       
       # upload the run script
@@ -52,7 +52,7 @@ EOF
 export HOME=/home/#{user}
 source $HOME/.bash_profile
 cd #{deploy_dir}
-exec /home/#{user}/.gem/ruby/#{ruby_version}/bin/bundle exec unicorn -p #{daemon_port} -c ./config/unicorn.rb -E #{environment} 2>&1
+exec /home/#{user}/.gem/ruby/#{:ruby_api_version}/bin/bundle exec unicorn -p #{daemon_port} -c ./config/unicorn.rb -E #{environment} 2>&1
 EOF
       
       # upload the run script
@@ -91,6 +91,22 @@ EOF
       
     end # task :create_service_unicorn
     
+    task :create_reverse_proxy do
+      
+      # .htaccess      
+      htaccess = <<-EOF
+RewriteEngine On
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ http://localhost:#{daemon_port}/$1 [P]
+EOF
+
+      # place the .htaccess file
+      put htaccess, "#{deploy_dir}/.htaccess"
+      run "chmod +r #{deploy_dir}/.htaccess"
+      
+    end # task :create_reverse_proxy
+    
     desc "Remove the service"
     task :remove do
       script = <<-EOF

data/lib/ratchetify/undeploy.rb

@@ -4,23 +4,19 @@ Capistrano::Configuration.instance.load do
   require 'capistrano'
   require 'ratchetify/helpers'
   require 'ratchetify/service'
+  require 'ratchetify/db'
   
   before "undeploy", "service:remove"
+  before "undeploy", "db:drop"
   
   desc "Undeploy an app from uberspace"
   namespace :undeploy do
     
     desc "Undeploy an app from uberspace"
     task :default do
-      drop_database
       remove_repo
     end
     
-    task :drop_database do
-      mysql_database = "#{user}_#{application}" # 'application' MUST NOT contain any '-' !!!
-      run "mysql -e 'DROP DATABASE IF EXISTS #{mysql_database};'"
-    end
-    
     task :remove_repo do
       run "cd #{deploy_root} && rm -rf #{fetch :application}"
       run "cd #{webroot_dir} && rm -rf #{fetch :host}.#{fetch :domain}"

data/lib/ratchetify/version.rb

@@ -1,3 +1,3 @@
 module Ratchetify
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/ratchetify/wordpress.rb

@@ -5,17 +5,18 @@ Capistrano::Configuration.instance.load do
   require 'ratchetify/helpers'
   require 'ratchetify/setup'
   require 'ratchetify/domain'
+  require 'ratchetify/db'
   
   before "create:wordpress", "setup:environment"
+  before "create:wordpress", "db:create"
   after "create:wordpress", "domain:add"
   
   desc "Deploy an app for the first time"
   namespace :create do
     
-    desc "Deploy an wordpress blog to uberspace"
+    desc "Deploy a standard wordpress blog to uberspace"
     task :wordpress do
       create_web_dir
-      create_database
       finalize
     end
     
@@ -33,42 +34,10 @@ Capistrano::Configuration.instance.load do
         #run "cd #{deploy_root} && rm wordpress*"
         run "cd #{webroot_dir} && rm -rf wordpress*"
         
-        # rename word press to -> :application
-        #run "cd #{deploy_root} && mv ./wordpress #{application}"
       end
       
     end # task :create_dir
-    
-    task :create_database do
-      
-      # extract user & password
-      my_cnf = capture('cat ~/.my.cnf')
-      
-      my_cnf.match(/^user=(\w+)/)
-      mysql_user = $1
-      my_cnf.match(/^password=(\w+)/)
-      mysql_pwd = $1
-      my_cnf.match(/^port=(\w+)/)
-      mysql_port = $1
-      
-      # create the database
-      mysql_database = "#{user}_#{application}" # 'application' MUST NOT contain any '-' !!!
-      run "mysql -e 'CREATE DATABASE IF NOT EXISTS #{mysql_database} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
-      
-      database_yml = <<-EOF
-database: #{mysql_database}
-username: #{mysql_user}
-password: #{mysql_pwd}
-host: localhost
-port: #{mysql_port}
-
-EOF
-
-      # upload the database.yml file
-      put database_yml, "#{deploy_dir}/database.yml"
-      
-    end # task :create_database
-    
+        
     task :finalize do
       # create symbolic links..
       run "cd #{webroot_dir} && ln -s #{deploy_dir} #{fetch :host}.#{fetch :domain}"

data/lib/ratchetify.rb

@@ -11,7 +11,9 @@ Capistrano::Configuration.instance.load do
   require 'ratchetify/domain'
   require 'ratchetify/rails'
   require 'ratchetify/wordpress'
+  require 'ratchetify/php'
   require 'ratchetify/update'
+  require 'ratchetify/db'
   require 'ratchetify/help' # monkey patched from capistrano
   
   # host and domain for the new app
@@ -21,7 +23,7 @@ Capistrano::Configuration.instance.load do
   
   # random port used for the reverse proxy
   set :daemon_port, rand(61000-32768+1)+32768  # random port
-  set :type, :rails # supported types are: :rails, :wordpress, 
+  set :type, :rails # supported types are: :rails, :wordpress, :php
   
   # internal variables, should not be changed in the cap file
   set :ruby_version, "2.1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratchetify
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael Kuehl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -56,6 +56,7 @@ files:
 - bin/rat
 - lib/ratchetify.rb
 - lib/ratchetify/base.rb
+- lib/ratchetify/db.rb
 - lib/ratchetify/domain.rb
 - lib/ratchetify/help.rb
 - lib/ratchetify/helpers.rb