whenever 0.8.1 → 0.8.2

data/.travis.yml

@@ -6,4 +6,3 @@ rvm:
   - jruby
   - jruby-18mode
   - jruby-19mode
-  - jruby-head

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 * Time zone support
 
 
+### 0.8.2 / January 10, 2013
+
+* Fix Capistrano host options. [Igor Yamolov, Wes Morgan]
+
+* Improve JRuby test support. [Igor Yamolov]
+
+* Use correct release path in Cap task. [Wes Morgan]
+
+
 ### 0.8.1 / December 22nd, 2012
 
 * Fix multiserver roles bug. [Wes Morgan]

data/README.md

@@ -225,4 +225,4 @@ Compatible with Ruby 1.8.7-1.9.3, JRuby, and Rubinius. [![Build Status](https://
 
 ----
 
-Copyright © 2012 Javan Makhmali
+Copyright © 2013 Javan Makhmali

data/lib/whenever/capistrano/recipes.rb

@@ -18,7 +18,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       args = {
         :command => fetch(:whenever_command),
         :flags   => fetch(:whenever_update_flags),
-        :path    => fetch(:release_path)
+        :path    => fetch(:latest_release)
       }
 
       if whenever_servers.any?
@@ -30,6 +30,7 @@ Capistrano::Configuration.instance(:must_exist).load do
             args[:path] = fetch(:previous_release)
           else
             # clear the crontab if no previous release
+            args[:path]  = fetch(:release_path)
             args[:flags] = fetch(:whenever_clear_flags)
           end
 

data/lib/whenever/capistrano/support.rb

@@ -31,7 +31,7 @@ module Whenever
             roles_arg = roles.empty? ? "" : " --roles #{roles.join(',')}"
 
             command = "cd #{args[:path]} && #{args[:command]} #{args[:flags]}#{roles_arg}"
-            run command, whenever_options.merge(:hosts => server.host)
+            run command, whenever_options.merge(:hosts => server)
           end
         end
 

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # Want to test the files here, in lib, not in an installed version of the gem.
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'whenever'
-
+require 'test/unit'
 require 'shoulda'
 require 'mocha'
 
@@ -15,4 +15,4 @@ end
 
 class Test::Unit::TestCase
   include TestExtensions
-end
+end

data/test/unit/capistrano_support_test.rb

@@ -99,9 +99,10 @@ class CapistranoSupportTest < Test::Unit::TestCase
 
       context "with some servers defined" do
         setup do
-          @mock_server1, @mock_server2 = mock(), mock()
+          @mock_server1, @mock_server2, @mock_server3 = mock("Server1"), mock("Server2"), mock("Server3")
           @mock_server1.stubs(:host).returns("server1.foo.com")
           @mock_server2.stubs(:host).returns("server2.foo.com")
+          @mock_server3.stubs(:host => "server3.foo.com", :port => 1022, :user => 'test')
           @mock_servers = [@mock_server1, @mock_server2]
         end
 
@@ -112,8 +113,8 @@ class CapistranoSupportTest < Test::Unit::TestCase
           roles = [:role1, :role2]
           @capistrano.stubs(:whenever_options).returns({:roles => roles})
 
-          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1', {:roles => [:role1, :role2], :hosts => 'server1.foo.com'})
-          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role2', {:roles => [:role1, :role2], :hosts => 'server2.foo.com'})
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1', {:roles => roles, :hosts => @mock_server1})
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role2', {:roles => roles, :hosts => @mock_server2})
 
           @capistrano.whenever_run_commands(:command => "whenever",
                                             :path => "/foo/bar",
@@ -122,11 +123,25 @@ class CapistranoSupportTest < Test::Unit::TestCase
 
         should "call run w/ all role args for servers w/ >1 role" do
           @capistrano.stubs(:role_names_for_host).with(@mock_server1).returns([:role1, :role3])
-          @capistrano.stubs(:whenever_servers).returns([@mock_servers.first])
+          @capistrano.stubs(:whenever_servers).returns([@mock_server1])
           roles = [:role1, :role2, :role3]
           @capistrano.stubs(:whenever_options).returns({:roles => roles})
 
-          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1,role3', {:roles => [:role1, :role2, :role3], :hosts => 'server1.foo.com'})
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1,role3', {:roles => roles, :hosts => @mock_server1})
+
+          @capistrano.whenever_run_commands(:command => "whenever",
+                                            :path => "/foo/bar",
+                                            :flags => "--flag1 --flag2")
+        end
+
+        should "call run w/ proper server options (port, user)" do
+          @capistrano.stubs(:role_names_for_host).with(@mock_server3).returns([:role3])
+          @capistrano.stubs(:whenever_servers).returns([@mock_server3])
+          @capistrano.stubs(:whenever_options).returns({:roles => [:role3]})
+
+          @capistrano.expects(:run).once.with do |command, options|
+            options[:hosts].user == "test" && options[:hosts].port == 1022
+          end
 
           @capistrano.whenever_run_commands(:command => "whenever",
                                             :path => "/foo/bar",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic