spawngebob 0.1.0 → 0.1.4

data/CHANGELOG

@@ -0,0 +1,10 @@
+-- 0.1.4
+
+  * thor for CLI
+  * removed spawner class, replaced it with a shell script
+  * version bump
+  * removed colors
+  * more friendly error messages
+  * restart bug loop should be fixed
+  * script is now very powerful. can handle stress
+

data/bin/spawn

@@ -2,4 +2,4 @@
 
 SPAWNGEBOB_BASE_PATH = File.expand_path('../..', __FILE__)
 require File.join(SPAWNGEBOB_BASE_PATH, 'lib/spawngebob')
-Spawngebob::Runner.boot(ARGV)
+Spawngebob::CLI.start(ARGV)

data/lib/spawngebob/cli.rb

@@ -0,0 +1,35 @@
+require 'thor'
+
+module Spawngebob
+  class CLI < Thor
+    desc "start", "start nginx"
+    def start
+      Runner.boot(options)
+    end
+
+    desc "stop", "stop nginx"
+    def stop
+      Runner.boot(options)
+    end
+
+    desc "restart", "restart nginx"
+    def restart
+      Runner.boot(options)
+    end
+
+    desc "reload", "reload nginx"
+    def reload
+      Runner.boot(options)
+    end
+
+    desc "check", "check status of web server"
+    def check
+      Runner.boot(options)
+    end
+
+    desc "configure", "generate conf files"
+    def configure
+      Runner.boot(options)
+    end
+  end
+end

data/lib/spawngebob/compilers/nginx.rb

@@ -9,14 +9,14 @@ module Spawngebob
       end
 
       def prepare
-        if !File.exist?(@config_file_path)
-          raise "apps.yml not found in #{NGINX_CONF_PATH}"
-        end
-
         @config = ERB.new(File.read(@config_file_path)).result(binding)
         @config = YAML.load(@config)
 
-        compile!
+        if !@config.is_a? Hash
+          Utils.error "Garbage #{CONFIG_FILE}! Fix it!"
+        else
+          compile!
+        end
       end
 
       def compile!
@@ -29,12 +29,11 @@ module Spawngebob
         if @config['nginx'].include? 'port'
           NGINX_DEFAULTS.update(@config['nginx'])
         end
-        puts NGINX_DEFAULTS.inspect
 
         if @config['nginx']['ssl']
-          location_template = NGINX_SSL_LOCATION_TEMPLATE
+          location_template = NGINX_SSL_LOCATION_TEMPLATE.chomp!
         else
-          location_template = NGINX_HTTP_LOCATION_TEMPLATE
+          location_template = NGINX_HTTP_LOCATION_TEMPLATE.chomp!
         end
 
         # apps
@@ -71,12 +70,10 @@ module Spawngebob
 
             @container.concat(s)
           end
+        end
 
-          confd_path = File.join(NGINX_CONFIG_PATH, 'conf.d')
-
-          FileUtils.mkdir_p(confd_path) if !File.exist? confd_path
-
-          File.open(File.join(confd_path, 'caresharing.conf'), 'w') do |f|
+        File.open(File.join(NGINX_CONFD_PATH, 'caresharing.conf'), 'w') do |f|
+          Utils.say_with_time "Generating new config file..." do
             f.write(@container)
           end
         end

data/lib/spawngebob/compilers.rb

@@ -1,5 +1,5 @@
 module Spawngebob
   module Compilers
-    autoload :Nginx, (File.join(SPAWNGEBOB_LIB_ROOT, 'compilers/nginx'))
+    autoload :Nginx, 'spawngebob/compilers/nginx'
   end
 end

data/lib/spawngebob/constants.rb

@@ -1,20 +1,20 @@
 module Spawngebob
   module Constants
+    BASE_CONFIG_PATH = File.join(ENV['HOME'], '.spawngebob')
+    NGINX_PATH = File.join(BASE_CONFIG_PATH, 'nginx')
+    NGINX_CONF_PATH = File.join(NGINX_PATH, 'conf')
+    NGINX_CONFD_PATH = File.join(NGINX_PATH, 'conf.d')
+    NGINX_CONF = 'nginx.conf'
+    NGINX_PID = 'nginx.pid'
     NGINX_DIRS = ['tmp', 'run', 'logs', 'conf.d', 'conf']
     CONFIG_FILE = 'apps.yml'
+    SCRIPT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '../../script/nginx'))
 
     NGINX_DEFAULTS = {
       'listen' => '127.0.0.1',
       'port' => '8088'
     }
 
