capsaicin 0.1.8 → 0.1.9

data/Rakefile

@@ -24,7 +24,7 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
@@ -43,19 +43,6 @@ rescue LoadError
 end
 
 # ---------  RDoc Documentation ---------
-desc "Generate RDoc documentation"
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.options << '--line-numbers' << '--inline-source' <<
-    '--main' << 'README.rdoc' <<
-    '--title' << "Capsaicin" <<
-    '--charset' << 'utf-8'
-  rdoc.rdoc_dir = "doc"
-  rdoc.rdoc_files.include 'README*'
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-task :default => :build
-
 Jeweler::GemcutterTasks.new
 Jeweler::RubyforgeTasks.new do |rubyforge|
   rubyforge.doc_task = "rdoc"
@@ -65,7 +52,7 @@ end
 task :default => :test
 
 require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+Rake::RDocTask.new(:rdoc) do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
@@ -76,7 +63,7 @@ Rake::RDocTask.new do |rdoc|
     '--main' << 'README.rdoc' <<
     '--charset' << 'utf-8'
 
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = 'doc'
   rdoc.title = "Capsaicin #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:patch: 8
-:build: 
-:major: 0
-:minor: 1
+--- 
+:major: 0
+:minor: 1
+:build: 
+:patch: 9

data/capsaicin.gemspec

