webbynode 0.2.5.beta1 → 0.2.5.beta2

data/Manifest

@@ -23,6 +23,7 @@ lib/templates/help
 lib/webbynode.rb
 lib/webbynode/api_client.rb
 lib/webbynode/application.rb
+lib/webbynode/attribute_accessors.rb
 lib/webbynode/command.rb
 lib/webbynode/commands/add_backup.rb
 lib/webbynode/commands/add_key.rb
@@ -41,6 +42,13 @@ lib/webbynode/commands/stop.rb
 lib/webbynode/commands/tasks.rb
 lib/webbynode/commands/version.rb
 lib/webbynode/commands/webbies.rb
+lib/webbynode/engines/all.rb
+lib/webbynode/engines/django.rb
+lib/webbynode/engines/engine.rb
+lib/webbynode/engines/php.rb
+lib/webbynode/engines/rack.rb
+lib/webbynode/engines/rails.rb
+lib/webbynode/engines/rails3.rb
 lib/webbynode/gemfile.rb
 lib/webbynode/git.rb
 lib/webbynode/io.rb
@@ -74,6 +82,7 @@ spec/fixtures/git/config/config_5
 spec/fixtures/git/status/clean
 spec/fixtures/git/status/dirty
 spec/fixtures/pushand
+spec/fixtures/settings.py
 spec/spec_helper.rb
 spec/webbynode/api_client_spec.rb
 spec/webbynode/application_spec.rb
@@ -92,6 +101,12 @@ spec/webbynode/commands/remote_spec.rb
 spec/webbynode/commands/tasks_spec.rb
 spec/webbynode/commands/version_spec.rb
 spec/webbynode/commands/webbies_spec.rb
+spec/webbynode/engines/django_spec.rb
+spec/webbynode/engines/engine_spec.rb
+spec/webbynode/engines/php_spec.rb
+spec/webbynode/engines/rack_spec.rb
+spec/webbynode/engines/rails3_spec.rb
+spec/webbynode/engines/rails_spec.rb
 spec/webbynode/gemfile_spec.rb
 spec/webbynode/git_spec.rb
 spec/webbynode/io_spec.rb

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '0.2.5.beta1') do |p|  
+Echoe.new('webbynode', '0.2.5.beta2') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"

data/lib/webbynode/attribute_accessors.rb

