yads 0.1.1 → 0.1.2

data/lib/yads/deployer.rb

@@ -26,16 +26,25 @@ module Yads
 
     private
 
-      def config
-        @config ||= begin
-          YAML.load(File.open("config/deploy.yml"))
-        rescue Errno::ENOENT
-          raise Yads::ConfigNotFound, "config/deploy.yml not found"
-        end
+    def config
+      @config ||= begin
+        YAML.load(File.open("config/deploy.yml"))
+      rescue Errno::ENOENT
+        raise Yads::ConfigNotFound, "config/deploy.yml not found"
       end
+    end
+
+    def connection
+      @connection ||= begin
+        options = {
+          :host => config["host"],
+          :user => config["user"],
+          :forward_agent => config["forward_agent"]
+        }
+        options[:port] = config["port"] if config["port"]
 
-      def connection
-        @connection ||= SSH.new(:host => config["host"], :user => config["user"], :forward_agent => config["forward_agent"])
+        SSH.new(options)
       end
+    end
   end
 end

data/lib/yads/version.rb

@@ -1,3 +1,3 @@
 module Yads
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/fixtures/config/deploy_with_port.yml

@@ -0,0 +1,9 @@
+host: rafaelss.com
+port: 2222
+user: deploy
+forward_agent: true
+path: /tmp/yads
+repository: git@repohost.com:myrepo.git
+commands:
+  migrate: rake db:migrate
+  touch: touch test

data/test/yads/test_deployer.rb

@@ -35,6 +35,18 @@ class TestYads < MiniTest::Unit::TestCase
     end
   end
 
+  def test_setup_using_non_standard_port
+    inside_project_root do
+      ssh = mock
+      ssh.expects(:execute).with("mkdir -p /tmp/yads && cd /tmp/yads && git clone --depth 1 git@repohost.com:myrepo.git .")
+      Yads::SSH.expects(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true, :port => 2222).returns(ssh)
+
+      deployer = Yads::Deployer.new(@log_file)
+      deployer.stubs(:config => YAML.load(File.open("config/deploy_with_port.yml")).merge("port" => 2222))
+      deployer.setup
+    end
+  end
+
   def test_deploy
     inside_project_root do
       ssh = mock
@@ -46,9 +58,21 @@ class TestYads < MiniTest::Unit::TestCase
     end
   end
 
-  private
+  def test_deploy_using_non_standard_port
+    inside_project_root do
+      ssh = mock
+      ssh.expects(:execute).with("cd /tmp/yads && rake db:migrate && touch test")
+      Yads::SSH.expects(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true, :port => 2222).returns(ssh)
 
-    def inside_project_root(&block)
-      Dir.chdir(File.expand_path("../../fixtures", __FILE__), &block)
+      deployer = Yads::Deployer.new(@log_file)
+      deployer.stubs(:config => YAML.load(File.open("config/deploy_with_port.yml")).merge("port" => 2222))
+      deployer.deploy
     end
+  end
+
+  private
+
+  def inside_project_root(&block)
+    Dir.chdir(File.expand_path("../../fixtures", __FILE__), &block)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yads
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70167770426280 !ruby/object:Gem::Requirement
+  requirement: &70191598240660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70167770426280
+  version_requirements: *70191598240660
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70167770425040 !ruby/object:Gem::Requirement
+  requirement: &70191598239280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70167770425040
+  version_requirements: *70191598239280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70167770423080 !ruby/object:Gem::Requirement
+  requirement: &70191598237440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70167770423080
+  version_requirements: *70191598237440
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70167770422200 !ruby/object:Gem::Requirement
+  requirement: &70191598236560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :development
   prerelease: false
-  version_requirements: *70167770422200
+  version_requirements: *70191598236560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70167770437500 !ruby/object:Gem::Requirement
+  requirement: &70191598251880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70167770437500
+  version_requirements: *70191598251880
 description: Simple deployment tool that uses a single YAML file to put your code
   live
 email:
@@ -86,6 +86,7 @@ files:
 - lib/yads/ssh.rb
 - lib/yads/version.rb
 - test/fixtures/config/deploy.yml
+- test/fixtures/config/deploy_with_port.yml
 - test/test_helper.rb
 - test/yads/test_deployer.rb
 - test/yads/test_ssh.rb
@@ -116,6 +117,7 @@ specification_version: 3
 summary: Deploy your code using a YAML file
 test_files:
 - test/fixtures/config/deploy.yml
+- test/fixtures/config/deploy_with_port.yml
 - test/test_helper.rb
 - test/yads/test_deployer.rb
 - test/yads/test_ssh.rb