sunshine 1.1.2 → 1.1.3.pre

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.1.3 / 2010-09-07
+
+* Improvements:
+
+  * Added support for custom env/start/stop/restart scripts.
+
+  * Deploy env defaults to ENV 'DEPLOY_ENV', 'env', 'RACK_ENV', or 'RAILS_ENV'.
+
+* Bugfixes:
+
+  * Added better extensible package manager checking to ServerApp.
+
 === 1.1.2 / 2010-04-15
 
 * Improvements:

data/Manifest.txt

@@ -46,7 +46,6 @@ lib/sunshine/repos/svn_repo.rb
 lib/sunshine/server_app.rb
 lib/sunshine/shell.rb
 templates/apache/apache.conf.erb
-templates/logrotate/logrotate.conf.erb
 templates/mongrel_rails/mongrel_rails.conf.erb
 templates/nginx/nginx.conf.erb
 templates/nginx/nginx_optimize.conf
@@ -78,4 +77,4 @@ test/unit/test_server_cluster.rb
 test/unit/test_shell.rb
 test/unit/test_sunshine.rb
 test/unit/test_svn_repo.rb
-test/unit/test_unicorn.rb
+test/unit/test_unicorn.rb

data/lib/sunshine.rb

@@ -19,7 +19,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.1.2'
+  VERSION = '1.1.3.pre'
 
   ##
   # Path to the list of installed sunshine apps.
