yads 0.0.3.pre2 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.DS_Store

data/Rakefile

@@ -1,2 +1,9 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
+
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/test_*.rb"]
+  t.verbose = true
+end

data/bin/yads

@@ -1,4 +1,16 @@
 #!/usr/bin/env ruby
+require "slop"
 
-require "yads"
-Yads::Deployer.new(STDOUT).deploy
+opts = Slop.new(:strict => true)
+opts.parse do |action|
+  require "yads"
+  deployer = Yads::Deployer.new(STDOUT)
+
+  action = action.to_sym
+  if !action.empty? && deployer.respond_to?(action)
+    deployer.send(action)
+  else
+    puts "Unknow command \"#{action}\""
+    puts "Usage: yads [setup|deploy]"
+  end
+end

data/examples/deploy.yml

@@ -3,10 +3,10 @@ user: username
 forward_agent: true/false
 
 path: /path/on/remote/server
+repository: git@repohost.com:myproject.git
 commands:
-  clone: git clone --depth 1 git@repohost.com:myproject.git . # mandatory, other commands below are optional
   reset: git reset --hard
   pull: git pull origin master
   bundle: bundle install --deployment --binstubs --without development test
-  migrate: ENV=production bin/rake db:migrate --silent
+  migrate: RAILS_ENV=production bin/rake db:migrate --silent
   restart: touch tmp/restart.txt

data/lib/yads/deployer.rb

@@ -0,0 +1,41 @@
+require "yaml"
+
+module Yads
+  class Deployer
+
+    def initialize(logger = STDOUT)
+      @logger = logger
+    end
+
+    def setup
+      command = "mkdir -p #{config["path"]} && cd #{config["path"]} && git clone --depth 1 #{config['repository']} ."
+      @logger.puts("> #{command}")
+      @logger.puts(connection.execute(command))
+    end
+
+    def deploy
+      commands = config["commands"].values
+      commands.unshift("cd #{config["path"]}")
+      commands = commands.join(" && ")
+
+      @logger.puts("> #{commands}")
+      connection.execute(commands) do |output|
+        @logger.print(output)
+      end
+    end
+
+    private
+
+      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 ||= SSH.new(:host => config["host"], :user => config["user"], :forward_agent => config["forward_agent"])
+      end
+  end
+end

data/lib/yads/ssh.rb

@@ -0,0 +1,26 @@
+require "net/ssh"
+
+module Yads
+
+  class SSH
+
+    def initialize(config)
+      @ssh = Net::SSH.start(config[:host], config[:user], :forward_agent => config[:forward_agent])
+    end
+
+    def execute(cmd)
+      if block_given?
+        @ssh.exec(cmd) do |ch, stream, data|
+          yield data
+        end
+        @ssh.loop
+      else
+        @ssh.exec!(cmd)
+      end
+    end
+
+    def close
+      @ssh.close
+    end
+  end
+end

data/lib/yads/version.rb

@@ -1,3 +1,3 @@
 module Yads
-  VERSION = "0.0.3.pre2"
+  VERSION = "0.1.0"
 end

data/lib/yads.rb

@@ -1,54 +1,6 @@
-require "net/ssh"
-require "yaml"
-
 module Yads
-
   class ConfigNotFound < Errno::ENOENT; end
 
-  class Deployer
-    def initialize(logger = STDOUT)
-      @logger = logger
-    end
-
-    def deploy
-      begin
-        config = YAML.load(File.open("config/deploy.yml"))
-      rescue Errno::ENOENT
-        raise Yads::ConfigNotFound, "config/deploy.yml not found"
-      end
-
-      Net::SSH.start(config["host"], config["user"], :forward_agent => config["forward_agent"]) do |ssh|
-        check_path(ssh, config["path"], config["commands"].delete("clone"))
-
-        commands = config["commands"].values.unshift("cd #{config['path']}").join(" && ")
-        @logger.puts "> #{commands}"
-        @logger.puts
-
-        ssh.exec(commands) do |ch, stream, data|
-          print data
-        end
-
-        ssh.loop
-      end
-    end
-
-    def check_path(ssh, path, clone)
-      @logger.puts "> cd #{path}/.git"
-      ssh.exec("cd #{path}/.git") do |ch, stream, data|
-        if stream == :stderr
-          @logger.puts "> cd #{path}"
-          ssh.exec("mkdir -p #{path}; cd #{path}") do |ch1, stream1, data1|
-            @logger.puts "> #{clone}"
-            ssh.exec(clone) do |ch1, stream1, data1|
-              abort data1 if stream1 == :stderr
-
-              @logger.puts "> cd #{path}"
-              ssh.exec("cd #{path}")
-            end
-          end
-        end
-      end
-      ssh.loop
-    end
-  end
+  autoload :SSH, "yads/ssh"
+  autoload :Deployer, "yads/deployer"
 end

data/test/fixtures/config/deploy.yml

@@ -1,7 +1,8 @@
 host: rafaelss.com
 user: deploy
 forward_agent: true
-path: /Users/rafael/projects/yads/test/fixtures
+path: /tmp/yads
+repository: git@repohost.com:myrepo.git
 commands:
-  chdir: cd /tmp/yads
+  migrate: rake db:migrate
   touch: touch test

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require "bundler"
+Bundler.require
+
+require "minitest/autorun"
+require "mocha"
+require "net/ssh"

data/test/yads/test_deployer.rb

