traquitana 0.0.20 → 0.0.21

data/config/default.yml

@@ -11,8 +11,11 @@ list:
 - - config/environments/production.rb
 - - config/locales/**/*
 - - config/routes.rb
+- - config/boot.rb
+- - config/database.yml
 - - app/**/*
 - - db/migrate/**/*
+- - db/seeds.rb
 - - public/javascripts/**/*
 - - public/stylesheets/**/*
 - - lib/**/*

data/config/nginx.sh

@@ -2,5 +2,4 @@ if [ -d tmp ]; then
    echo -n "Restarting Nginx ... "
    rm -f tmp/restart.txt
    touch tmp/restart.txt
-   echo "done."
 fi   

data/config/passenger.sh

@@ -2,5 +2,4 @@ if [ -d tmp ]; then
    echo -n "Restarting Passenger ... "
    rm -f tmp/restart.txt
    touch tmp/restart.txt
-   echo "done."
 fi

data/config/proc.sh

@@ -1,90 +1,264 @@
+#
+# Show a message
+# msg(message, verbose, newline)
+#
 function msg() {
    local str="$1"
-   local verbose="$2"
-   local newline="$3"
-   if [ "$verbose" != "true" ]; then
-      return 1
-   fi
-   if [ "$newline" == "true" ]; then
-      echo "$str"
+
+   echo "$str" >> $logfile
+   echo -e "$str"
+}
+
+#
+# Show usage
+#
+function usage() {
+   echo "Usage:"
+   echo ""
+   echo "proc.sh <traq directory> <id> <verbose>"
+   echo ""
+   echo "-h Show this message"
+   echo "-o Show gem dir owner"
+   echo "-r Show gem dir owner, asking RVM"
+   echo "-g Show gem dir owner, asking Rubygems"
+   echo "-i Show gems provider (Rubygems, RVM, etc)"
+   echo "-d Show gems dir"
+}
+
+#
+# Gem dir
+#
+function gem_dir() {
+   local provider=$(gem_provider)
+   if [ -z "${provider}" ]; then
+      echo ""
    else
-      echo -n "$str"
+      echo $(${provider}_gemdir)
    fi
 }
 
-# force the production enviroment
-export RAILS_ENV=production
+# 
+# RVM gem dir
+#
+function rvm_gemdir() {
+   echo $(rvm gemdir)
+}
 
-# move to the correct directory
-cd $1/..
+#
+# Rubygems gem dir
+#
+function rubygems_gemdir() {
+   echo $(gem environment | grep INSTALLATION | cut -f2- -d:)
+}
+
+#
+# Return the RVM gems dir owner
+#
+function rvm_owner() {
+   echo $(stat --printf=%U $(rvm_gemdir))
+}
 
-# verbose mode
-verbose="$3"
+#
+# Return the gems dir owner
+#
+function rubygems_owner() {
+   echo $(stat --printf=%U $(rubygems_gemdir))
+}
 
-# make a copy of the old contents
-msg "Making a safety copy of the old contents on traq/$2 ... " "$verbose" "false"
-zip -q traq/$2.safe.zip `cat traq/$2.list` &> /dev/null
-msg "done." "$verbose" "true"
+# 
+# Gems provider
+#
+function gem_provider() {
+   if [ -n "$(which rvm)" ]; then
+      echo "rvm"
+   elif [ -n "$(which gem)" ]; then 
+      echo "rubygems"
+   else
+      echo ""
+   fi
+}
 
-# check the current Gemfile checksum
-old_gemfile_md5=$(md5sum Gemfile 2> /dev/null | cut -f1 -d' ')
+#
+# Find the current gem owner
+# If not using RVM, returns the owner of the gem directory
+#
+function gemdir_owner() {
+   local provider=$(gem_provider)
+   if [ -z "${provider}" ]; then
+      echo $(whoami)
+   else
+      echo $(${provider}_owner)
+   fi
+}
 
