sunshine 1.2.2 → 1.2.3

data/test/unit/test_app.rb

@@ -558,49 +558,6 @@ class TestApp < Test::Unit::TestCase
   end
 
 
-  def test_upload_tasks
-    path = "/path/to/tasks"
-
-    @app.upload_tasks 'common', 'tpkg',
-      :host => 'some_server.com',
-      :remote_path => path
-
-    shell = @app.find(:host => 'some_server.com').first.shell
-
-    use_remote_shell shell
-
-    assert_ssh_call "mkdir -p /path/to/tasks"
-
-    %w{common tpkg}.each do |task|
-      from = "#{Sunshine::ROOT}/templates/tasks/#{task}.rake"
-      to   = "#{shell.host}:#{path}/#{task}.rake"
-
-      assert_rsync from, to
-    end
-  end
-
-
-  def test_upload_tasks_simple
-    @app.upload_tasks
-
-    path  = "#{@app.checkout_path}/lib/tasks"
-
-    tasks =
-      Dir.glob("#{Sunshine::ROOT}/templates/tasks/*").map{|t| File.basename t}
-
-    each_remote_shell do |ds|
-      assert_ssh_call "mkdir -p #{path}"
-
-      tasks.each do |task|
-        from = "#{Sunshine::ROOT}/templates/tasks/#{task}"
-        to   = "#{ds.host}:#{path}/#{task}"
-
-        assert_rsync from, to
-      end
-    end
-  end
-
-
   def test_with_filter
     app = Sunshine::App.new :repo => {:type => "svn", :url => @svn_url},
             :remote_shells => ["user@server1.com", "user@server2.com"]

data/test/unit/test_nginx.rb

@@ -45,7 +45,7 @@ class TestNginx < Test::Unit::TestCase
 
   def test_sudo_cmd
     ds = @passenger.app.server_apps.first.shell
-    ds.set_mock_response 0, "gem list passenger -d" => [:out, @gemout]
+    ds.set_mock_response 0, "gem list passenger -d" => [:out, ""]
 
     @passenger.start
     @passenger.stop

data/test/unit/test_server_app.rb

@@ -174,24 +174,23 @@ class TestServerApp < Test::Unit::TestCase
 
 
   def test_get_deploy_info
+    @sa.shell.mock :call, :args => "whoami", :return => "user"
+    @sa.shell.mock :call, :args => "date", :return => "now"
+
     test_info = {
-      :deployed_at => Time.now.to_s,
-      :deployed_as => @sa.shell.call("whoami"),
+      :deployed_at => "now",
+      :deployed_as => "user",
       :deployed_by => Sunshine.shell.user,
       :deploy_name => File.basename(@app.checkout_path),
       :name        => @sa.name,
       :env         => @sa.shell_env,
       :roles       => @sa.roles,
       :path        => @app.root_path,
+      :ports       => Hash.new,
       :sunshine_version => Sunshine::VERSION
-    }.merge @sa.info
-
-    deploy_info = @sa.get_deploy_info
+    }
 
-    deploy_info.each do |key, val|
-      next if key == :deployed_at
-      assert_equal test_info[key], val
-    end
+    assert_equal test_info, @sa.get_deploy_info
   end
 
 
@@ -270,7 +269,7 @@ class TestServerApp < Test::Unit::TestCase
 
     @sa.register_as_deployed
 
-    args = [@app.root_path, {'servers' => [@sa.shell]}]
+    args = ["#{@app.name}:#{@app.root_path}", {'servers' => [@sa.shell]}]
     assert Sunshine::AddCommand.method_called?(:exec, :args => args)
   end
 
@@ -364,7 +363,7 @@ class TestServerApp < Test::Unit::TestCase
 
   def test_not_running?
     set_mock_response_for @sa, 13,
-      "#{@sa.root_path}/status" => [:err, "THE SYSTEM IS DOWN!"]
+      "#{@sa.scripts_path}/status" => [:err, "THE SYSTEM IS DOWN!"]
 
     assert_equal false, @sa.running?
   end