@@ -0,0 +1,67 @@
+# Extends the class object with class and instance accessors for class attributes,
+# just like the native attr* accessors for instance attributes.
+#
+#  class Person
+#    cattr_accessor :hair_colors
+#  end
+#
+#  Person.hair_colors = [:brown, :black, :blonde, :red]
+class Class
+  def cattr_reader(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      next if sym.is_a?(Hash)
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+      EOS
+
+      unless options[:instance_reader] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
+    end
+  end
+
+  def cattr_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+      EOS
+
+      unless options[:instance_writer] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
+    end
+  end
+
+  def cattr_accessor(*syms)
+    cattr_reader(*syms)
+    cattr_writer(*syms)
+  end
+end
+
+class Array
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end
+end

data/lib/webbynode/commands/init.rb

@@ -13,12 +13,11 @@ module Webbynode::Commands
       end
 
       check_prerequisites
-      check_gemfile
-      
+
       webby       = param(:webby)
       app_name    = io.app_name
       git_present = git.present?
-      
+
       if option(:dns)
         dns_entry = "#{option(:dns)}" 
       else
@@ -32,19 +31,13 @@ module Webbynode::Commands
       
       io.log "Initializing application #{app_name} #{dns_entry ? "with dns #{dns_entry}" : ""}", :start
       
+      detect_engine
+      
       webby_ip = get_ip(webby)
       
       io.log ""
       io.log "Initializing directory structure..."
-      git.remove("config/database.yml") if git.tracks?("config/database.yml")
-      git.remove("db/schema.rb")        if git.tracks?("db/schema.rb")
       
-      if io.file_exists?(".gitignore")
-        git.add_to_git_ignore("config/database.yml", "db/schema.rb")
-      else
-        git.add_git_ignore 
-      end
-
       unless io.file_exists?(".pushand")
         io.create_file(".pushand", "#! /bin/bash\nphd $0 #{app_name} #{dns_entry}\n", true)
       end
@@ -58,8 +51,6 @@ module Webbynode::Commands
         io.create_file(".webbynode/config", "")
       end
 
-      detect_engine
-      
       unless git_present
         io.log "Initializing git and applying initial commit..."
         git.init 
@@ -104,15 +95,15 @@ module Webbynode::Commands
         if api_webbies.keys.size == 1
           webby = api_webbies[api_webbies.keys.first]
         else
-          io.log "", :simple
-          io.log "Current Webbies in your account:", :simple
-          io.log "", :simple
+          io.log ""
+          io.log "Current Webbies in your account:"
+          io.log ""
         
           choices = []
           api_webbies.keys.sort.each_with_index do |webby_key, i|
             webby = api_webbies[webby_key]
             choices << webby
-            io.log "  #{i+1}. #{webby[:name]} (#{webby[:ip]})", :simple
+            io.log "  #{i+1}. #{webby[:name]} (#{webby[:ip]})"
           end
         
           io.log "", :simple
@@ -121,12 +112,12 @@ module Webbynode::Commands
         end
         
         io.log "", :simple
-        io.log "Set deployment Webby to #{webby[:name]}.", :simple
+        io.log "Set deployment Webby to #{webby[:name]}."
         
         return webby[:ip]
       end
 
-      io.log "Retrieving IP for Webby #{webby}...", :action
+      io.log "Retrieving IP for Webby #{webby}..."
       webby_ip = api.ip_for(webby)
 
       unless webby_ip
@@ -142,18 +133,41 @@ module Webbynode::Commands
     end
     
     def detect_engine
-      unless engine = option(:engine)
-        if rails3?
-          io.log "Detected Rails 3 application...", :action
-          engine = "rails3" 
-        end
+      if option(:engine)
+        engine = Webbynode::Engines.find(option(:engine)) 
+        io.log "Engine '#{option(:engine)}' is invalid." unless engine
       end
       
-      io.add_setting "engine", engine if engine
+      engine ||= resolve_engine  
+      engine.new.prepare
+      
+      io.add_setting "engine", engine.engine_id
     end
     
-    def rails3?
-      io.file_exists?("script/rails")
+    def resolve_engine
+      engine = Webbynode::Engines.detect
+      engine ||= choose_engine
+    end
+    
+    def choose_engine
+      io.log ""
+      io.log "Supported engines:"
+      io.log ""
+      
+      engines = Webbynode::Engines::All
+      engines.each_with_index do |engine, i|
+        io.log "  #{i+1}. #{engine.engine_name.split('::').last}"
+      end
+      
+      io.log ""
+
+      choice = ask("Select the engine your app uses:", Integer) { |q| q.in = 1..(engines.size+1) }
+      engine = engines[choice-1]
+      
+      io.log ""
+      io.log "Initializing with #{engine.engine_name} engine..."
+      
+      engine
     end
     
     def check_prerequisites
@@ -163,49 +177,6 @@ Error: git not found on current path.
 
 In order to use Webbynode Gem for deployment, you must have git installed.
 For more information about installing git: http://book.git-scm.com/2_installing_git.html
-EOS
-      end
-    end
-    
-    def check_gemfile
-      return unless gemfile.present?
-      
-      dependencies = gemfile.dependencies(:without => [:development, :test])
-      if dependencies.include? 'sqlite3-ruby'
-        raise CommandError, <<-EOS
-
-Gemfile dependency problem.
-
-The following gem dependency was found in your Gemfile:
-
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-  
-This dependency will cause an error in production when using Passenger. We recommend you remove it.
-Also, be sure to define the database driver gem for the database type you are using in production (either the mysql or the pg gem).
-
-  gem 'mysql'
-  
-  -or-
-  
-  gem 'pg'
-  
-If you would like to use SQLite3 in your development and test environments,
-you may do so by wrapping the gem definition inside the :test and :development groups.
-
-  group :test do
-    gem 'sqlite3-ruby', :require => 'sqlite3'
-  end
-  
-  -or-
-  
-  group :development do
-    gem 'sqlite3-ruby', :require => 'sqlite3'
-  end
-  
-To learn more about this issue, visit:
-
-  http://guides.webbynode.com/articles/rapidapps/rails3warning.html
-  
 EOS
       end
     end

data/lib/webbynode/engines/all.rb

@@ -0,0 +1,16 @@
+module Webbynode::Engines
+  All = [
+    Webbynode::Engines::Django,
+    Webbynode::Engines::Php,
+    Webbynode::Engines::Rack,
+    Webbynode::Engines::Rails,
+    Webbynode::Engines::Rails3,
+  ]
+
+  Detectable = [
+    # order matters!
+    Webbynode::Engines::Rails3,
+    Webbynode::Engines::Rails,
+    Webbynode::Engines::Rack
+  ]
+end

data/lib/webbynode/engines/django.rb

@@ -0,0 +1,35 @@
+module Webbynode::Engines
+  class Django
+    include Engine
+    set_name "Django"
+    git_excludes 'settings.py', '*.pyc', '*.pyo', 'docs/_build'
+    
+    def prepare
+      unless io.file_exists?('settings.template.py')
+        io.log 'Creating settings.template.py from your settings.py...'
+        io.copy_file 'settings.py', 'settings.template.py'
+
+        change_templates
+
+        change_settings({
+          'ENGINE' => '@app_engine@', 
+          'NAME' => '@app_name@',                      
+          'USER' => '@app_name@',                      
+          'PASSWORD' => '@app_pwd@',                  
+          'HOST' => '@db_host@',                      
+          'PORT' => '@db_port@',
+        })
+      end
+    end
+    
+    def change_settings(settings)
+      settings.each_pair do |k,v|
+        io.sed 'settings.template.py', /'#{k}': '[^ ,]*'/, "'#{k}': '#{v}'"
+      end
+    end
+    
+    def change_templates
+      io.sed 'settings.template.py', /TEMPLATE_DIRS = \(/, "TEMPLATE_DIRS = (\n    '@app_dir@/templates'"
+    end
+  end
+end

data/lib/webbynode/engines/engine.rb

@@ -0,0 +1,67 @@
+module Webbynode::Engines
+  def self.detect
+    Detectable.each do |engine_class|
+      engine = engine_class.new
+      return engine_class if engine.detected?
+    end
+    return nil
+  end
+  
+  def self.find(engine_id)
+    All.find { |e| e.engine_id == engine_id }
+  end
+
+  module Engine
+    def self.included(base)
+      base.cattr_accessor :git_excluded
+      base.git_excluded = []
+      
+      base.send(:attr_accessor, :engine_name)
+      base.send(:extend, ClassMethods)
+      base.send(:include, InstanceMethods)
+    end
+    
+    module ClassMethods
+      def set_name(name)
+        @engine_name = name
+      end
+      
+      def git_excludes(*entries)
+        self.git_excluded = entries
+      end
+      
+      def engine_name
+        @engine_name || self.name.split('::').last
+      end
+      
+      def engine_id
+        self.name.split('::').last.downcase 
+      end
+    end
+    
+    module InstanceMethods
+      def prepare
+        self.class.git_excluded.each do |exc|
+          git.remove(exc) if git.tracks?(exc)
+          git.add_to_git_ignore exc
+        end
+      end
+      
+      def gemfile
+        @gemfile ||= Webbynode::Gemfile.new
+      end
+      
+      def git
+        @git ||= Webbynode::Git.new
+      end
+      
+      def io
+        @io ||= Webbynode::Io.new
+      end
+      
+      def valid?
+        true
+      end
+    end
+  end
+end

data/lib/webbynode/engines/php.rb

@@ -0,0 +1,6 @@
+module Webbynode::Engines
+  class Php
+    include Engine
+    set_name "PHP"
+  end
+end

data/lib/webbynode/engines/rack.rb

@@ -0,0 +1,10 @@
+module Webbynode::Engines
+  class Rack
+    include Engine
+    set_name "Rack"
+
+    def detected?
+      io.file_exists?('config.ru')
+    end
+  end
+end

data/lib/webbynode/engines/rails.rb

@@ -0,0 +1,12 @@
+module Webbynode::Engines
+  class Rails
+    include Engine
+    set_name "Rails 2"
+    git_excludes "config/database.yml", "db/schema.rb"
+
+    def detected?
+      io.directory?('app') && io.directory?('app/controllers') &&
+      io.file_exists?('config/environment.rb')
+    end
+  end
+end

data/lib/webbynode/engines/rails3.rb

@@ -0,0 +1,61 @@
+module Webbynode::Engines
+  class Rails3
+    include Engine
+    set_name "Rails 3"
+    git_excludes "config/database.yml", "db/schema.rb"
+
+    def detected?
+      io.file_exists?('script/rails')
+    end
+    
+    def prepare
+      check_gemfile
+    end
+    
+    private
+    
+    def check_gemfile
+      return unless gemfile.present?
+
+      dependencies = gemfile.dependencies(:without => [:development, :test])
+      if dependencies.include? 'sqlite3-ruby'
+        raise Webbynode::Command::CommandError, <<-EOS
+
+Gemfile dependency problem.
+
+The following gem dependency was found in your Gemfile:
+
+  gem 'sqlite3-ruby', :require => 'sqlite3'
+
+This dependency will cause an error in production when using Passenger. We recommend you remove it.
+Also, be sure to define the database driver gem for the database type you are using in production (either the mysql or the pg gem).
+
+  gem 'mysql'
+
+  -or-
+
+  gem 'pg'
+
+If you would like to use SQLite3 in your development and test environments,
+you may do so by wrapping the gem definition inside the :test and :development groups.
+
+  group :test do
+    gem 'sqlite3-ruby', :require => 'sqlite3'
+  end
+
+  -or-
+
+  group :development do
+    gem 'sqlite3-ruby', :require => 'sqlite3'
+  end
+
+To learn more about this issue, visit:
+
+  http://guides.webbynode.com/articles/rapidapps/rails3warning.html
+
+EOS
+      end
+    end
+
+  end
+end

data/lib/webbynode/io.rb

@@ -37,11 +37,17 @@ module Webbynode
       entries.any? &blk
     end
     
+    def sed(file, from, to)
+      contents = File.read(file).gsub(from, to)
+      File.open(file, 'w') { |f| f.write(contents) }
+    end
+    
     def app_name
       Dir.pwd.split("/").last.gsub(/[\.| ]/, "_")
     end
     
     def mkdir(path)
+      # TODO: raise "Tried to create real folder: #{path}" if $testing
       FileUtils.mkdir_p(path)
     end
     
@@ -70,6 +76,10 @@ module Webbynode
       File.open(f, a, &blk)
     end
     
+    def copy_file(from, to)
+      FileUtils.cp(from, to)
+    end
+    
     def log(text, notify=false)
       notify = :simple unless notify
 
@@ -157,7 +167,7 @@ module Webbynode
     end
     
     def add_line(file, line)
-      return if File.read(file) =~ /^#{line}$/
+      return if File.read(file).include?("#{line}")
       File.open(file, 'a') { |f| f.puts line }
     end
     
@@ -181,6 +191,7 @@ module Webbynode
     end
     
     def with_setting(&blk)
+      mkdir('.webbynode') unless directory?('.webbynode')
       with_settings_for ".webbynode/settings", &blk
     end
     

data/lib/webbynode.rb

@@ -21,6 +21,14 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'remote_executor')
 require File.join(File.dirname(__FILE__), 'webbynode', 'notify')
 require File.join(File.dirname(__FILE__), 'webbynode', 'updater')
 require File.join(File.dirname(__FILE__), 'webbynode', 'properties')
+require File.join(File.dirname(__FILE__), 'webbynode', 'attribute_accessors')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'engine')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'rails')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'rails3')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'rack')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'django')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'php')
+require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'all')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'apps')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'init')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'push')
@@ -38,11 +46,10 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'alias')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'help')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'webbies')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'version')
-
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '0.2.5.beta1'
+  VERSION = '0.2.5.beta2'
 end
 
 class Array

data/spec/fixtures/settings.py

@@ -0,0 +1,94 @@
+# Django settings for dude project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'dude',                      # Or path to database file if using sqlite3.
+        'USER': 'root',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    }
+}
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = ''
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '4tg&yi98l603gs--iuombqt(^+c&q&zsqe$y%%hqd3u6#uu0@o'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+)
+
+ROOT_URLCONF = 'dude.urls'
+
+TEMPLATE_DIRS = (
+  '/tmp/dude/templates'
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.admin',
+    'dude.polls',
+    # Uncomment the next line to enable the admin:
+    # 'django.contrib.admin',
+)