-    COLORS = {
-      :green => "\033[1;32m",
-      :red => "\033[1;31m",
-      :yellow =>"\033[1;33m",
-      :blank => "\033[0m"
-    }
-
     NGINX_UPSTREAM_TEMPLATE = <<NUT
 # %app%
 upstream %app%_proxy {

data/lib/spawngebob/runner.rb

@@ -4,82 +4,77 @@ module Spawngebob
   class Runner
     include Constants
 
-    def self.boot(args)
-      Spawngebob::Constants.const_set('BASE_CONFIG_PATH', File.join(ENV['HOME'], '.spawngebob'))
-      Spawngebob::Constants.const_set('NGINX_CONFIG_PATH', File.join(BASE_CONFIG_PATH, 'nginx', '/'))
-      Spawngebob::Constants.const_set('NGINX_CONF', File.join(NGINX_CONFIG_PATH, 'conf', 'nginx.conf'))
-      Spawngebob::Constants.const_set('NGINX_PID', File.join(NGINX_CONFIG_PATH, 'run', 'nginx.pid'))
+    def self.boot(options)
       Spawngebob::Constants.const_set('NGINX_BIN', `which nginx 2>/dev/null`.strip)
       Spawngebob::Constants.const_set('KILL_BIN', `which kill 2>/dev/null`.strip)
 
-      self.new(args)
+      self.new(options) if has_requirements?
     end
 
-    def initialize(args)
-      @options = {}
-      @options[:verbose] = false
+    def self.has_requirements?
+      # create necessary directories if not exist
+      NGINX_DIRS.each do |d|
+        full_path = File.join(NGINX_PATH, d)
 
-      optparse = OptionParser.new do |opts|
-        opts.banner = "Spawngebob and Patrick!"
-        opts.separator "Options:"
-
-        opts.on('-v', '--verbose', 'Verbose') do
-          @options[:verbose] = true
+        if !File.exists? full_path
+          Utils.say_with_time "Directory #{full_path} does not exist, creating..." do
+            FileUtils.mkdir_p(full_path)
+          end
         end
+      end
 
-        opts.on('-V', '--version', 'Version') do
-          puts Spawngebob::VERSION
-          exit
-        end
+      # check if nginx is installed
+      if !Constants.const_defined?("NGINX_BIN")
+        Utils.error "Nginx is not installed!"
+      end
 
-        opts.on('-h', '--help', 'Display this screen') do
-          puts opts
-          exit
-        end
+      # check if nginx.conf exist
+      nginx_conf = File.join(NGINX_CONF_PATH, NGINX_CONF)
+      if !File.exists?(nginx_conf)
+        Utils.error "#{NGINX_CONF} not found in #{NGINX_CONF_PATH}"
       end
 
-      optparse.parse!
+      if File.zero?(nginx_conf)
+        Utils.error "#{NGINX_CONF} is empty."
+      end
 
-      if args.length == 0
-        Utils.say optparse.help
-      else
-        # create necessary directories if not exist
-        NGINX_DIRS.each do |d|
-          full_path = File.join(NGINX_CONFIG_PATH, d)
+      # check if apps.yml exists
+      apps_config = File.join(BASE_CONFIG_PATH, CONFIG_FILE)
+      if !File.exists?(apps_config)
+        Utils.error "#{CONFIG_FILE} not found in #{BASE_CONFIG_PATH}"
+      end
 
-          if !File.exists? full_path
-            Utils.say FileUtils.mkdir_p(full_path)
-          end
-        end
+      if File.zero?(apps_config)
+        Utils.error "#{CONFIG_FILE} is empty."
+      end
 
-        if Constants.const_defined?("NGINX_BIN")
-          if File.exist?(NGINX_CONF) and !File.zero?(NGINX_CONF)
-            self.run(args)
-          else
-            raise "Missing nginx.conf in #{NGINX_CONF}!"
-          end
-        else
-          raise "Nginx is not installed!"
-        end
+      true
+    end
 
-      end
+    def initialize(options)
+      @options = options
+      @args = ARGV.dup
+      @command = ARGV.shift
+
+      self.run(options)
     end
 
-    def run(args)
-      case args.shift
+    def run(options)
+      case @args.shift
       when 'start'
-        Spawner.start(@options)
+        system "#{SCRIPT_DIR} start"
       when 'stop'
-        Spawner.stop
+        system "#{SCRIPT_DIR} stop"
       when 'restart'
-        Spawner.stop
-        Spawner.start(@options)
+        system "#{SCRIPT_DIR} restart"
       when 'check'
-        Spawner.check
+        system "#{SCRIPT_DIR} status"
+      when 'reload'
+        system "#{SCRIPT_DIR} reload"
       when 'configure'
         Compilers::Nginx.new.prepare
       else
-        puts "I don't know what to do."
+        puts "Unknown command! Available commands: {start|stop|restart|check|reload|configure}"
       end
     end
   end

data/lib/spawngebob/utils.rb

@@ -16,6 +16,11 @@ module Spawngebob
       say("#{result} rows", :subitem) if result.is_a?(Integer)
       result
     end
+
+    def self.error(message, code=-1)
+      say("\033[0;31merror: #{message}")
+      exit(code)
+    end
   end
 end
 

data/lib/spawngebob/version.rb

@@ -1,3 +1,3 @@
 module Spawngebob
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

data/lib/spawngebob.rb

@@ -1,15 +1,13 @@
 require 'yaml'
 require 'erb'
 require 'fileutils'
-require File.join(File.expand_path('../spawngebob/version', __FILE__))
-
-SPAWNGEBOB_LIB_ROOT = File.join(File.dirname(__FILE__), 'spawngebob')
+require 'spawngebob/version'
 
 module Spawngebob
 
-  autoload :Runner, (File.join(SPAWNGEBOB_LIB_ROOT, 'runner'))
-  autoload :Compilers, (File.join(SPAWNGEBOB_LIB_ROOT, 'compilers'))
-  autoload :Spawner, (File.join(SPAWNGEBOB_LIB_ROOT, 'spawner'))
-  autoload :Constants, (File.join(SPAWNGEBOB_LIB_ROOT, 'constants'))
-  autoload :Utils, (File.join(SPAWNGEBOB_LIB_ROOT, 'utils'))
+  autoload :CLI, 'spawngebob/cli'
+  autoload :Compilers, 'spawngebob/compilers'
+  autoload :Constants, 'spawngebob/constants'
+  autoload :Runner, 'spawngebob/runner'
+  autoload :Utils, 'spawngebob/utils'
 end

data/script/nginx

@@ -0,0 +1,133 @@
+#!/usr/bin/env sh
+nginx=`which nginx`
+nginx_path=$HOME/.spawngebob/nginx/
+pid_file="${nginx_path}run/nginx.pid"
+prog=$(basename $nginx)
+
+# colors
+green="\033[0;32m"
+yellow="\033[0;33m"
+red="\033[0;31m"
+clear="\033[0;0m"
+nginx_conf_file="$HOME/.spawngebob/nginx/conf/nginx.conf"
+
+lockfile=$HOME/.spawngebob/nginx/tmp/nginx.lock
+
+notice() {
+  echo ""
+  echo "*************** NOTE **********************************"
+  echo " if a permission denied ALERT pops up, ignore it       "
+  echo " info: http://wiki.nginx.org/CoreModule#error_log      "
+  echo "*******************************************************"
+  echo ""
+}
+
+start() {
+  [ -x $nginx ] || exit 5
+  [ -f $nginx_conf_file ] || exit 6
+
+  echo $yellow"Starting $prog:"$clear
+
+
+  notice
+
+  if [ -f $lockfile ] ; then
+    echo $red"  [fail]"$clear "lockfile $lockfile exists. nginx is running with master pid $yellow`cat $pid_file`$clear";
+    exit 8
+  fi
+
+  $nginx -c $nginx_conf_file -p $nginx_path
+
+  retval=$?
+
+  if [ $retval -eq 0 ] ; then
+    touch $lockfile
+    chmod 600 $lockfile
+    echo $green"  [ok]"$clear" $prog started with master pid `cat $pid_file`"
+  else
+    echo $red "  [fail]" $clear"Something went wrong." && exit 8
+  fi
+
+  return $retval
+}
+
+stop() {
+  echo $yellow"Stopping $prog..."$clear
+
+  echo "checking $pid_file..."
+
+  if [ -s $pid_file ] ; then
+    pid=`cat $pid_file`
+    echo "trying to kill pid $pid"
+    kill $pid && echo $green"  [ok]"$clear "pid $yellow$pid$clear killed"
+  else
+    echo $red"  [fail] "$clear"pidfile $pid_file not found" && exit 8
+  fi
+
+  retval=$?
+
+  if [ $retval -eq 0 ] ; then
+    notice
+
+    if [ -f $lockfile ] ; then
+      echo "removing $lockfile..."
+      rm -f $lockfile && echo $green"  [ok]"$clear "lockfile deleted"
+    else
+      echo $red "  [fail]" $clear"lockfile $lockfile not found" && exit 8
+    fi
+  else
+    echo $red "  [fail]" $clear"Something went wrong." && exit 8
+  fi
+
+  return $retval
+}
+
+restart() {
+  configtest || return $?
+  stop
+  start
+}
+
+reload() {
+  configtest || return $?
+  echo $yellow"Reloading $prog:"$clear
+
+  notice
+
+  kill -HUP `cat $pid_file` && echo $green"  [ok]"$clear " reloaded!"
+  retval=$?
+}
+
+configtest() {
+  echo $yellow"Testing configuration for $prog..."$clear
+  $nginx -t -c $nginx_conf_file -p $nginx_path
+}
+
+status() {
+  if [ -f $pid_file ] ; then
+    echo $green"  [ok]"$clear "nginx is running smoothly with pid `cat $pid_file`"
+  else
+    echo $red"  [fail] "$clear"pidfile $pid_file not found" && exit 8
+  fi
+}
+
+case "$1" in
+  start)
+    $1
+    ;;
+  stop)
+    $1
+    ;;
+  restart|configtest)
+    $1
+    ;;
+  reload)
+    $1
+    ;;
+  status)
+    $1
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|status|restart|reload|configtest}"
+    exit 2
+esac