-# install the new files
-msg "Unzipping $2.zip ... " "true" "false"
-unzip -o traq/$2.zip &> /dev/null
-msg "done." "true" "true"
+#
+# Move to the app directory
+#
+function cd_app_dir() {
+   msg "Moving to ${dir} directory ..."
+   cd $1/..
+}
 
-# check the new Gemfile checksum
-new_gemfile_md5=$(md5sum Gemfile 2> /dev/null | cut -f1 -d' ')
+#
+# Make a copy of the old contents
+#
+function safe_copy() {
+   msg "Making a safety copy of the old contents on traq/$1.safe.zip ... "
+   zip -q traq/$1.safe.zip `cat traq/$1.list` &> /dev/null
+}
 
-# if the current Gemfile is different, run bundle install
-if [ -f Gemfile -a "$old_gemfile_md5" != "$new_gemfile_md5" ]; then
+#
+# Install the new files
+#
+function install_new_files() {
+   msg "Unzipping $1.zip ... "
+   unzip -o traq/$1.zip &> /dev/null
+}
 
-   if [ -f Gemfile.lock ]; then     # if there is a Gemfile.lock file ... 
-      if [ -w Gemfile.lock ]; then  # ... and it is writable
-         msg "Running bundle install ..." "true" "true"
-         bundle install
-      else
-         msg "Gemfile.lock exists but it is not writable, not running bundle install." "true" "true"
-      fi
+# 
+# Create database if needed
+#
+function createdb() {
+  msg "Creating database if needed ..."
+  bundle exec rake db:create &> /dev/null
+}
+
+#
+# Run migrations if needed
+#
+function migrate() {
+   migrations=$(grep "^db/migrate" traq/${config_id}.list)
+   if [ -n "$migrations" ]; then
+      msg "Running migrations ... "
+      bundle exec rake db:migrate 2> /dev/null
    fi
+}
 