@@ -38,7 +38,12 @@ module Sunshine
   DEFAULT_CONFIG = {
     'auto'                => false,
     'auto_dependencies'   => true,
-    'deploy_env'          => :development,
+    'deploy_env'          =>
+      ( ENV['DEPLOY_ENV'] ||
+        ENV['env']        ||
+        ENV['RACK_ENV']   ||
+        ENV['RAILS_ENV']  ||
+        :development ),
     'level'               => 'info',
     'max_deploy_versions' => 5,
     'remote_checkouts'    => false,

data/lib/sunshine/app.rb

@@ -19,15 +19,13 @@ module Sunshine
   #
   #   app.deploy do |app|
   #
-  #     app_server = Sunshine::Rainbows.new(app)
-  #     app_server.restart
-  #
-  #     Sunshine::Nginx.new(app, :point_to => app_server).setup
+  #     app_server = Sunshine::Rainbows.new app, :port => 3000
+  #     web_server = Sunshine::Nginx.new app, :point_to => app_server
   #
+  #     app_server.setup
+  #     web_server.setup
   #   end
   #
-  #   app.start :force => true
-  #
   # Multiple apps can be defined, and deployed from a single deploy script.
   # The constructor also supports passing a yaml file path:
   #
@@ -148,9 +146,9 @@ module Sunshine
     end
 
 
-    attr_reader :name, :repo, :server_apps, :sudo
+    attr_reader :name, :repo, :server_apps, :sudo, :deploy_name, :deploy_env
     attr_reader :root_path, :checkout_path, :current_path, :deploys_path
-    attr_reader :shared_path, :log_path, :deploy_name, :deploy_env
+    attr_reader :shared_path, :log_path, :scripts_path
     attr_accessor :remote_checkout
 
     ##
@@ -953,6 +951,7 @@ module Sunshine
       @shared_path   = "#{@root_path}/shared"
       @log_path      = "#{@shared_path}/log"
       @checkout_path = "#{@deploys_path}/#{@deploy_name}"
+      @scripts_path  = "#{@checkout_path}/scripts"
     end
 
 

data/lib/sunshine/dependencies.rb

@@ -35,10 +35,16 @@ Sunshine.dependencies do
   ##
   # Define phusion passenger dependencies
 
+  apt 'openssl-devel', :pkg => 'libssl-dev'
+  yum 'openssl-devel'
+
+  apt 'zlib-devel', :pkg => 'zlib-dev'
+  yum 'zlib-devel'
+
   gem 'passenger', :version => ">=2.2.11"
 
   dependency 'passenger-nginx' do
-    requires 'passenger'
+    requires 'passenger', 'openssl-devel', 'zlib-devel'
 
     install do |shell, sudo|
 

data/lib/sunshine/package_managers/apt.rb

@@ -28,6 +28,14 @@ module Sunshine
     end
 
 
+    ##
+    # Checks if dependency type is valid for a given shell.
+
+    def self.valid? shell=nil
+      shell ||= Sunshine.shell
+      shell.call("apt-get --version") && true rescue false
+    end
+
     private
 
     def build_pkg_name pkg_name, options={}

data/lib/sunshine/package_managers/dependency.rb

@@ -66,6 +66,15 @@ module Sunshine
     end
 
 
+    ##
+    # Checks if dependency type is valid for a given shell.
+    # Defaults to false. Override in subclass.
+
+    def self.valid? shell=nil
+      false
+    end
+
+
     attr_reader :name, :pkg, :parents, :children
 
     def initialize name, options={}, &block

data/lib/sunshine/package_managers/yum.rb

@@ -30,6 +30,15 @@ module Sunshine
     end
 
 
+    ##
+    # Checks if dependency type is valid for a given shell.
+
+    def self.valid? shell=nil
+      shell ||= Sunshine.shell
+      shell.call("yum --version") && true rescue false
+    end
+
+
     private
 
     def build_pkg_name pkg_name, options={}

data/lib/sunshine/repo.rb

@@ -56,8 +56,6 @@ module Sunshine
 
     def self.detect path=".", shell=nil
       @@repo_types.values.each do |repo|
-        next if Sunshine::RsyncRepo === repo
-
         if repo.valid? path
           info = repo.get_info path, shell
           return repo.new(info[:url], info)
@@ -77,6 +75,16 @@ module Sunshine
     end
 
 
+    ##
+    # Checks if current working directory is a valid repo.
+    # Defaults to false. Subclasses must override this method to enable
+    # auto detecting of a given scm implementation.
+
+    def self.valid?
+      false
+    end
+
+
     attr_reader :url, :scm
 
     def initialize url, options={}

data/lib/sunshine/server_app.rb

@@ -76,7 +76,7 @@ module Sunshine
 
     app_attr :name, :deploy_name
     app_attr :root_path, :checkout_path, :current_path
-    app_attr :deploys_path, :log_path, :shared_path
+    app_attr :deploys_path, :log_path, :shared_path, :scripts_path
 
     attr_accessor :app, :roles, :scripts, :info, :shell, :crontab, :health
     attr_writer :pkg_manager
@@ -161,11 +161,12 @@ module Sunshine
 
     def build_deploy_info_file
 
-      deploy_info = get_deploy_info.to_yaml
+      deploy_info   = get_deploy_info.to_yaml
+      info_filepath = "#{self.scripts_path}/info"
 
-      @shell.make_file "#{self.checkout_path}/info", deploy_info
+      @shell.make_file info_filepath, deploy_info
 
-      @shell.symlink "#{self.current_path}/info", "#{self.root_path}/info"
+      @shell.symlink info_filepath, "#{self.root_path}/info"
     end
 
 
@@ -215,7 +216,8 @@ module Sunshine
     # Does not include symlinked directories.
 
     def directories
-      [root_path, deploys_path, shared_path, log_path, checkout_path]
+      [root_path, deploys_path, shared_path,
+      log_path, checkout_path, scripts_path]
     end
 
 
@@ -335,7 +337,9 @@ fi
 
     def pkg_manager
       @pkg_manager ||=
-        (@shell.call("yum --version") && Yum) rescue Apt
+        DependencyLib.dependency_types.detect do |dt|
+          dt.valid? @shell
+        end
     end
 
 
@@ -552,16 +556,16 @@ fi
 
 
     ##
-    # Write an executable bash script to the app's checkout dir
-    # on the deploy server, and symlink them to the current dir.
+    # Write an executable bash script to the app's scripts dir
+    # on the deploy server, and symlink them to the root dir.
 
     def write_script name, contents
+      script_file = "#{self.scripts_path}/#{name}"
 
-      @shell.make_file "#{self.checkout_path}/#{name}", contents,
-          :flags => '--chmod=ugo=rwx'
+      @shell.make_file script_file, contents,
+        :flags => '--chmod=ugo=rwx' unless @shell.file? script_file
 
-      @shell.symlink "#{self.current_path}/#{name}",
-        "#{self.root_path}/#{name}"
+      @shell.symlink script_file, "#{self.root_path}/#{name}"
     end
 
 
@@ -583,6 +587,7 @@ fi
       @shared_path   = "#{@root_path}/shared"
       @log_path      = "#{@shared_path}/log"
       @checkout_path = "#{@deploys_path}/#{@deploy_name}"
+      @scripts_path  = "#{@checkout_path}/scripts"
     end
   end
 end

data/test/helper_methods.rb

@@ -61,8 +61,7 @@ module HelperMethods
   end
 
 
-  def assert_dep_install dep_name, type=Sunshine::Yum
-    prefered = type rescue nil
+  def assert_dep_install dep_name, prefered=nil
     args = [{:call => @remote_shell, :prefer => prefered}]
 
     dep = if Sunshine::Dependency === dep_name

data/test/unit/test_app.rb

@@ -26,7 +26,7 @@ class TestApp < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_f @tmpdir
+    FileUtils.rm_rf @tmpdir
   end
 
 
@@ -194,16 +194,22 @@ class TestApp < Test::Unit::TestCase
 
 
   def test_build_control_scripts
-    @app.add_to_script :start, "start script"
-    @app.add_to_script :stop, "stop script"
+    scripts_list = %w{start stop restart custom env}
+
+    @app.server_apps.each do |sa|
+      sa.shell.mock :file?, :return => false
+    end
+
+    @app.add_to_script :start,  "start script"
+    @app.add_to_script :stop,   "stop script"
     @app.add_to_script :custom, "custom script"
 
     @app.build_control_scripts
 
     each_remote_shell do |ds|
 
-      %w{start stop restart custom env}.each do |script|
-        assert_rsync(/#{script}/, "#{ds.host}:#{@app.checkout_path}/#{script}")
+      scripts_list.each do |script|
+        assert_rsync(/#{script}/, "#{ds.host}:#{@app.scripts_path}/#{script}")
       end
     end
   end
@@ -213,7 +219,7 @@ class TestApp < Test::Unit::TestCase
     @app.build_deploy_info_file
 
     each_remote_shell do |ds|
-      assert_rsync(/info/, "#{ds.host}:#{@app.checkout_path}/info")
+      assert_rsync(/info/, "#{ds.host}:#{@app.scripts_path}/info")
     end
   end
 
@@ -305,6 +311,8 @@ class TestApp < Test::Unit::TestCase
     check_ruby = "test \"$(yum list installed #{ruby_dep.pkg} | "+
       "grep -c #{ruby_dep.pkg})\" -ge 1"
 
+    set_mock_response_for @app, 1, "apt-get --version" => [:err, ""]
+    set_mock_response_for @app, 0, "yum --version" => [:out, "1.0"]
 
     set_mock_response_for @app, 1,
       {check_nginx => [:err, ""],

data/test/unit/test_server_app.rb

@@ -89,13 +89,15 @@ class TestServerApp < Test::Unit::TestCase
 
 
   def test_build_deploy_info_file
-    args = ["#{@app.checkout_path}/info", @sa.get_deploy_info.to_yaml]
+    @sa.shell.mock :file?, :return => false
+
+    args = ["#{@app.scripts_path}/info", @sa.get_deploy_info.to_yaml]
 
     @sa.build_deploy_info_file
 
     assert @sa.shell.method_called?(:make_file, :args => args)
 
-    args = ["#{@app.current_path}/info", "#{@app.root_path}/info"]
+    args = ["#{@app.scripts_path}/info", "#{@app.root_path}/info"]
 
     assert @sa.shell.method_called?(:symlink, :args => args)
   end
@@ -191,8 +193,8 @@ class TestServerApp < Test::Unit::TestCase
 
     @sa.install_deps "ruby", nginx_dep
 
-    assert_dep_install 'ruby'
-    assert_dep_install 'nginx'
+    assert_dep_install 'ruby',  Sunshine::Yum
+    assert_dep_install 'nginx', Sunshine::Yum
   end
 
 
@@ -233,7 +235,7 @@ class TestServerApp < Test::Unit::TestCase
   def test_rake
     @sa.rake "db:migrate"
 
-    assert_dep_install 'rake'
+    assert_dep_install 'rake', @sa.pkg_manager
     assert_server_call "cd #{@app.checkout_path} && rake db:migrate"
   end
 
@@ -315,7 +317,7 @@ class TestServerApp < Test::Unit::TestCase
   def test_run_bundler
     @sa.run_bundler
 
-    assert_dep_install 'bundler'
+    assert_dep_install 'bundler', @sa.pkg_manager
     assert_server_call "cd #{@app.checkout_path} && gem bundle"
   end
 
@@ -323,7 +325,7 @@ class TestServerApp < Test::Unit::TestCase
   def test_run_geminstaller
     @sa.run_geminstaller
 
-    assert_dep_install 'geminstaller'
+    assert_dep_install 'geminstaller', @sa.pkg_manager
     assert_server_call "cd #{@app.checkout_path} && geminstaller -e"
   end
 
@@ -333,7 +335,7 @@ class TestServerApp < Test::Unit::TestCase
 
     @sa.sass(*sass_files)
 
-    assert_dep_install 'haml'
+    assert_dep_install 'haml', @sa.pkg_manager
 
     sass_files.each do |file|
       sass_file = "public/stylesheets/sass/#{file}.sass"
@@ -425,14 +427,33 @@ class TestServerApp < Test::Unit::TestCase
 
 
   def test_write_script
+    @sa.shell.mock :file?, :return => false
+
     @sa.write_script "script_name", "script contents"
 
-    args = ["#{@app.checkout_path}/script_name",
+    args = ["#{@app.scripts_path}/script_name",
             "script contents", {:flags => "--chmod=ugo=rwx"}]
 
     assert @sa.shell.method_called?(:make_file, :args => args)
 
-    args = ["#{@app.current_path}/script_name",
+    args = ["#{@app.scripts_path}/script_name",
+            "#{@app.root_path}/script_name"]
+
+    assert @sa.shell.method_called?(:symlink, :args => args)
+  end
+
+
+  def test_write_script_existing
+    @sa.shell.mock :file?, :return => true
+
+    @sa.write_script "script_name", "script contents"
+
+    args = ["#{@app.scripts_path}/script_name",
+            "script contents", {:flags => "--chmod=ugo=rwx"}]
+
+    assert !@sa.shell.method_called?(:make_file, :args => args)
+
+    args = ["#{@app.scripts_path}/script_name",
             "#{@app.root_path}/script_name"]
 
     assert @sa.shell.method_called?(:symlink, :args => args)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunshine
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  - pre
+  version: 1.1.3.pre
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +152,6 @@ files:
 - lib/sunshine/server_app.rb
 - lib/sunshine/shell.rb
 - templates/apache/apache.conf.erb
-- templates/logrotate/logrotate.conf.erb
 - templates/mongrel_rails/mongrel_rails.conf.erb
 - templates/nginx/nginx.conf.erb
 - templates/nginx/nginx_optimize.conf
@@ -203,11 +203,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sunshine

data/templates/logrotate/logrotate.conf.erb

@@ -1,11 +0,0 @@
-<%= log_path %>/* {
-missingok
-rotate 168
-compress
-delaycompress
-olddir <%= log_path %>/rotate
-create 0666 <%= server_app.shell.user %>
-lastaction
-  logpush <%= log_path %>/rotate/*
-endscript
-}