data/spawngebob.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
+  s.add_dependency "thor"
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spawngebob
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
-dependencies: []
+date: 2012-05-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70360117758740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70360117758740
 description: ''
 email:
 - poymode@gmail.com
@@ -20,19 +31,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - Rakefile
 - bin/spawn
 - lib/spawngebob.rb
+- lib/spawngebob/cli.rb
 - lib/spawngebob/compilers.rb
 - lib/spawngebob/compilers/nginx.rb
 - lib/spawngebob/constants.rb
 - lib/spawngebob/runner.rb
-- lib/spawngebob/spawner.rb
 - lib/spawngebob/utils.rb
 - lib/spawngebob/version.rb
 - lib/templates/apps.yml.sample
 - lib/templates/nginx.conf.sample
+- script/nginx
 - spawngebob.gemspec
 homepage: ''
 licenses: []
@@ -54,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spawngebob
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: user based webserver non-root-runner and configurator

data/lib/spawngebob/spawner.rb

@@ -1,71 +0,0 @@
-module Spawngebob
-  class Spawner
-    include Constants
-
-    def self.start(opts, flag = false)
-      if get_pid && get_worker_pids
-        if flag
-          Utils.say "nginx #{COLORS[:green]}STARTED!#{COLORS[:blank]}"
-        else
-          Utils.say "nginx already #{COLORS[:yellow]}EXISTS!#{COLORS[:blank]}"
-          check
-        end
-        exit
-      else
-        Utils.say_with_time "starting nginx..." do
-          Dir.chdir(NGINX_CONFIG_PATH) do
-            if opts[:verbose]
-              `#{NGINX_BIN} -c #{NGINX_CONF} -p #{NGINX_CONFIG_PATH}`
-            else
-              `#{NGINX_BIN} -c #{NGINX_CONF} -p #{NGINX_CONFIG_PATH} 2>&1`
-            end
-          end
-        end
-
-        check
-      end
-
-      start(opts, true)
-    end
-
-    def self.has_pid?
-      File.exist?(NGINX_PID) && !File.zero?(NGINX_PID)
-    end
-
-    def self.get_pid
-      if has_pid?
-        File.read(NGINX_PID).chomp!
-      else
-        Utils.say "#{COLORS[:red]}pid does not exist!#{COLORS[:blank]}"
-        false
-      end
-    end
-
-    def self.stop
-      pid = get_pid
-
-      if pid
-        Utils.say_with_time "killing #{COLORS[:yellow]}#{pid}#{COLORS[:blank]}..." do
-          `#{KILL_BIN} #{pid}`
-        end
-
-        if FileUtils.rm_rf(NGINX_PID)
-          Utils.say "#{COLORS[:green]}pid removed!#{COLORS[:blank]}"
-        end
-      else
-        Utils.say "#{COLORS[:red]}nginx not running!#{COLORS[:blank]}"
-        exit
-      end
-    end
-
-    def self.get_worker_pids
-      worker_pids = `ps ax | grep 'nginx' | grep -v grep | awk '{print $1}'`
-    end
-
-    def self.check
-      if get_pid && get_worker_pids
-        Utils.say "nginx is running: #{COLORS[:green]}#{get_pid}#{COLORS[:blank]}"
-      end
-    end
-  end
-end