switchtower 0.10.0 → 1.0.0

data/lib/switchtower/transfer.rb

@@ -58,7 +58,7 @@ module SwitchTower
           sftp = @actor.sessions[server].sftp
           sftp.connect unless sftp.state == :open
 
-          sftp.open(@filename, IO::WRONLY | IO::CREAT, @params[:mode] || 0660) do |status, handle|
+          sftp.open(@filename, IO::WRONLY | IO::CREAT | IO::TRUNC, @params[:mode] || 0660) do |status, handle|
             break unless check_status("open #{@filename}", server, status)
             
             logger.info "uploading data to #{server}:#{@filename}"

data/lib/switchtower/utils.rb

@@ -0,0 +1,26 @@
+module SwitchTower
+  # A helper method for converting a comma-delimited string into an array of
+  # roles.
+  def self.str2roles(string)
+    list = string.split(/,/).map { |s| s.strip.to_sym }
+    list.empty? ? nil : list
+  end
+
+  # Used by third-party task bundles to identify the switchtower configuration
+  # that is loading them. It's return value is not reliable in other contexts.
+  # If +require_config+ is not false, an exception will be raised if the current
+  # configuration is not set.
+  def self.configuration(require_config=false)
+    config = Thread.current[:switchtower_configuration]
+    if require_config && config.nil?
+      raise "Please require this file from within a SwitchTower recipe"
+    end
+    config
+  end
+
+  # Used internally by SwitchTower to specify the current configuration before
+  # loading a third-party task bundle.
+  def self.configuration=(config)
+    Thread.current[:switchtower_configuration] = config
+  end
+end

data/lib/switchtower/version.rb

@@ -18,13 +18,13 @@ module SwitchTower
       good
     end
 
-    MAJOR = 0
-    MINOR = 10
+    MAJOR = 1
+    MINOR = 0
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join(".")
     
-    SSH_REQUIRED = [1,0,5]
+    SSH_REQUIRED = [1,0,8]
     SFTP_REQUIRED = [1,1,0]
   end
 end

data/test/actor_test.rb

@@ -4,6 +4,7 @@ require 'stringio'
 require 'test/unit'
 require 'switchtower/actor'
 require 'switchtower/logger'
+require 'switchtower/configuration'
 
 class ActorTest < Test::Unit::TestCase
 
@@ -83,6 +84,12 @@ class ActorTest < Test::Unit::TestCase
     end
   end
 
+  module CustomExtension
+    def do_something_extra(a, b, c)
+      run "echo '#{a} :: #{b} :: #{c}'"
+    end
+  end
+
   def setup
     TestingCommand.reset!
     @actor = TestActor.new(MockConfiguration.new)
@@ -162,7 +169,7 @@ class ActorTest < Test::Unit::TestCase
       run "do this"
     end
 
-    assert_equal %w(01.example.com 02.example.com 03.example.com 04.example.com 05.example.com 06.example.com 07.example.com all.example.com), @actor.tasks[:foo].servers(@actor.configuration).sort
+    assert_equal %w(01.example.com 02.example.com 03.example.com 04.example.com 05.example.com 06.example.com 07.example.com all.example.com), @actor.tasks[:foo].servers.sort
   end
 
   def test_run_in_task_without_explicit_roles_selects_all_roles
@@ -258,4 +265,30 @@ class ActorTest < Test::Unit::TestCase
     @actor.foo
     assert_equal %w(foo after_foo), history
   end
+
+  def test_uppercase_variables
+    config = SwitchTower::Configuration.new(TestActor)
+    config.set :HELLO, "world"
+    assert_equal "world", config.actor.instance_eval("HELLO")
+    config.set :HELLO, "test"
+    assert_equal "test", config.actor.instance_eval("HELLO")
+  end
+
+  def test_connect_when_no_matching_servers
+    @actor.define_task :foo, :roles => :db, :only => { :fnoofy => true } do
+      run "do this"
+    end
+
+    assert_raises(RuntimeError) { @actor.foo }
+  end
+
+  def test_custom_extension
+    assert SwitchTower.plugin(:custom, CustomExtension)
+    @actor.define_task :foo, :roles => :db do
+      custom.do_something_extra(1, 2, 3)
+    end
+    assert_nothing_raised { @actor.foo }
+    assert TestingCommand.invoked?
+    assert SwitchTower.remove_plugin(:custom)
+  end
 end

data/test/configuration_test.rb

@@ -125,6 +125,16 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_equal 1, @config.roles[:web].length
   end
 
+  def test_load_proc_explicit
+    @config.load :proc => Proc.new { set :gateway, "nifty.zoo.test" }
+    assert_equal "nifty.zoo.test", @config.gateway
+  end
+
+  def test_load_proc_implicit
+    @config.load { set :gateway, "nifty.zoo.test" }
+    assert_equal "nifty.zoo.test", @config.gateway
+  end
+
   def test_task_without_options
     block = Proc.new { }
     @config.task :hello, &block
@@ -209,10 +219,15 @@ class ConfigurationTest < Test::Unit::TestCase
   end
 
   def test_get_proc_variable_sets_original_value_hash
-    @config.set :proc, Proc.new { "foo" }
+    @config.set(:proc) { "foo" }
     assert_nil @config[:original_value][:proc]
     assert_equal "foo", @config[:proc]
     assert_not_nil @config[:original_value][:proc]
     assert @config[:original_value][:proc].respond_to?(:call)
   end
+
+  def test_require
+    @config.require "#{File.dirname(__FILE__)}/fixtures/custom"
+    assert_equal "foo", @config.gateway
+  end
 end

data/test/fixtures/custom.rb