@@ -1,71 +1,71 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{capsaicin}
-  s.version = "0.1.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joe Khoobyar"]
-  s.date = %q{2010-05-03}
-  s.description = %q{Spicy capistrano extensions for various needs}
-  s.email = %q{joe@ankhcraft.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "capsaicin.gemspec",
-     "lib/capistrano/recipes/deploy/strategy/local_copy.rb",
-     "lib/capsaicin.rb",
-     "lib/capsaicin/bundle.rb",
-     "lib/capsaicin/files.rb",
-     "lib/capsaicin/files/local.rb",
-     "lib/capsaicin/files/remote.rb",
-     "lib/capsaicin/invocation.rb",
-     "lib/capsaicin/namespace.rb",
-     "lib/capsaicin/service.rb",
-     "lib/capsaicin/service/command.rb",
-     "lib/capsaicin/service/crm.rb",
-     "lib/capsaicin/service/lsb.rb",
-     "lib/capsaicin/service/windows.rb",
-     "lib/capsaicin/sys.rb",
-     "lib/capsaicin/ui.rb",
-     "test/helper.rb",
-     "test/test_local_files.rb"
-  ]
-  s.homepage = %q{http://github.com/joekhoobyar/capsaicin}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{capsaicin}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Joe Khoobyar's spicy capistrano extensions}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_local_files.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capistrano>, [">= 2.0"])
-      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0.5"])
-    else
-      s.add_dependency(%q<capistrano>, [">= 2.0"])
-      s.add_dependency(%q<archive-tar-minitar>, [">= 0.5"])
-    end
-  else
-    s.add_dependency(%q<capistrano>, [">= 2.0"])
-    s.add_dependency(%q<archive-tar-minitar>, [">= 0.5"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{capsaicin}
+  s.version = "0.1.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Joe Khoobyar"]
+  s.date = %q{2010-06-15}
+  s.description = %q{Spicy capistrano extensions for various needs}
+  s.email = %q{joe@ankhcraft.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "capsaicin.gemspec",
+     "lib/capistrano/recipes/deploy/strategy/local_copy.rb",
+     "lib/capsaicin.rb",
+     "lib/capsaicin/bundle.rb",
+     "lib/capsaicin/files.rb",
+     "lib/capsaicin/files/local.rb",
+     "lib/capsaicin/files/remote.rb",
+     "lib/capsaicin/invocation.rb",
+     "lib/capsaicin/namespace.rb",
+     "lib/capsaicin/service.rb",
+     "lib/capsaicin/service/command.rb",
+     "lib/capsaicin/service/crm.rb",
+     "lib/capsaicin/service/lsb.rb",
+     "lib/capsaicin/service/windows.rb",
+     "lib/capsaicin/sys.rb",
+     "lib/capsaicin/ui.rb",
+     "test/capsaicin/files/local_test.rb",
+     "test/helper.rb"
+  ]
+  s.homepage = %q{http://github.com/joekhoobyar/capsaicin}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{capsaicin}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Joe Khoobyar's spicy capistrano extensions}
+  s.test_files = [
+    "test/capsaicin/files/local_test.rb",
+     "test/helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<capistrano>, [">= 2.0"])
+      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0.5"])
+    else
+      s.add_dependency(%q<capistrano>, [">= 2.0"])
+      s.add_dependency(%q<archive-tar-minitar>, [">= 0.5"])
+    end
+  else
+    s.add_dependency(%q<capistrano>, [">= 2.0"])
+    s.add_dependency(%q<archive-tar-minitar>, [">= 0.5"])
+  end
+end
+

data/lib/capistrano/recipes/deploy/strategy/local_copy.rb

@@ -1,12 +1,12 @@
 require 'capistrano/recipes/deploy/strategy/base'
 require 'tempfile'
 
-module Capistrano
-  module Deploy
-    module Strategy
-      class LocalCopy < Base
+module Capistrano # :nodoc:
+  module Deploy # :nodoc:
+    module Strategy # :nodoc:
+      class LocalCopy < Base # :nodoc:
 
-        def deploy!
+        def deploy! # :nodoc:
           logger.debug "compressing local copy to #{filename}"
           local_files.tar_cz filename, '.', :verbose=>false do |item|
             if (item=item[2..-1]) and item.length > 0
@@ -28,36 +28,36 @@ module Capistrano
           FileUtils.rm_rf destination rescue nil
         end
 
-        def check!
+        def check! # :nodoc:
         end
 
         private
 
-          def local_copy_dir
+          def local_copy_dir # :nodoc:
             @local_copy_dir ||= configuration.fetch(:local_copy_dir, '.')
           end
 
-          def copy_exclude
+          def copy_exclude # :nodoc:
             @copy_exclude ||= Array(configuration.fetch(:copy_exclude, %w(.*)))
           end
 
-          def copy_prune
+          def copy_prune # :nodoc:
             @copy_prune ||= Array(configuration.fetch(:copy_exclude, %w(.svn .git)))
           end
 
-          def copy_directory_only
+          def copy_directory_only # :nodoc:
             @copy_directory_only ||= Array(configuration.fetch(:copy_directory_only, %w(log tmp)))
           end
 
-          def filename
+          def filename # :nodoc:
             @filename ||= File.join(Dir.tmpdir, "#{configuration.fetch(:application, 'local_copy')}.tgz")
           end
 
-          def remote_dir
+          def remote_dir # :nodoc:
             @remote_dir ||= configuration[:copy_remote_dir] || "/tmp"
           end
 
-          def remote_filename
+          def remote_filename # :nodoc:
             @remote_filename ||= File.join(remote_dir, File.basename(filename))
           end
       end

data/lib/capsaicin/files/local.rb

@@ -136,6 +136,10 @@ module Capsaicin
         require 'archive/tar/minitar' unless defined? Archive::Tar::Minitar
         Archive::Tar::Minitar
       end
+      
+      def fu_output_message(msg)
+        logger.trace msg if logger
+      end
     end
   end
 end

data/test/capsaicin/files/local_test.rb

@@ -0,0 +1,174 @@
+require 'helper'
+require 'tmpdir'
+require 'capsaicin/files'
+require 'capsaicin/files/local'
+
+class Capsaicin::Files::LocalTest < Test::Unit::TestCase
+
+  def setup
+    @local = CapistranoMock.new
+    @local.extend Capsaicin::Files::Local
+  end
+  
+  def teardown
+    @tmpdir and FileUtils.rm_rf(@tmpdir)
+  end
+  
+  def test_exists
+    assert @local.exists?(__FILE__)
+    assert_equal "test -e #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_exists
+    assert ! @local.exists?(__FILE__+'/nope')
+  end
+  
+  def test_readable
+    assert @local.readable?(__FILE__)
+    assert_equal "test -r #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_readable
+    assert ! @local.readable?(__FILE__+'/nope')
+  end
+  
+  def test_writable
+    assert @local.writable?(Dir.tmpdir)
+    assert_equal "test -w #{Dir.tmpdir}", @local.logbuf.string.strip
+  end
+  
+  def test_not_writable
+    assert ! @local.writable?(__FILE__+'/nope')
+  end
+  
+  def test_file
+    assert @local.file?(__FILE__)
+    assert_equal "test -f #{__FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_file
+    assert ! @local.file?(__FILE__+'/nope')
+  end
+  
+  def test_directory
+    assert @local.directory?(File.dirname(__FILE__))
+    assert_equal "test -d #{File.dirname __FILE__}", @local.logbuf.string.strip
+  end
+  
+  def test_not_directory
+    assert ! @local.directory?(__FILE__)
+  end
+
+  def test_mkdir
+    assert @local.mkdir(d = tmpdir('test-mkdir'))
+    assert File.directory?(d)
+    assert_equal "mkdir #{d}", @local.logbuf.string.strip
+  end
+
+  def test_mkdir_not_p
+    assert_raise Errno::ENOENT do
+      @local.mkdir(tmpdir('test-mkdir','p'))
+    end
+    assert ! File.directory?(d = tmpdir('test-mkdir','p'))
+    assert_equal "mkdir #{d}", @local.logbuf.string.strip
+  end
+
+  def test_mkdir_p
+    assert @local.mkdir_p(d = tmpdir('test-mkdir','p'))
+    assert File.directory?(d)
+    assert_equal "mkdir -p #{d}", @local.logbuf.string.strip
+  end
+
+  def test_mkdir_p_one
+    assert @local.mkdir_p(d = tmpdir('test-mkdir-p'))
+    assert File.directory?(d)
+    assert_equal "mkdir -p #{d}", @local.logbuf.string.strip
+  end
+
+  def test_rmdir
+    FileUtils.mkdir(d = tmpdir('test-rmdir'))
+    assert @local.rmdir(d)
+    assert ! File.directory?(d)
+    assert ! File.exists?(d)
+    assert_equal "rmdir #{d}", @local.logbuf.string.strip
+  end
+
+  def test_cp
+    assert_nil @local.cp(__FILE__, f = tmpdir('test-cp'))
+    assert_equal File.read(__FILE__), File.read(f)
+    assert_equal "cp #{__FILE__} #{f}", @local.logbuf.string.strip
+  end
+
+  def test_cp_r
+    assert_nil @local.cp_r(File.dirname(__FILE__), d = tmpdir('test-cp-r'))
+    assert_equal File.read(__FILE__), File.read(File.join(d,File.basename(__FILE__)))
+    assert_equal "cp -r #{File.dirname __FILE__} #{d}", @local.logbuf.string.strip
+  end
+
+  def test_rm
+    FileUtils.cp(__FILE__, f = tmpdir('test-cp'))
+    assert @local.rm(f)
+    assert ! File.exists?(f)
+    assert_equal "rm #{f}", @local.logbuf.string.strip
+  end
+
+  def test_rm_missing
+    assert_raise Errno::ENOENT do
+	    assert @local.rm(tmpdir('test-cp'))
+	  end
+    assert_equal "rm #{tmpdir('test-cp')}", @local.logbuf.string.strip
+  end
+
+  def test_rm_f
+    FileUtils.cp(__FILE__, f = tmpdir('test-cp'))
+    assert @local.rm_f(f)
+    assert ! File.exists?(f)
+    assert_equal "rm -f #{f}", @local.logbuf.string.strip
+  end
+
+  def test_rm_f_missing
+    assert @local.rm_f(f = tmpdir('test-cp'))
+    assert ! File.exists?(f)
+    assert_equal "rm -f #{f}", @local.logbuf.string.strip
+  end
+
+  def test_rm_r
+    FileUtils.cp_r(File.dirname(__FILE__), d = tmpdir('test-cp-r'))
+    assert @local.rm_r(d)
+    assert ! File.directory?(d)
+    assert ! File.exists?(d)
+    assert_equal "rm -r #{d}", @local.logbuf.string.strip
+  end
+
+  def test_rm_r_missing
+    assert_raise Errno::ENOENT do
+	    assert @local.rm_r(tmpdir('test-cp-r'))
+	  end
+    assert_equal "rm -r #{tmpdir('test-cp-r')}", @local.logbuf.string.strip
+  end
+
+  def test_rm_rf
+    FileUtils.cp_r(File.dirname(__FILE__), d = tmpdir('test-cp-r'))
+    assert @local.rm_rf(d)
+    assert ! File.directory?(d)
+    assert ! File.exists?(d)
+    assert_equal "rm -rf #{d}", @local.logbuf.string.strip
+  end
+
+  def test_rm_rf_missing
+    assert @local.rm_rf(d = tmpdir('test-cp-r'))
+    assert ! File.directory?(d)
+    assert ! File.exists?(d)
+    assert_equal "rm -rf #{d}", @local.logbuf.string.strip
+  end
+
+protected
+
+  def tmpdir(*args)
+    @tmpdir ||= "#{Dir.tmpdir}/capsaicin".tap do |d|
+	    FileUtils.rm_rf d
+	    FileUtils.mkdir_p d
+	  end
+	  File.join @tmpdir, *args
+  end
+end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'stringio'
+require 'test/unit'
 require 'rubygems'
 require 'capistrano/logger'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -04:00
+date: 2010-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,8 +74,8 @@ files:
 - lib/capsaicin/service/windows.rb
 - lib/capsaicin/sys.rb
 - lib/capsaicin/ui.rb
+- test/capsaicin/files/local_test.rb
 - test/helper.rb
-- test/test_local_files.rb
 has_rdoc: true
 homepage: http://github.com/joekhoobyar/capsaicin
 licenses: []
@@ -107,5 +107,5 @@ signing_key:
 specification_version: 3
 summary: Joe Khoobyar's spicy capistrano extensions
 test_files: 
+- test/capsaicin/files/local_test.rb
 - test/helper.rb
-- test/test_local_files.rb

data/test/test_local_files.rb

@@ -1,58 +0,0 @@
-require 'test/unit'
-require 'helper'
-require 'tmpdir'
-require 'capsaicin/files'
-require 'capsaicin/files/local'
-
-class TestLocalFiles < Test::Unit::TestCase
-
-  def setup
-    @local = CapistranoMock.new
-    @local.extend Capsaicin::Files::Local
-  end
-  
-  def test_exists
-    assert @local.exists?(__FILE__)
-    assert_equal "test -e #{__FILE__}", @local.logbuf.string.strip
-  end
-  
-  def test_not_exists
-    assert ! @local.exists?(__FILE__+'/nope')
-  end
-  
-  def test_readable
-    assert @local.readable?(__FILE__)
-    assert_equal "test -r #{__FILE__}", @local.logbuf.string.strip
-  end
-  
-  def test_not_readable
-    assert ! @local.readable?(__FILE__+'/nope')
-  end
-  
-  def test_writable
-    assert @local.writable?(Dir.tmpdir)
-    assert_equal "test -w #{Dir.tmpdir}", @local.logbuf.string.strip
-  end
-  
-  def test_not_writable
-    assert ! @local.writable?(__FILE__+'/nope')
-  end
-  
-  def test_file
-    assert @local.file?(__FILE__)
-    assert_equal "test -f #{__FILE__}", @local.logbuf.string.strip
-  end
-  
-  def test_not_file
-    assert ! @local.file?(__FILE__+'/nope')
-  end
-  
-  def test_directory
-    assert @local.directory?(File.dirname(__FILE__))
-    assert_equal "test -d #{File.dirname __FILE__}", @local.logbuf.string.strip
-  end
-  
-  def test_not_directory
-    assert ! @local.directory?(__FILE__)
-  end
-end