hoe 1.1.6 → 1.1.7

data/History.txt

@@ -1,3 +1,11 @@
+= 1.1.7 2007-01-10
+
+* extra_deps is now self-healing, and ensures no (direct) cycles.
+* cleans check_manifest for CVS projects.
+* rubyforge changes for config.
+* Now uses rsync for publish_docs. YAY for fast!
+* Bug #7193 fix spelling of 'synopsys'.  Submitted by Jacob Atzen.
+
 = 1.1.6 2006-11-29
 
 * Fix release to work correctly with need_zip and need_tar.

data/README.txt

@@ -38,7 +38,7 @@ See class rdoc for help. Hint: ri Hoe
 * Provides 'sow' for quick project directory creation.
 * Make making and maintaining Rakefiles fun and easy.
 
-== SYNOPSYS:
+== SYNOPSIS:
 
   % sow [group] project
 

data/bin/sow

@@ -50,7 +50,7 @@ Dir.chdir project do
 
   files = {
     "History.txt" => "== 1.0.0 / #{Time.new.strftime("%Y-%m-%d")}\n\n* 1 major enhancement\n  * Birthday!\n\n",
-    "README.txt" => "#{project}\n    by #{X} (your name)\n    #{X} (url)\n\n== DESCRIPTION:\n  \n#{X} (describe your package)\n\n== FEATURES/PROBLEMS:\n  \n* #{X} (list of features or problems)\n\n== SYNOPSYS:\n\n  #{X} (code sample of usage)\n\n== REQUIREMENTS:\n\n* #{X} (list of requirements)\n\n== INSTALL:\n\n* #{X} (sudo gem install, anything else)\n\n== LICENSE:\n\n(The MIT License)\n\nCopyright (c) #{Time.new.strftime("%Y")} #{X}\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
+    "README.txt" => "#{project}\n    by #{X} (your name)\n    #{X} (url)\n\n== DESCRIPTION:\n  \n#{X} (describe your package)\n\n== FEATURES/PROBLEMS:\n  \n* #{X} (list of features or problems)\n\n== SYNOPSIS:\n\n  #{X} (code sample of usage)\n\n== REQUIREMENTS:\n\n* #{X} (list of requirements)\n\n== INSTALL:\n\n* #{X} (sudo gem install, anything else)\n\n== LICENSE:\n\n(The MIT License)\n\nCopyright (c) #{Time.new.strftime("%Y")} #{X}\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
     "Manifest.txt" => "",
     "bin/#{file_name}" => "",
     "lib/#{file_name}.rb" => "class #{klass}\n  VERSION = '1.0.0'\nend",

data/lib/hoe.rb

@@ -7,6 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rbconfig'
+require 'rubyforge'
 
 ##
 # hoe - a tool to help rake
@@ -22,7 +23,7 @@ require 'rbconfig'
 # Use this as a minimal starting point:
 #
 #   require 'hoe'
-# 
+#
 #   Hoe.new("project_name", '1.0.0') do |p|
 #     p.rubyforge_name = "rf_project"
 #     # add other details here
@@ -31,7 +32,7 @@ require 'rbconfig'
 #   # add other tasks here
 #
 # === Tasks Provided:
-# 
+#
 # * announce         - Generate email announcement file and post to rubyforge.
 # * audit            - Run ZenTest against the package
 # * check_manifest   - Verify the manifest
@@ -89,7 +90,7 @@ require 'rbconfig'
 # * RUBY_FLAGS - Used to specify flags to ruby [has smart default].
 
 class Hoe
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 
   rubyprefix = Config::CONFIG['prefix']
   sitelibdir = Config::CONFIG['sitelibdir']
@@ -128,15 +129,24 @@ class Hoe
     self.need_tar = true
     self.need_zip = false
 
+    yield self if block_given?
+
+    hoe_deps = {
+      'rake' => ">= #{RAKEVERSION}",
+      'rubyforge' => ">= #{::RubyForge::VERSION}",
+    }
+
+    self.extra_deps = Array(extra_deps) # just in case user used = instead of <<
+    self.extra_deps = [extra_deps] unless
+      extra_deps.empty? or Array === extra_deps.first
     if name == 'hoe' then
-      extra_deps << ['rake']
-      extra_deps << ['rubyforge', '>= 0.3.1']
+      hoe_deps.each do |pkg, version|
+        extra_deps << [pkg, version]
+      end
     else
-      extra_deps << ['hoe', ">= #{VERSION}"]
+      extra_deps << ['hoe', ">= #{VERSION}"] unless hoe_deps.has_key? name
     end
 
-    yield self if block_given?
-
     define_tasks
   end
 
@@ -259,7 +269,6 @@ class Hoe
     task :release => [:clean, :package] do |t|
       v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
       abort "Versions don't match #{v} vs #{version}" if v != version
-      require 'rubyforge'
       pkg = "pkg/#{name}-#{version}"
 
       if $DEBUG then
@@ -271,7 +280,7 @@ class Hoe
       puts "Logging in"
       rf.login
 
-      c = rf.config
+      c = rf.userconfig
       c["release_notes"] = description if description
       c["release_changes"] = changes if changes
       c["preformatted"] = true
@@ -308,23 +317,11 @@ class Hoe
 
     desc 'Publish RDoc to RubyForge'
     task :publish_docs => [:clean, :docs] do
-      config = YAML.load(File.read(File.expand_path("~/.rubyforge/config.yml")))
-      user = "#{config["username"]}@rubyforge.org"
-      project = "/var/www/gforge-projects/#{rubyforge_name}"
-      project += "/#{name}" if rubyforge_name != name
+      config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+      host = "#{config["username"]}@rubyforge.org"
+      remote_dir = "/var/www/gforge-projects/#{rubyforge_name}/#{name}"
       local_dir = 'doc'
-      pub = Rake::SshDirPublisher.new user, project, local_dir
-      if rubyforge_name != name then
-        def pub.upload
-          begin
-            super
-          rescue
-            # project directory probably doesn't exist, transfer as a whole
-            sh %{scp -qr #{local_dir} #{host}:#{remote_dir}}
-          end
-        end
-      end
-      pub.upload
+      sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
     end
 
     ############################################################
@@ -384,7 +381,7 @@ class Hoe
       files = []
       Find.find '.' do |path|
         next unless File.file? path
-        next if path =~ /svn|tmp$/
+        next if path =~ /\.svn|tmp$|CVS/
         files << path[2..-1]
       end
       files = files.sort.join "\n"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.7
+rubygems_version: 0.9.0.9
 specification_version: 1
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
-date: 2006-11-29 00:00:00 -08:00
+  version: 1.1.7
+date: 2007-01-10 00:00:00 -05:00
 summary: Hoe is a way to write Rakefiles much easier and cleaner.
 require_paths: 
 - lib
@@ -50,20 +50,20 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rubyforge
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rake
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.7.1
     version: