simultaneous 0.4.1 → 0.4.2

data/Rakefile

@@ -90,7 +90,18 @@ end
 #############################################################################
 
 desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
-task :release => :build do
+task :push => :build do
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :tag do
+  Rake::Task["push"].invoke
+end
+
+
+desc "Create tag v#{version}"
+task :tag => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
@@ -99,7 +110,6 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
 end
 
 desc "Build #{gem_file} into the pkg directory"

data/lib/simultaneous/task_description.rb

@@ -7,6 +7,7 @@ module Simultaneous
     # options:
     #   :nice
     #   :logfile - defaults to PWD/log/task_name.log
+    #   :pwd     - the directory that the task should run in
     #
     #
     # name, path_to_binary, options, default_parameters, env
@@ -19,7 +20,7 @@ module Simultaneous
     end
 
     def logfile
-      (options[:logfile] || options[:log] || default_log_file)
+      File.expand_path(options[:logfile] || options[:log] || default_log_file, pwd)
     end
 
     def pwd
@@ -27,11 +28,12 @@ module Simultaneous
     end
 
     def default_log_file
-      File.expand_path(File.join(Dir.pwd, "log", "#{name}-task.log"))
+      File.join(pwd, "log", "#{name}-task.log")
     end
 
     def default_pwd
-      "/"
+      Dir.pwd
     end
   end
 end
+

data/lib/simultaneous.rb

@@ -4,7 +4,7 @@ require 'socket'
 require 'eventmachine'
 
 module Simultaneous
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 
   DEFAULT_CONNECTION = "/tmp/simultaneous-server.sock"
   DEFAULT_PORT = 9999

data/simultaneous.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'simultaneous'
-  s.version           = '0.4.1'
-  s.date              = '2012-06-21'
+  s.version           = '0.4.2'
+  s.date              = '2013-01-22'
   s.rubyforge_project = 'simultaneous'
 
   ## Make sure your summary is short. The description may be as long

data/test/test_task.rb

@@ -2,20 +2,29 @@ require File.expand_path('../helper', __FILE__)
 
 describe Simultaneous::TaskDescription do
   it "should generate the right default logfile location" do
-    mock(Dir).pwd { "/application/current" }
+    mock(Dir).pwd.times(any_times) { "/application/current" }
     task = Simultaneous::TaskDescription.new(:fish, "/path/to/fish")
     task.logfile.must_equal "/application/current/log/fish-task.log"
   end
-  it "should generate the right default logfile location" do
+
+  it "should generate the right default logfile relative to the configured pwd" do
+    # mock(Dir).pwd { "/application/current" }
+    task = Simultaneous::TaskDescription.new(:fish, "/path/to/fish", {:pwd => "/application/home", :log => "log/task.log"})
+    task.logfile.must_equal "/application/home/log/task.log"
+  end
+
+  it "should use the configured logfile location" do
     task = Simultaneous::TaskDescription.new(:fish, "/path/to/fish", {:logfile => "/var/log/fish.log"})
     task.logfile.must_equal "/var/log/fish.log"
   end
-  it "should generate the right default logfile location" do
+
+  it "should use the configured log location" do
     task = Simultaneous::TaskDescription.new(:fish, "/path/to/fish", {:log => "/var/log/fish.log"})
     task.logfile.must_equal "/var/log/fish.log"
   end
 
   it "should set the right pwd" do
-    flunk
+    task = Simultaneous::TaskDescription.new(:fish, "/path/to/fish", {:pwd => "/application/home", :log => "log/task.log"})
+    task.pwd.must_equal "/application/home"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simultaneous
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simultaneous
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Simultaneous is the background task launcher used by Spontaneous CMS