yads 0.2.0 → 0.3.0.beta

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format TapFormatter
+--order rand

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rake test

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in yads.gemspec
 gemspec
+
+gem "rspec-extra-formatters", :github => "rafaelss/rspec_formatters"

data/README.md

@@ -7,7 +7,7 @@ Yet Another Deploy Solution is a simple gem to deploy applications using a singl
     group :deploy do
       gem "yads"
     end
-    
+
 and
 
     bundle install
@@ -22,10 +22,19 @@ and
 
 - Run `bundle exec yads deploy` to deploy the code and put your application live
 
+You can also run single commands by the name defined on your config, like that:
+
+    bundle exec yads migrate
+
+Or
+
+    bundle exec yads restart
+
 ## TODO
 
-- Let run commands by name: `yads migrate && yads restart` or `yads migrate restart` like rake tasks
+- <del>Let run commands by name: `yads migrate && yads restart` or `yads migrate restart` like rake tasks</del>
 - Separate commands and tasks. Tasks would be commands you could run alone, any time you want
+- Let run two or more commands at once
 
 ## Maintainer
 

data/bin/yads

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
-require "slop"
+require 'optparse'
 
-opts = Slop.new(:strict => true)
-opts.parse do |action|
-  require "yads"
-  deployer = Yads::Deployer.new(STDOUT)
+options = {}
+OptionParser.new do |opts|
+  opts.on("-e", "--environment LIBRARY", "Require the LIBRARY before executing your script") do |env|
+    options[:environment] = env
+  end
+end.parse!
 
-  action = action.to_sym
-  if !action.empty? && deployer.respond_to?(action)
-    deployer.send(action)
-  else
-    puts "Unknow command \"#{action}\""
-    commands = ["setup", "deploy"].concat(deployer.command_names).join("|")
-    puts "Usage: yads [#{commands}]"
+require "yads"
+deployer = Yads::Deployer.new(options[:environment], STDOUT)
+if ARGV.empty?
+  commands = ["setup", "deploy"].concat(deployer.command_names).join("|")
+  puts "Usage: yads [#{commands}]"
+else
+  ARGV.each do |cmd|
+    deployer.send(cmd)
   end
 end

data/lib/yads/deployer.rb

@@ -2,8 +2,10 @@ require "yaml"
 
 module Yads
   class Deployer
+    CONFIG_FILE = "config/deploy.yml"
 
-    def initialize(logger = STDOUT)
+    def initialize(environment, logger = STDOUT)
+      @environment = environment
       @logger = logger
     end
 
@@ -53,9 +55,14 @@ module Yads
 
     def config
       @config ||= begin
-        YAML.load(File.open("config/deploy.yml"))
+        cfg = YAML.load_file(CONFIG_FILE)
+        if @environment
+          cfg = cfg[@environment]
+          raise Yads::UnknowEnvironment, "Environment #{@environment} is not configured" unless cfg.is_a?(Hash)
+        end
+        cfg
       rescue Errno::ENOENT
-        raise Yads::ConfigNotFound, "config/deploy.yml not found"
+        raise Yads::ConfigNotFound, "#{CONFIG_FILE} not found"
       end
     end
 

data/lib/yads/version.rb

@@ -1,3 +1,3 @@
 module Yads
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta"
 end

data/lib/yads.rb

@@ -1,5 +1,6 @@
 module Yads
   class ConfigNotFound < Errno::ENOENT; end
+  class UnknowEnvironment < StandardError; end
 
   autoload :SSH, "yads/ssh"
   autoload :Deployer, "yads/deployer"

data/spec/fixtures/config/deploy_to_staging.yml

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

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require "bundler"
+Bundler.require
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+end

data/spec/yads/deployer_spec.rb