@@ -372,7 +371,7 @@ class TestServerApp < Test::Unit::TestCase
 
   def test_errored_running?
     set_mock_response_for @sa, 1,
-      "#{@sa.root_path}/status" => [:err, "KABLAM!"]
+      "#{@sa.scripts_path}/status" => [:err, "KABLAM!"]
 
     assert_raises Sunshine::CmdError do
       @sa.running?
@@ -409,73 +408,6 @@ class TestServerApp < Test::Unit::TestCase
   end
 
 
-  def test_upload_tasks
-    files = %w{task1 task2}
-
-    @sa.upload_tasks(*files)
-
-    assert_server_call "mkdir -p #{@app.checkout_path}/lib/tasks"
-
-    files.each do |f|
-      args = ["#{Sunshine::ROOT}/templates/tasks/#{f}.rake",
-              "#{@app.checkout_path}/lib/tasks/#{f}.rake"]
-
-      assert @sa.shell.method_called?(:upload, :args => args)
-    end
-  end
-
-
-  def test_upload_tasks_with_remote_path
-    files = %w{task1 task2}
-    path  = "/path/to/remote/tasks"
-
-    @sa.upload_tasks files[0], files[1], :remote_path => path
-
-    assert_server_call "mkdir -p #{path}"
-
-    files.each do |f|
-      args = ["#{Sunshine::ROOT}/templates/tasks/#{f}.rake",
-              "#{path}/#{f}.rake"]
-
-      assert @sa.shell.method_called?(:upload, :args => args)
-    end
-  end
-
-
-  def test_upload_tasks_with_local_path
-    files = %w{task1 task2}
-    path  = "/path/to/local/tasks"
-    args  = files.dup << {:local_path => path}
-
-    @sa.upload_tasks(*args)
-
-    assert_server_call "mkdir -p #{@sa.checkout_path}/lib/tasks"
-
-    files.each do |f|
-      args = ["#{path}/#{f}.rake",
-              "#{@sa.checkout_path}/lib/tasks/#{f}.rake"]
-
-      assert @sa.shell.method_called?(:upload, :args => args)
-    end
-  end
-
-
-  def test_upload_tasks_all
-    files = Dir.glob("templates/tasks/*").map{|f| File.basename(f, ".rake")}
-
-    @sa.upload_tasks
-
-    assert_server_call "mkdir -p #{@app.checkout_path}/lib/tasks"
-
-    files.each do |f|
-      args = ["#{Sunshine::ROOT}/templates/tasks/#{f}.rake",
-              "#{@app.checkout_path}/lib/tasks/#{f}.rake"]
-
-      assert @sa.shell.method_called?(:upload, :args => args)
-    end
-  end
-
-
   def test_upload_codebase
     @sa.shell.mock(:upload)
 
@@ -533,16 +465,14 @@ class TestServerApp < Test::Unit::TestCase
 
 
   def test_symlink_scripts_to_root
-    @sa.shell.mock :call,
-      :args   => ["ls -1 #{@sa.scripts_path}"],
-      :return => "script_name\n"
-
-    args = ["#{@app.scripts_path}/script_name",
-            "#{@app.root_path}/script_name"]
-
     @sa.symlink_scripts_to_root
 
-    assert @sa.shell.method_called?(:symlink, :args => args)
+    @sa.scripts.each do |name, val|
+    args = ["#{@app.scripts_path}/#{name}",
+            "#{@app.root_path}/#{name}"]
+
+      assert @sa.shell.method_called?(:symlink, :args => args)
+    end
   end
 
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunshine
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2011-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,8 +24,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -38,8 +40,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -53,8 +56,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -68,8 +72,9 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -78,35 +83,21 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 2
+        - 8
         - 0
-        - 4
-        version: 2.0.4
+        version: 2.8.0
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id006
 description: |-
   Sunshine is a framework for rack and rails application deployment.
   
@@ -158,7 +149,6 @@ files:
 - lib/sunshine/dependencies.rb
 - lib/sunshine/dependency_lib.rb
 - lib/sunshine/exceptions.rb
