gitpusshuten 0.0.2 → 0.0.3

data/gitpusshuten.gemspec

@@ -1,7 +1,11 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/gitpusshuten/version')
+
 Gem::Specification.new do |gem|
 
   gem.name        = 'gitpusshuten'
-  gem.version     = '0.0.2' #GitPusshuTen::VERSION
+  gem.version     = GitPusshuTen::VERSION
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = 'Michael van Rooijen'
   gem.email       = 'meskyanichi@gmail.com'

data/lib/gitpusshuten.rb

@@ -18,5 +18,4 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__), 'gitpusshuten/**/*'))].ea
 end
 
 module GitPusshuTen
-  VERSION = '0.0.2'
-end
+end

data/lib/gitpusshuten/commands/user.rb

@@ -25,7 +25,9 @@ module GitPusshuTen
       # Sets up a new UNIX user and configures it based on the .gitpusshuten/config.rb
       def perform_add!
         if not e.user_exists? # prompts root
-          ensure_git_installed!           
+          ensure_git_installed!
+          ensure_common_dependencies_are_installed!
+          
           message "It looks like #{y(c.user)} does not yet exist."
           message "Would you like to add #{y(c.user)} to #{y(c.application)} (#{y(c.ip)})?"
           if yes?
@@ -173,6 +175,13 @@ module GitPusshuTen
         end
       end
 
+      ##
+      # Installs common dependencies that applications typically use
+      # for XML parsing and image manipulation
+      def ensure_common_dependencies_are_installed!
+        e.install!('libxml2-dev libxslt1-dev imagemagick')
+      end
+
       ##
       # Configures the user. Overwrites all current configurations (if any exist)
       def configure_user!

data/lib/gitpusshuten/git.rb

@@ -48,10 +48,12 @@ module GitPusshuTen
     def ignore!
       if File.exist?('.gitignore')
         if not File.read('.gitignore').include?('.gitpusshuten/**/*')
-          %x[echo '.gitpusshuten/**/*' >> .gitignore]
+          File.open('.gitignore', 'a') do |file|
+            file << "\n.gitpusshuten/**/*"
+          end
         end
       else
-        %x[echo '.gitpusshuten/**/*' >> .gitignore]
+        %x[echo ".gitpusshuten/**/*" >> .gitignore]
       end
     end
 

data/lib/gitpusshuten/modules/apache/command.rb

@@ -6,7 +6,9 @@ module GitPusshuTen
       example     "heavenly apache install to staging                   # Installs the Apache2 web server"
       example     "heavenly apache update-configuration for staging     # Only for Passenger users, when updating Ruby/Passenger versions."
       example     "heavenly apache download-configuration from staging  # Downloads the Apache2 configuration file from the specified environment."
+      example     "                download-config                      # Alias."
       example     "heavenly apache upload-configuration to staging      # Uploads the Apache2 configuration file to the specified environment."
+      example     "                upload-config                        # Alias."
       example     "heavenly apache create-vhost for production          # Creates a local vhost template for the specified environment."
       example     "heavenly apache delete-vhost from production         # Deletes the remote vhost for the specified environment."
       example     "heavenly apache upload-vhost to staging              # Uploads your local vhost to the server for the specified environment."
@@ -84,7 +86,7 @@ module GitPusshuTen
 
       ##
       # Downloads the Apache2 configuration file
-      def perform_download_config!
+      def perform_download_configuration!
         if not e.file?('/etc/apache2/apache2.conf')
           error "Could not find the Apache2 configuration file in #{y('/etc/apache2/apache2.conf')}"
           exit
@@ -98,9 +100,15 @@ module GitPusshuTen
         end
       end
 
+      ##
+      # Alias to perform_download_configuration!
+      def perform_download_config!
+        perform_download_configuration!
+      end
+
       ##
       # Uploads the Apache2 configuration file
-      def perform_upload_config!
+      def perform_upload_configuration!
         if not e.directory?('/etc/apache2')
           error "Could not find the Apache2 installation directory in #{y('/etc/apache2')}"
           exit
@@ -118,6 +126,12 @@ module GitPusshuTen
         end
       end
 
+      ##
+      # Alias to perform_upload_configuration!
+      def perform_upload_config!
+        perform_upload_configuration!
+      end
+
       def perform_download_vhost!
         remote_vhost = File.join(@configuration_directory, "sites-enabled", "#{e.sanitized_app_name}.#{e.name}.vhost")
         if not e.file?(remote_vhost) #prompts root