@@ -0,0 +1,133 @@
+require "spec_helper"
+
+shared_examples_for Yads::Deployer do
+  it "returns available commands" do
+    inside_project_root do
+      subject.command_names.should == ["migrate", "touch"]
+    end
+  end
+
+  it "returns if it has a command configured" do
+    inside_project_root do
+      subject.should respond_to(:migrate)
+    end
+  end
+
+  it "executes the command against the server" do
+    inside_project_root do
+      ssh = mock
+      ssh.should_receive(:execute).with("cd #{path} && rake db:migrate")
+      Yads::SSH.should_receive(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true).and_return(ssh)
+
+      subject.migrate
+    end
+  end
+
+  context "setting up" do
+    it "raises an error if config is not found" do
+      expect do
+        Dir.chdir("/tmp") do
+          subject.setup
+        end
+      end.should raise_error(Yads::ConfigNotFound)
+    end
+
+    it "executes commands against the server" do
+      inside_project_root do
+        ssh = mock
+        ssh.should_receive(:execute).with("mkdir -p #{path} && cd #{path} && git clone --depth 1 git@repohost.com:myrepo.git .")
+        Yads::SSH.should_receive(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true).and_return(ssh)
+
+        subject.setup
+      end
+    end
+  end
+
+  context "deploying" do
+    it "raises an error if config is not found" do
+      expect do
+        Dir.chdir("/tmp") do
+          subject.deploy
+        end
+      end.should raise_error(Yads::ConfigNotFound)
+    end
+
+    it "executes commands against the server" do
+      inside_project_root do
+        ssh = mock
+        ssh.should_receive(:execute).with("cd #{path} && rake db:migrate && touch test")
+        Yads::SSH.should_receive(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true).and_return(ssh)
+
+        subject.deploy
+      end
+    end
+  end
+end
+
+describe Yads::Deployer do
+  let(:log_file) { File.open("/dev/null", "w") }
+
+  context "without environment" do
+    let(:path) { "/tmp/yads" }
+    subject { described_class.new(nil, log_file) }
+
+    before do
+      silence_warnings do
+        described_class::CONFIG_FILE = "config/deploy.yml"
+      end
+    end
+
+    it_behaves_like Yads::Deployer
+
+    context "using non-standard port" do
+      before do
+        silence_warnings do
+          described_class::CONFIG_FILE = "config/deploy_with_port.yml"
+        end
+      end
+
+      it "sets up the app" do
+        inside_project_root do
+          ssh = mock
+          ssh.should_receive(:execute).with("mkdir -p #{path} && cd #{path} && git clone --depth 1 git@repohost.com:myrepo.git .")
+          Yads::SSH.should_receive(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true, :port => 2222).and_return(ssh)
+
+          subject.setup
+        end
+      end
+
+      it "deploys the app" do
+        inside_project_root do
+          ssh = mock
+          ssh.should_receive(:execute).with("cd #{path} && rake db:migrate && touch test")
+          Yads::SSH.should_receive(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true, :port => 2222).and_return(ssh)
+
+          subject.deploy
+        end
+      end
+    end
+  end
+
+  context "with environment" do
+    let(:path) { "/tmp/staging/yads" }
+    subject { described_class.new("staging", log_file) }
+
+    before do
+      silence_warnings do
+        described_class::CONFIG_FILE = "config/deploy_to_staging.yml"
+      end
+    end
+
+    it "raises an error if environment is not configured in config file" do
+      expect do
+        inside_project_root { described_class.new("production").deploy }
+      end.should raise_error(Yads::UnknowEnvironment)
+    end
+
+    it_behaves_like Yads::Deployer
+  end
+
+  def inside_project_root(&block)
+    Dir.chdir(File.expand_path("../../fixtures", __FILE__), &block)
+  end
+end

data/spec/yads/ssh_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+describe Yads::SSH do
+  subject { described_class.new(:host => "example.org", :user => "deploy", :forward_agent => true) }
+
+  it "connects to the server" do
+    connection_mock
+    subject
+  end
+
+  context "using non-standard port" do
+    subject { described_class.new(:host => "example.org", :user => "deploy", :forward_agent => true, :port => 2222) }
+
+    it "connects to the server" do
+      connection_mock(nil, :port => 2222)
+      subject
+    end
+  end
+
+  it "executes commands against the server" do
+    session = mock
+    session.should_receive(:exec!).with("mkdir -p /tmp/yads")
+    connection_mock(session)
+
+    subject.execute("mkdir -p /tmp/yads")
+  end
+
+  it "executes commands against the server and yields the output" do
+    session = mock
+    session.should_receive(:exec).with("echo $PATH").and_yield(nil, nil, "/usr/bin:/usr/local/bin")
+    session.should_receive(:loop)
+    connection_mock(session)
+
+    subject.execute("echo $PATH") do |output|
+      output.should == "/usr/bin:/usr/local/bin"
+    end
+  end
+
+  it "closes the connection with the server" do
+    session = mock
+    session.should_receive(:close)
+    connection_mock(session)
+
+    subject.close
+  end
+
+  private
+
+  def connection_mock(session = nil, options = {})
+    Net::SSH.should_receive(:start).with("example.org", "deploy", { :forward_agent => true }.merge(options)).and_return(session)
+  end
+end