-   if [ ! -f Gemfile.lock ]; then   # if there is not a Gemfile.lock file ...
-     if [ -w . ]; then              # ... and current dir is writable
-         msg "Running bundle install ..." "true" "true"
+#
+# Precompile assets if needed
+#
+function assets() {
+   if [ -d app/assets ]; then
+      msg "Compiling assets ... "
+      bundle exec rake assets:precompile 2> /dev/null
+   fi
+}
+
+#
+# Change file permissions on public dir
+#
+function permissions() {
+   if [ -d public ]; then
+      msg "Changing file permissions on public to 0755 ... "
+      chmod -R 0755 public/*
+   fi
+}
+
+#
+# Fix current gems, running bundle
+#
+function fix_gems() {
+   msg "Fixing gems ..."
+   local basedir=$(gem_dir | cut -f1-3 -d/)
+   local owner=$(gemdir_owner)
+   local curdir=$(pwd)
+   local curuser=$(whoami)
+   msg "Gem dir owner is \e[1m${owner}\e[0m"
+
+   # if gemdir owner and current user is root, try to install gems system wide
+   if [ "${owner}" == "root" -a "${curuser}" == "root" ]; then
+      msg "Performing a \e[1msystem wide gem install using root\e[0m"
+      bundle install
+   # install gems on rvm system path or vendor/bundle
+   else
+      # if gemdir is the current user dir, install there
+      if [ "${basedir}" == "/home/${owner}" ]; then
+         msg "Performing a \e[1mlocal gem install on home dir\e[0m"
          bundle install
+      # if user is not root and gemdir is not the home dir, install on vendor
       else
-         msg "Gemfile.lock does not exists but current dir is not writable, not running bundle install" "true" "true"
+         msg "Performing a \e[1mlocal gem install on vendor/bundle\e[0m"
+         bundle install --path vendor/bundle
       fi
    fi
-fi
+}
 
-# run migrations if needed
-migrations=$(grep "^db/migrate" traq/$2.list)
-if [ -n "$migrations" ]; then
-	msg "Running migrations ... " "true" "true"
-	bundle exec rake db:migrate 2> /dev/null
-   msg "Migrations done." "true" "true"
-fi
+#
+# Make a sanity check to see if all the tools needed are available
+#
+function sanity_check() {
+  if [ -z "$(which unzip)" ]; then
+    msg "\e[31mThere's no \e[1munzip\e[0;31m tool installed on the server. Please install it before proceeding again\e[0m"
+    exit 2
+  fi
+}
 
-# precompile assets if needed
-if [ -d app/assets ]; then
-   msg "Compiling assets ... " "$verbose" "false"
-   bundle exec rake assets:precompile 2> /dev/null
-   msg "done." "$verbose" "true"
-fi
+# force the production enviroment
+export RAILS_ENV=production
 
-# change file permissions on public dir
-if [ -d public ]; then
-   msg "Changing file permissions on public to 0755 ... " "$verbose" "false"
-   chmod -R 0755 public/*
-   msg "done." "$verbose" "true"
-fi
+config_dir="$1"            # config dir
+config_id="$2"             # config id
+verbose="$3"               # verbose mode
+newline="true"             # default newline on messages
+logfile="/tmp/traq$$.log"  # log file
+
+# sanity check
+sanity_check
+
+# parse command line options
+while getopts "horgid" OPTION
+do
+   case ${OPTION} in
+      h)
+         usage
+         exit 1
+         ;;
+      o)
+         echo "Gem dir owner is: $(gemdir_owner)"
+         exit 1
+         ;;
+      r)
+         echo "RVM gem dir owner is: $(rvm_owner)"
+         exit 1
+         ;;
+      g)
+         echo "Ruby gems dir owner is: $(rubygems_owner)"
+         exit 1
+         ;;
+      i)
+         echo "Gems provider is $(gem_provider)"
+         exit 1
+         ;;
+      d)
+         echo "Gems dir is $(gem_dir)"
+         exit 1
+         ;;
+      *) 
+         usage 
+         exit 1
+         ;;
+   esac
+done
+
+msg "Log file is ${logfile}"
+
+# move to the correct directory
+dir="${1}"
+cd_app_dir "${dir}"
+safe_copy "${config_id}"
+
+# here is where things happens on the server
+install_new_files "${config_id}"
+fix_gems
+createdb
+migrate
+assets
+permissions
 
 # restart server
 if [ -x ./traq/server.sh -a -f ./traq/server.sh ]; then
    ./traq/server.sh
-fi   
+fi
 
 # extra configs
 if [ -x ./traq/extra.sh -a -f ./traq/extra.sh ]; then
@@ -92,4 +266,4 @@ if [ -x ./traq/extra.sh -a -f ./traq/extra.sh ]; then
 fi
 
 # erase file
-rm traq/$2.zip
+rm traq/${config_id}.zip

data/lib/deployer.rb

@@ -1,63 +1,63 @@
 module Traquitana
-	class Deployer
-		def initialize(options=nil)
-			@config	= Traquitana::Config.instance
-         @verbose = !options.nil? && options[:verbose]
-         @config.filename = options[:filename] if options[:filename]
-         @config.target   = options[:target]   if options[:target]
-		end			
-
-		def run
-			STDOUT.puts "Running Traquitana version #{VERSION}\n"
-         Traquitana::Migrator.new.run
-
-			if !File.exist?(@config.filename)
-				STDERR.puts "No config file (#{@config.filename}) found."	
-				STDERR.puts "Did you run traq setup?"
-				STDERR.puts "Run it and check the configuration before deploying."
-				exit 1
-			end
-
-			@config.load
-
-			@options = @config.password.size>1 ? {:password=>@config.password} : {}
-         @server  = @config.server.to_s.size>0 ? @config.server : "none"
-         @shell   = @config.shell ? "#{@config.shell} " : ""
-         @network = Traquitana::SSH.new(@config.host,@config.user,@options)
-
-         @packager = Traquitana::Packager.new
-         @packager.verbose = @verbose
-         all_list_file, all_list_zip = @packager.pack
-         if !File.exists?(all_list_file) ||
-            !File.exists?(all_list_zip)
-            STDERR.puts "Could not create the needed files."
-            exit 2
-         end
-
-			# check if the traq destination and config directories exists 
-			@network.execute(["mkdir -p #{@config.directory}/traq"],@verbose)
-         @updater = Traquitana::Bar.new
-
-         STDOUT.puts "Sending files ..."
-         @network.send_files([["#{File.dirname(File.expand_path(__FILE__))}/../config/proc.sh","#{@config.directory}/traq/proc.sh"],
-                              ["#{File.dirname(File.expand_path(__FILE__))}/../config/#{@server}.sh","#{@config.directory}/traq/server.sh"],
-                              [all_list_file,"#{@config.directory}/traq/#{File.basename(all_list_file)}"],
-                              [all_list_zip ,"#{@config.directory}/traq/#{File.basename(all_list_zip)}"]],@updater)
-         STDOUT.puts "All files sent."
-
-         @network.execute(["chmod +x #{@config.directory}/traq/proc.sh"],@verbose)
-         @network.execute(["chmod +x #{@config.directory}/traq/server.sh"],@verbose)
-
-			cmd = "#{@config.directory}/traq/proc.sh #{@config.directory}/traq #{@packager.id} #{@verbose}"
-			cmd = "#{@shell} \"#{cmd}\"" if @shell
-
-         STDOUT.puts "Running remote update commands, please wait ..."
-         STDOUT.puts @network.execute([cmd],@verbose).join
-
-			# clean up
-			File.unlink(all_list_file)
-			File.unlink(all_list_zip)
-			STDOUT.puts "All done. Have fun.\n"
-		end
-	end
+  class Deployer
+    def initialize(options=nil)
+      @config          = Traquitana::Config.instance
+      @verbose         = !options.nil? && options[:verbose]
+      @config.filename = options[:filename] if options[:filename]
+      @config.target   = options[:target]   if options[:target]
+    end
+
+    def run
+      STDOUT.puts "\e[1mRunning Traquitana version #{VERSION}\e[0m\n\n"
+      Traquitana::Migrator.new.run
+
+      if !File.exist?(@config.filename)
+        STDERR.puts "\e[31mNo config file (#{@config.filename}) found."	
+        STDERR.puts "Did you run \e[1mtraq setup\e[0;31m ?"
+        STDERR.puts "Run it and check the configuration before deploying.\e[0m"
+        exit 1
+      end
+
+      @config.load
+
+      @options = @config.password.size>1 ? {:password=>@config.password} : {}
+      @server  = @config.server.to_s.size>0 ? @config.server : "none"
+      @shell   = @config.shell ? "#{@config.shell} " : ""
+      @network = Traquitana::SSH.new(@config.host,@config.user,@options)
+
+      @packager = Traquitana::Packager.new
+      @packager.verbose = @verbose
+      all_list_file, all_list_zip = @packager.pack
+      if !File.exists?(all_list_file) ||
+        !File.exists?(all_list_zip)
+        STDERR.puts "\e[31mCould not create the needed files.\e[0m"
+        exit 2
+      end
+
+      # check if the traq destination and config directories exists 
+      @network.execute(["mkdir -p #{@config.directory}/traq"],@verbose)
+      @updater = Traquitana::Bar.new
+
+      STDOUT.puts "Sending files ..."
+      @network.send_files([["#{File.dirname(File.expand_path(__FILE__))}/../config/proc.sh","#{@config.directory}/traq/proc.sh"],
+                           ["#{File.dirname(File.expand_path(__FILE__))}/../config/#{@server}.sh","#{@config.directory}/traq/server.sh"],
+      [all_list_file,"#{@config.directory}/traq/#{File.basename(all_list_file)}"],
+      [all_list_zip ,"#{@config.directory}/traq/#{File.basename(all_list_zip)}"]],@updater)
+      STDOUT.puts "\e[32mAll files sent.\e[0m\n\n"
+
+      @network.execute(["chmod +x #{@config.directory}/traq/proc.sh"],@verbose)
+      @network.execute(["chmod +x #{@config.directory}/traq/server.sh"],@verbose)
+
+      cmd = "#{@config.directory}/traq/proc.sh #{@config.directory}/traq #{@packager.id} #{@verbose}"
+      cmd = "#{@shell} \"#{cmd}\"" if @shell
+
+      STDOUT.puts "Running remote update commands, please wait ..."
+      STDOUT.puts @network.execute([cmd],@verbose).join
+
+      # clean up
+      File.unlink(all_list_file)
+      File.unlink(all_list_zip)
+      STDOUT.puts "\e[32mAll done. Have fun.\e[0m\n"
+    end
+  end
 end

data/lib/ssh.rb

@@ -1,5 +1,6 @@
 require "net/scp"
 require "net/ssh"
+require "highline/import"
 
 module Traquitana
    class SSH
@@ -9,22 +10,41 @@ module Traquitana
          @host    = host
          @user    = user
          @options = options || {}
-			STDOUT.puts "Connecting to #{@host} using user #{@user}"
+         @options[:verbose] = :error
+         STDOUT.puts "Connecting to \e[1m#{@host}\e[0m using user \e[1m#{@user}\e[0m"
       end
 
       def execute(cmds,verbose=false)
-         rst = []
-         Net::SSH.start(@host,@user,@options) do |ssh|
-            for cmd in cmds
-               STDOUT.puts "Executing #{cmd} on remote host ..." if verbose
-               rst << ssh.exec!(cmd)
-            end
-         end
-         rst
+        rst = []
+
+        Net::SSH.start(@host,@user,@options) do |ssh|
+          ssh.open_channel do |channel|
+            channel.request_pty do |ch, success|
+              raise "Can't get PTY" unless success
+              for cmd in cmds
+                STDOUT.puts "Executing #{cmd} on remote host ..." if verbose
+                rst << ch.exec(cmd)
+              end # for
+
+              ch.on_data do |ch, data|
+                msg = data.inspect.to_s.gsub(/^"/,"").gsub(/"$/,"").gsub(/"\\"/,"\\").gsub("\\r","").gsub("\\n","\n").gsub("\\e","\e").strip.chomp
+                if data.inspect =~ /sudo/
+                  pwd = ask("\nNeed password to run as root/sudo: ") {|c| c.echo = "*"}
+                  channel.send_data("#{pwd}\n")
+                  sleep 0.1
+                else
+                  puts msg if msg.size > 1
+                end
+                ch.wait
+              end
+            end # tty
+          end # channel
+        end # ssh start
+        rst
       end
 
       def send_files(col,updater=nil)
-			Net::SCP.start(@host,@user,@options) do |scp|
+        Net::SCP.start(@host,@user,@options) do |scp|
             for files in col
                from, to = *files
                next if from.nil? || to.nil?

data/lib/traquitana/version.rb

@@ -1,3 +1,3 @@
 module Traquitana
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/spec/config/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem 'memoize'

data/traquitana.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Traquitana::VERSION
 
-  gem.add_dependency("rubyzip", [">= 1.0.0"])
-  gem.add_dependency("net-ssh", [">= 0"])
-  gem.add_dependency("net-scp", [">= 0"])
+  gem.add_dependency("rubyzip" , [">= 1.0.0"])
+  gem.add_dependency("net-ssh" , [">= 0"])
+  gem.add_dependency("net-scp" , [">= 0"])
+  gem.add_dependency("highline", [">= 0"])
 
   gem.license = "GPL-2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traquitana
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple tool for deploy Rails apps
 email:
 - eustaquiorangel@gmail.com
@@ -153,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Just a simple tool to deploy Rails apps with SSH and some shell scripts