@@ -0,0 +1,3 @@
+SwitchTower.configuration(:must_exist).load do
+  set :gateway, "foo"
+end

data/test/scm/cvs_test.rb

@@ -9,10 +9,15 @@ class ScmCvsTest < Test::Unit::TestCase
     attr_accessor :story
     attr_reader   :last_path
 
-    def cvs_log(path)
+    def cvs_log(path,branch)
       @last_path = path
       story.shift
     end
+
+    def cvs_branch(path)
+      "deploy-me"
+    end
+
   end
 
   class MockChannel
@@ -56,7 +61,6 @@ class ScmCvsTest < Test::Unit::TestCase
   def setup
     @config = MockConfiguration.new
     @config[:repository] = ":ext:joetester@rubyforge.org:/hello/world"
-    @config[:local] = "/hello/world"
     @config[:cvs] = "/path/to/cvs"
     @config[:password] = "chocolatebrownies"
     @config[:now] = Time.utc(2005,8,24,12,0,0)
@@ -144,11 +148,19 @@ MSG
   end
 
   def test_latest_revision
+    @config[:local] = "/hello/world"
     @scm.story = [ @log_msg ]
     assert_equal "2004-10-12 02:21:02", @scm.latest_revision
     assert_equal "/hello/world", @scm.last_path
   end
 
+  def test_latest_with_default_local
+    @config[:local] = nil
+    @scm.story = [ @log_msg ]
+    assert_equal "2004-10-12 02:21:02", @scm.latest_revision
+    assert_equal ".", @scm.last_path
+  end
+
   def test_checkout
     @actor.story = []
     assert_nothing_raised { @scm.checkout(@actor) }
@@ -161,4 +173,14 @@ MSG
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_equal ["chocolatebrownies\n"], @actor.channels.last.sent_data
   end
+
+  def test_current_branch
+    assert_equal "deploy-me", @scm.current_branch
+  end
+
+  def test_default_current_branch
+    @config[:branch] = "default-branch"
+    @scm = CvsTest.new(@config)
+    assert_equal "default-branch", @scm.current_branch
+  end
 end

data/test/scm/subversion_test.rb

@@ -84,7 +84,7 @@ MSG
     @actor.story = []
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn}, @actor.command
+    assert_match %r{/path/to/svn co\s+-q}, @actor.command
   end
 
   def test_checkout_via_export
@@ -92,7 +92,7 @@ MSG
     @config[:checkout] = "export"
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn export}, @actor.command
+    assert_match %r{/path/to/svn export\s+-q}, @actor.command
   end
 
   def test_update
@@ -119,4 +119,19 @@ MSG
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_equal ["chocolatebrownies\n"], @actor.channels.last.sent_data
   end
+
+  def test_svn_password
+    @config[:svn_password] = "butterscotchcandies"
+    @actor.story = [[:out, "Password: "]]
+    assert_nothing_raised { @scm.checkout(@actor) }
+    assert_equal ["butterscotchcandies\n"], @actor.channels.last.sent_data
+  end
+
+  def test_svn_username
+    @actor.story = []
+    @config[:svn_username] = "turtledove"
+    assert_nothing_raised { @scm.checkout(@actor) }
+    assert_nil @actor.channels.last.sent_data
+    assert_match %r{/path/to/svn co --username turtledove}, @actor.command
+  end
 end

data/test/utils.rb

@@ -32,6 +32,14 @@ class MockConfiguration < Hash
     @logger ||= MockLogger.new
   end
 
+  def set(variable, value=nil, &block)
+      self[variable] = value
+  end
+
+  def respond_to?(sym)
+    self.has_key?(sym)
+  end
+
   def method_missing(sym, *args)
     if args.length == 0
       self[sym]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: switchtower
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
-date: 2006-01-02 00:00:00 -07:00
+  version: 1.0.0
+date: 2006-02-18 00:00:00 -07:00
 summary: "SwitchTower is a framework and utility for executing commands in parallel     on
   multiple remote machines, via SSH. The primary goal is to simplify and    
   automate the deployment of web applications."
@@ -38,6 +38,7 @@ files:
   - lib/switchtower/cli.rb
   - lib/switchtower/command.rb
   - lib/switchtower/configuration.rb
+  - lib/switchtower/extensions.rb
   - lib/switchtower/gateway.rb
   - lib/switchtower/generators
   - lib/switchtower/logger.rb
@@ -45,6 +46,7 @@ files:
   - lib/switchtower/scm
   - lib/switchtower/ssh.rb
   - lib/switchtower/transfer.rb
+  - lib/switchtower/utils.rb
   - lib/switchtower/version.rb
   - lib/switchtower/generators/rails
   - lib/switchtower/generators/rails/deployment
@@ -57,8 +59,11 @@ files:
   - lib/switchtower/recipes/templates
   - lib/switchtower/recipes/templates/maintenance.rhtml
   - lib/switchtower/scm/base.rb
+  - lib/switchtower/scm/baz.rb
+  - lib/switchtower/scm/bzr.rb
   - lib/switchtower/scm/cvs.rb
   - lib/switchtower/scm/darcs.rb
+  - lib/switchtower/scm/perforce.rb
   - lib/switchtower/scm/subversion.rb
   - examples/sample.rb
   - test/actor_test.rb
@@ -69,6 +74,7 @@ files:
   - test/ssh_test.rb
   - test/utils.rb
   - test/fixtures/config.rb
+  - test/fixtures/custom.rb
   - test/scm/cvs_test.rb
   - test/scm/subversion_test.rb
 test_files: []
@@ -87,7 +93,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.5
+            version: 1.0.8
       version: 
   - !ruby/object:Gem::Dependency 
     name: net-sftp