data/yads.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "net-ssh", "~> 2.3.0"
-  s.add_runtime_dependency "slop", "~> 3.1.1"
+  s.add_runtime_dependency "net-ssh", "~> 2.5.2"
 
   s.add_development_dependency "rake", ">= 0.8.7"
-  s.add_development_dependency "minitest", "~> 2.12.1"
-  s.add_development_dependency "mocha", "~> 0.11.4"
+  s.add_development_dependency "rspec", "~> 2.10.0"
 end

metadata

@@ -1,41 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: yads
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Rafael Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70142999344600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70142999344600
-- !ruby/object:Gem::Dependency
-  name: slop
-  requirement: &70142999353880 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70142999353880
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70142999352620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,29 +37,28 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70142999352620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70142999351400 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70142999351400
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70142999364060 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.4
-  type: :development
-  prerelease: false
-  version_requirements: *70142999364060
+        version: 2.10.0
 description: Simple deployment tool that uses a single YAML file to put your code
   live
 email:
@@ -76,6 +69,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -85,11 +80,12 @@ files:
 - lib/yads/deployer.rb
 - 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
+- spec/fixtures/config/deploy.yml
+- spec/fixtures/config/deploy_to_staging.yml
+- spec/fixtures/config/deploy_with_port.yml
+- spec/spec_helper.rb
+- spec/yads/deployer_spec.rb
+- spec/yads/ssh_spec.rb
 - yads.gemspec
 homepage: http://github.com/rafaelss/yads
 licenses: []
@@ -106,19 +102,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 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
-has_rdoc: 
+- spec/fixtures/config/deploy.yml
+- spec/fixtures/config/deploy_to_staging.yml
+- spec/fixtures/config/deploy_with_port.yml
+- spec/spec_helper.rb
+- spec/yads/deployer_spec.rb
+- spec/yads/ssh_spec.rb

data/test/test_helper.rb

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

data/test/yads/test_deployer.rb

@@ -1,103 +0,0 @@
-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_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
-      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
-
-  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)
-
-      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
-
-  def test_command_names
-    inside_project_root do
-      deployer = Yads::Deployer.new(@log_file)
-      assert_equal ["migrate", "touch"], deployer.command_names
-    end
-  end
-
-  def test_respond_to_command
-    inside_project_root do
-      deployer = Yads::Deployer.new(@log_file)
-      assert deployer.respond_to?(:migrate), "Deployer does not respond to :migrate"
-    end
-  end
-
-  def test_execute_the_command
-    inside_project_root do
-      ssh = mock
-      ssh.expects(:execute).with("cd /tmp/yads && rake db:migrate")
-      Yads::SSH.expects(:new).with(:host => "rafaelss.com", :user => "deploy", :forward_agent => true).returns(ssh)
-
-      deployer = Yads::Deployer.new(@log_file)
-      deployer.migrate
-    end
-  end
-
-  private
-
-  def inside_project_root(&block)
-    Dir.chdir(File.expand_path("../../fixtures", __FILE__), &block)
-  end
-end

data/test/yads/test_ssh.rb

@@ -1,52 +0,0 @@
-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_connect_using_non_standard_port
-    connection_mock(nil, :port => 2222)
-
-    Yads::SSH.new(:host => "example.org", :port => 2222, :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, options = {})
-    Net::SSH.expects(:start).with("example.org", "deploy", { :forward_agent => true }.merge(options)).returns(session)
-  end
-end