@@ -0,0 +1,54 @@
+require "test_helper"
+
+class TestYads < MiniTest::Unit::TestCase
+
+  def setup
+    @log_file = File.open("/dev/null", "w")
+  end
+
+  def test_try_loading_not_found_config_file_on_setup
+    assert_raises(Yads::ConfigNotFound) do
+      Dir.chdir("/tmp") do
+        deployer = Yads::Deployer.new(@log_file)
+        deployer.setup
+      end
+    end
+  end
+
+  def test_try_loading_not_found_config_file_on_deploy
+    assert_raises(Yads::ConfigNotFound) do
+      Dir.chdir("/tmp") do
+        deployer = Yads::Deployer.new(@log_file)
+        deployer.deploy
+      end
+    end
+  end
+
+  def test_setup
+    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).returns(ssh)
+
+      deployer = Yads::Deployer.new(@log_file)
+      deployer.setup
+    end
+  end
+
+  def test_deploy
+    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).returns(ssh)
+
+      deployer = Yads::Deployer.new(@log_file)
+      deployer.deploy
+    end
+  end
+
+  private
+
+    def inside_project_root(&block)
+      Dir.chdir(File.expand_path("../../fixtures", __FILE__), &block)
+    end
+end

data/test/yads/test_ssh.rb

@@ -0,0 +1,46 @@
+require "test_helper"
+
+class TestSSH < MiniTest::Unit::TestCase
+
+  def test_connect
+    connection_mock
+
+    Yads::SSH.new(:host => "example.org", :user => "deploy", :forward_agent => true)
+  end
+
+  def test_execute
+    session = mock
+    session.expects(:exec!).with("mkdir -p /tmp/yads")
+    connection_mock(session)
+
+    s = Yads::SSH.new(:host => "example.org", :user => "deploy", :forward_agent => true)
+    s.execute("mkdir -p /tmp/yads")
+  end
+
+  def test_execute_with_block
+    session = mock
+    session.expects(:exec).with("echo $PATH").yields(nil, nil, "/usr/bin:/usr/local/bin")
+    session.expects(:loop)
+    connection_mock(session)
+
+    s = Yads::SSH.new(:host => "example.org", :user => "deploy", :forward_agent => true)
+    s.execute("echo $PATH") do |output|
+      assert_equal "/usr/bin:/usr/local/bin", output
+    end
+  end
+
+  def test_close
+    session = mock
+    session.expects(:close)
+    connection_mock(session)
+
+    s = Yads::SSH.new(:host => "example.org", :user => "deploy", :forward_agent => true)
+    s.close
+  end
+
+  private
+
+    def connection_mock(session = nil)
+      Net::SSH.expects(:start).with("example.org", "deploy", :forward_agent => true).returns(session)
+    end
+end

data/yads.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Simple deployment tool that uses a single YAML file to put your code live}
 
   s.add_runtime_dependency "net-ssh", "~> 2.1.0"
+  s.add_runtime_dependency "slop", "~> 1.5.2"
   s.add_development_dependency "minitest", "~> 2.0.2"
   s.add_development_dependency "mocha", "~> 0.9.10"
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: yads
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.0.3.pre2
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rafael Souza
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -03:00
+date: 2011-04-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,27 +25,38 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: slop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.0.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.10
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Simple deployment tool that uses a single YAML file to put your code live
 email: 
 - me@rafaelss.com
@@ -63,9 +74,13 @@ files:
 - bin/yads
 - examples/deploy.yml
 - lib/yads.rb
+- lib/yads/deployer.rb
+- lib/yads/ssh.rb
 - lib/yads/version.rb
 - test/fixtures/config/deploy.yml
-- test/test_yads.rb
+- test/test_helper.rb
+- test/yads/test_deployer.rb
+- test/yads/test_ssh.rb
 - yads.gemspec
 has_rdoc: true
 homepage: http://github.com/rafaelss/yads
@@ -85,16 +100,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Deploy your code using a YAML file
 test_files: 
 - test/fixtures/config/deploy.yml
-- test/test_yads.rb
+- test/test_helper.rb
+- test/yads/test_deployer.rb
+- test/yads/test_ssh.rb

data/test/test_yads.rb

@@ -1,53 +0,0 @@
-require "bundler"
-Bundler.require
-
-require "minitest/autorun"
-require "mocha"
-
-class TestYads < MiniTest::Unit::TestCase
-
-  def setup
-    @deployer = Yads::Deployer.new(File.open("/dev/null", "w"))
-  end
-
-  def test_check_path_abort
-    ssh = mock
-    ssh.expects(:exec).with("cd /tmp/yads/.git").yields("ch", :stderr, "data")
-    ssh.expects(:exec).with("git clone git@repohost.com:myrepo.git .").yields("ch1", :stderr, "data1")
-
-    assert_raises(SystemExit) do
-      @deployer.check_path(ssh, "/tmp/yads", "git clone git@repohost.com:myrepo.git .")
-    end
-  end
-
-  def test_check_path
-    ssh = mock
-    ssh.expects(:exec).with("cd /tmp/yads/.git").yields("ch", :stderr, "data")
-    ssh.expects(:exec).with("git clone git@repohost.com:myrepo.git .").yields("ch1", :stdout, "data1")
-    ssh.expects(:exec).with("cd /tmp/yads")
-    ssh.expects(:loop)
-
-    @deployer.check_path(ssh, "/tmp/yads", "git clone git@repohost.com:myrepo.git .")
-  end
-
-  def test_load_not_found_config_file
-    assert_raises(Yads::ConfigNotFound) do
-      Dir.chdir("/tmp") do
-        @deployer.deploy
-      end
-    end
-  end
-
-  def test_load_config_file
-    Dir.chdir(File.expand_path("../fixtures", __FILE__)) do
-      ssh = mock
-      ssh.expects(:exec).with("cd /tmp/yads && touch test")
-      ssh.expects(:loop)
-
-      @deployer.expects(:check_path).with(ssh)
-      Net::SSH.expects(:start).with("rafaelss.com", "deploy", :forward_agent => true).yields(ssh)
-
-      @deployer.deploy
-    end
-  end
-end