-- lib/sunshine/healthcheck.rb
 - lib/sunshine/output.rb
 - lib/sunshine/package_managers/apt.rb
 - lib/sunshine/package_managers/dependency.rb
@@ -178,7 +168,6 @@ files:
 - templates/nginx/nginx_optimize.conf
 - templates/nginx/nginx_proxy.conf
 - templates/rainbows/rainbows.conf.erb
-- templates/sunshine/middleware/health.rb
 - templates/sunshine/sunshine.rake
 - templates/thin/thin.conf.erb
 - templates/unicorn/unicorn.conf.erb
@@ -193,7 +182,6 @@ files:
 - test/unit/test_crontab.rb
 - test/unit/test_daemon.rb
 - test/unit/test_git_repo.rb
-- test/unit/test_healthcheck.rb
 - test/unit/test_nginx.rb
 - test/unit/test_rainbows.rb
 - test/unit/test_remote_shell.rb
@@ -220,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3148348221185696029
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -229,13 +217,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sunshine
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Sunshine is a framework for rack and rails application deployment
@@ -246,7 +235,6 @@ test_files:
 - test/unit/test_crontab.rb
 - test/unit/test_daemon.rb
 - test/unit/test_git_repo.rb
-- test/unit/test_healthcheck.rb
 - test/unit/test_nginx.rb
 - test/unit/test_rainbows.rb
 - test/unit/test_remote_shell.rb

data/lib/sunshine/healthcheck.rb

@@ -1,98 +0,0 @@
-module Sunshine
-
-  ##
-  # Healthcheck objects handle enabling and disabling health checking for
-  # load balancers by touching health.enabled and health.disabled files on
-  # an app's shell.
-  #
-  # If you would like to use Sunshine's healthcheck rack middleware, use
-  # the following command:
-  #   sunshine --middleware your_middleware_dir
-  #
-  # Then simply specify the following in your config.ru:
-  #   require 'your_middleware_dir/health'
-  #   use Sunshine::Health
-  #
-  # Sunshine::Health supports the following options:
-  # :uri_path::    The path that healthcheck will be used on.
-  # :health_file:: The file to check for health.
-  #
-  #   use Sunshine::Health, :uri_path    => "/health.txt",
-  #                         :health_file => "health.txt"
-
-  class Healthcheck
-
-    ENABLED_FILE  = "health.enabled"
-    DISABLED_FILE = "health.disabled"
-
-    attr_accessor :shell, :enabled_file, :disabled_file
-
-    def initialize path, shell
-      @shell = shell
-      @enabled_file  = File.join path, ENABLED_FILE
-      @disabled_file = File.join path, DISABLED_FILE
-    end
-
-
-    ##
-    # Disables healthcheck - status: :disabled
-
-    def disable
-      @shell.call "touch #{@disabled_file} && rm -f #{@enabled_file}"
-    end
-
-
-    ##
-    # Check if healthcheck is disabled.
-
-    def disabled?
-      @shell.file? @disabled_file
-    end
-
-
-    ##
-    # Check if healthcheck is down.
-
-    def down?
-      !@shell.file?(@disabled_file) && !@shell.file?(@enabled_file)
-    end
-
-
-    ##
-    # Enables healthcheck which should set status to :ok
-
-    def enable
-      @shell.call "rm -f #{@disabled_file} && touch #{@enabled_file}"
-    end
-
-
-    ##
-    # Check if healthcheck is enabled.
-
-    def enabled?
-      @shell.file? @enabled_file
-    end
-
-
-    ##
-    # Remove the healthcheck file - status: :down
-
-    def remove
-      @shell.call "rm -f #{@disabled_file} #{@enabled_file}"
-    end
-
-
-    ##
-    # Get the health status from the shell.
-    # Returns one of three states:
-    #   :enabled:   everything is great
-    #   :disabled:  healthcheck was explicitely turned off
-    #   :down:      um, something is wrong
-
-    def status
-      return :disabled if disabled?
-      return :enabled  if enabled?
-      :down
-    end
-  end
-end