data/lib/gitpusshuten/modules/nginx/command.rb

@@ -7,7 +7,9 @@ module GitPusshuTen
       example     "heavenly nginx setup staging environment            # Sets up a managable vhost environment."
       example     "heavenly nginx update-configuration for staging     # Only for Passenger users, when updating Ruby/Passenger versions."
       example     "heavenly nginx download-configuration from staging  # Downloads the Nginx configuration file from the specified environment."
+      example     "               download-config                      # Alias."
       example     "heavenly nginx upload-configuration to staging      # Uploads the NginX configuration file to the specified environment."
+      example     "               upload-config                        # Alias."
       example     "heavenly nginx create-vhost for production          # Creates a local vhost template for the specified environment."
       example     "heavenly nginx delete-vhost from production         # Deletes the remote vhost for the specified environment."
       example     "heavenly nginx upload-vhost to staging              # Uploads your local vhost to the server for the specified environment."
@@ -86,49 +88,37 @@ module GitPusshuTen
       def perform_setup!
         find_nginx!
         
-        ##
-        # Creates a tmp dir
-        local.create_tmp_dir!
-        
-        ##
-        # Downloads the NginX configuration file to tmp dir
-        e.scp_as_root(:download, @nginx_conf, local.tmp_dir)
-        
-        ##
-        # Set the path to the downloaded file
-        local_file = File.join(local.tmp_dir, @nginx_conf_name)
-        
-        if not File.read(local_file).include?('include sites-enabled/*;')
-          message "Configuring NginX configuration file."
-          
-          ##
-          # Inject the 'include sites-enabled/*'
-          contents = File.read(local_file).sub(/http(\s|\t|\n){0,}\{/, "http {\n\s\s\s\sinclude sites-enabled/*;\n")
-          File.open(local_file, 'w') do |file|
-            file << contents
-          end
+        if not e.execute_as_root("cat '#{@nginx_conf}'").include?('GIT PUSSHUTEN GENERATED NGINX CONFIGURATION FILE')
           
           ##
           # Make a backup of the old nginx.conf
-          message "Creating a backup of old NginX configuration file."
-          e.execute_as_root("cp '#{@nginx_conf}' '#{@nginx_conf}.backup.#{Time.now.to_i}'")
+          Spinner.return :message => "Creating a backup of the current NginX configuration file.." do
+            e.execute_as_root("cp '#{@nginx_conf}' '#{@nginx_conf}.backup.#{Time.now.to_i}'")
+            g('Done!')
+          end
           
           ##
-          # Upload the file back
-          message "Updating NginX configuration file."
-          e.scp_as_root(:upload, local_file, @nginx_conf)
+          # Replace the old NginX configuration file with the pre-configured one
+          Spinner.return :message => "Generating pre-configured NginX configuration file.." do
+            e.download_packages!("$HOME", :root)
+            e.execute_as_root("cp $HOME/gitpusshuten-packages/modules/nginx/nginx.conf '#{@nginx_conf}'")
+            e.clean_up_packages!("$HOME", :root)
+            g('Done!')
+          end
           
           ##
           # Create the vhosts dir on the server
-          message "Creating #{@nginx_vhosts_dir} directory."
-          e.execute_as_root("mkdir -p #{@nginx_vhosts_dir}")
+          Spinner.return :message => "Creating #{@nginx_vhosts_dir} directory.." do
+            e.execute_as_root("mkdir -p #{@nginx_vhosts_dir}")
+            g('Done!')
+          end
+          
+          if e.installed?('passenger')
+            perform_update_configuration!
+          end
+          
         end
         
-        ##
-        # Removes the tmp dir
-        message "Cleaning up #{local.tmp_dir}"
-        local.remove_tmp_dir!
-        
         ##
         # Create NginX directory
         # Create NginX vhost file (if it doesn't already exist)
@@ -137,7 +127,7 @@ module GitPusshuTen
 
       ##
       # Downloads the NginX configuration file
-      def perform_download_config!
+      def perform_download_configuration!
         find_nginx!
         if not @nginx_conf
           error "Could not find the NginX configuration file in #{y(@nginx_conf)}"
@@ -152,15 +142,21 @@ module GitPusshuTen
         end
       end
 
+      ##
+      # Alias to perform_download_configuration!
+      def perform_download_config!
+        perform_download_configuration!
+      end
+
       ##
       # Uploads the NginX configuration file
-      def perform_upload_config!
+      def perform_upload_configuration!
         find_nginx!
         if not e.directory?('/etc/nginx')
           error "Could not find the NginX installation directory in #{y('/etc/nginx')}"
           exit
         end
-
+        
         local_configuration_file = File.join(local.gitpusshuten_dir, 'nginx', 'nginx.conf')        
         if not File.exist?(local_configuration_file)
           error "Could not find the local NginX configuration file in #{y(local_configuration_file)}"
@@ -173,6 +169,12 @@ module GitPusshuTen
         end
       end
 
+      ##
+      # Alias to perform_upload_configuration!
+      def perform_upload_config!
+        perform_upload_configuration!
+      end
+
       ##
       # Updates a local vhost
       def perform_upload_vhost!
@@ -283,7 +285,7 @@ module GitPusshuTen
 
         INFO
         
-        message "NginX will now be configured to work with the above versions. Is this correct?"
+        message "NginX will now be configured to work with the above versions. Is that OK?"
         exit unless yes?
         
         ##
@@ -329,6 +331,16 @@ module GitPusshuTen
           update.sub! /passenger_ruby \/usr\/local\/rvm\/wrappers\/(.+)\/ruby\;/,
                       "passenger_ruby /usr/local/rvm/wrappers/#{@ruby_version}/ruby;"
           
+          ##
+          # Uncomment any Phusion Passenger configuration if it is commented out
+          # since Phusion Passenger is enabled
+          update.sub!(/\#.+(passenger_ruby.+\;)/)           { $1 }
+          update.sub!(/\#.+(passenger_root.+\;)/)           { $1 }
+          update.sub!(/\#.+(passenger_spawn_method.+\;)/)   { $1 }
+          update.sub!(/\#.+(passenger_min_instances.+\;)/)  { $1 }
+          update.sub!(/\#.+(passenger_max_pool_size.+\;)/)  { $1 }
+          update.sub!(/\#.+(passenger_pool_idle_time.+\;)/) { $1 }
+          
           File.open(local_configuration_file, 'w') do |file|
             file << update
           end
@@ -356,7 +368,7 @@ module GitPusshuTen
         warning "then you should be able to just restart #{y('NginX')} right away since all application gems should still be in tact.\n\n"
         
         message "When ready, run the following command to restart #{y('NginX')} and have the applied updates take effect:"
-        standard "\n\s\s#{y("heavenly nginx restart for #{e.name}")}"
+        standard "\n\s\s#{y("heavenly nginx restart for #{e.name}")}\n\n"
       end
 
       def perform_download_vhost!
@@ -436,6 +448,13 @@ module GitPusshuTen
           @nginx_conf_dir = '/etc/nginx'
         end
         
+        ##
+        # Determines whether the configuration file was found or not
+        if @nginx_conf.nil?
+          error "Could not find the NginX configuration file. Has NginX been installed?"
+          exit
+        end
+        
         ##
         # Set additional configuration
         @nginx_conf_name  = @nginx_conf.split('/').last

data/lib/gitpusshuten/modules/redis/command.rb

@@ -6,6 +6,7 @@ module GitPusshuTen
       usage       "redis <command> for <enviroment>"
       example     "heavenly redis install                 # Installs Redis (system wide) and downloads config template."
       example     "heavenly redis upload-configuration    # Uploads the Redis configuration template to the server, will install Redis if not already present."
+      example     "               upload-config           # Alias."
 
       def initialize(*objects)
         super
@@ -65,7 +66,13 @@ module GitPusshuTen
           g('Done!')
         end
       end
-      
+
+      ##
+      # Alias to perform_upload_configuration!
+      def perform_upload_config!
+        perform_upload_configuration!
+      end
+
       def download_redis_configuration_from_server!
         FileUtils.mkdir_p(@local_configuration_dir)
         Spinner.return :message => "Downloading redis configuration from the server.." do

data/lib/gitpusshuten/version.rb

@@ -0,0 +1,3 @@
+module GitPusshuTen
+  VERSION = '0.0.3'
+end

data/lib/templates/config.rb

@@ -32,6 +32,7 @@ pusshuten 'My Application', :staging, :production do
     # m.add :nanoc
     # m.add :rvm
     # m.add :mysql
+    # m.add :redis
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2010-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,6 +167,7 @@ files:
 - lib/gitpusshuten/modules/passenger/hooks.rb
 - lib/gitpusshuten/modules/redis/command.rb
 - lib/gitpusshuten/modules/rvm/command.rb
+- lib/gitpusshuten/version.rb
 - lib/templates/config.rb
 - lib/templates/hooks.rb
 - spec/cli_spec.rb