s4t-utils 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,7 @@
+Version 1.0.4 -- in progress
+  * Merged two Rakefiles into one concise one.
+  * Added "hoelike" - extensions to hoe tasks.
+
 Version 1.0.3
   * Added with_stdin and capturing_stdout
   * Added set_test_paths and set_script_lib_path
@@ -14,4 +18,4 @@ Version 1.0.1
 
 Version 1.0.0
   * Made into a gem.
-  * Minor improvements to some methods.
+  * Minor improvements to some methods.

data/Manifest.txt

@@ -4,7 +4,6 @@ Manifest.txt
 NOTES.txt
 README.txt
 Rakefile
-Rakefile.hoe
 bin/make-s4t-project.rb
 bin/s4t-script-location-file
 data/make-s4t-project/README-skeleton
@@ -24,6 +23,7 @@ lib/s4t-utils/command-line.rb
 lib/s4t-utils/error-handling.rb
 lib/s4t-utils/friendly-format.rb
 lib/s4t-utils/hacks.rb
+lib/s4t-utils/hoelike.rb
 lib/s4t-utils/load-path-auto-adjuster.rb
 lib/s4t-utils/more-assertions.rb
 lib/s4t-utils/os.rb

data/Rakefile

@@ -1,18 +1,31 @@
-$started_from_rakefile=true
+#!/usr/bin/env ruby
+#
+#  Created by Brian Marick on 2007-07-03.
+#  Copyright (c) 2007. All rights reserved.
 
-PACKAGE_ROOT = Dir.pwd
-$:.unshift("#{PACKAGE_ROOT}/lib")
-require 's4t-utils'
-include S4tUtils
+require 'hoe'
+$:.unshift(File.join(Dir.pwd, "lib"))
+require 's4t-utils/version'
 
-MyFileSystemName='s4t-utils'  # No ".rb" extension.
-MyModuleName='S4tUtils'
-MyRdocFiles = FileList.new("lib/#{MyFileSystemName}.rb",
-                           "lib/#{MyFileSystemName}/*.rb").exclude('**/third-party/**')
-			   
-require 's4t-utils/rakefile-common'
+PROJECT='s4t-utils'
+THIS_RELEASE=S4tUtils::Version
 
-desc "Push new version of project homepage."
-task 'homepage' do
-  `cd homepage;  scp * marick@rubyforge.org:/var/www/gforge-projects/#{MyFileSystemName}/`
-end
+Hoe.new(PROJECT, THIS_RELEASE) do |p|
+  p.rubyforge_name = PROJECT
+  p.changes = "See History.txt"
+  p.author = "Brian Marick"
+  p.description = "Unified interface to command-line, environment, and configuration files."
+  p.summary = p.description
+  p.email = "marick@exampler.com"
+  p.extra_deps = []
+  p.test_globs = "test/**/*tests.rb"
+  p.rdoc_pattern = %r{README.txt|History.txt|lib/s4t-utils.rb|lib/s4t-utils/.+\.rb}
+  p.url = "http://s4t-utils.rubyforge.org"
+  p.remote_rdoc_dir = 'rdoc'
+end
+
+require 's4t-utils/hoelike'
+HoeLike.new(:project => PROJECT, :this_release => THIS_RELEASE,
+            :login => "marick@rubyforge.org",
+            :web_site_root => 'homepage', 
+            :export_root => "#{S4tUtils.find_home}/tmp/exports")

data/lib/s4t-utils/hoelike.rb

@@ -0,0 +1,123 @@
+#!/usr/bin/env ruby
+#
+#  Created by Brian Marick on 2007-10-03.
+#  Copyright (c) 2007. All rights reserved.
+require 's4t-utils/rake-task-helpers'
+require 's4t-utils/os'
+
+# These are at the top level so that they can be available in the context
+# of a running task.
+def assert_in(dir, taskname) # :nodoc:
+  unless Dir.pwd == dir
+    puts "Run task '#{taskname}' from directory '#{dir}'."
+    exit 1
+  end
+end
+
+def confirmed_step(name) # :nodoc:
+  STDOUT.puts "** #{name} **"
+  STDOUT.puts `rake #{name}`
+  STDOUT.print 'OK? > '
+  exit if STDIN.readline =~ /[nN]/
+end
+
+
+
+# HoeLike is intended to be used with the Hoe gem. It adds some 
+# Rake tasks.
+#
+# * slow: Runs tests whose filenames are '*-slowtests.rb'
+# * fast: Runs all tests, skipping slow tests.
+# * upload_pages: copy website pages up to Rubyforge
+# * export_and_upload_pages: upload_pages without any garbage or .svn
+#   files lying around.
+# * tag_release: Make a Subversion tag called rel-X.Y.Z. Release number
+#   is gotten from lib/name/version.rb.
+# * export: export entire project to pristine temp directory.
+# * release_everything: Release code, rdoc, and website to rubyforge.
+class HoeLike
+  
+  def initialize(keys)
+    @keys = keys
+    project = pull(:project)
+    this_release = pull(:this_release)
+    login = pull(:login)
+    web_site_root = pull(:web_site_root)
+    export_root = pull(:export_root)
+    
+    root = "svn+ssh://#{login}/var/svn/#{project}"
+    project_exports = "#{export_root}/#{project}"
+    
+    desc "Run fast tests."
+    task 'fast' do
+      S4tUtils.run_particular_tests('test', 'fast')
+    end
+    
+    desc "Run slow tests."
+    task 'slow' do
+      S4tUtils.run_particular_tests('test', 'slow')
+    end
+    
+    desc "Upload all the web pages (as part of release)"
+    task 'upload_pages' do | task |
+      assert_in(project_exports, task.name)
+      exec = "scp -r #{web_site_root}/* #{login}:/var/www/gforge-projects/#{project}/"
+      puts exec
+      system(exec)
+    end
+    
+    desc "Upload all the web pages (not as part of release)"
+    task 'export_and_upload_pages' => 'export' do | task |
+      Dir.chdir(project_exports) do
+        exec = "scp -r #{web_site_root}/* #{login}:/var/www/gforge-projects/#{project}/"
+        puts exec
+        system(exec)
+      end
+    end
+
+    desc "Tag release with current version."
+    task 'tag_release' do
+      from = "#{root}/trunk"
+      to = "#{root}/tags/rel-#{this_release}"
+      message = "Release #{this_release}"
+      exec = "svn copy -m '#{message}' #{from} #{to}"
+      puts exec
+      system(exec)
+    end
+    
+    desc "Export to #{project_exports}"
+    task 'export' do 
+      Dir.chdir(export_root) do
+        rm_rf project
+        exec = "svn export #{root}/trunk #{project}"
+        puts exec
+        system exec
+      end
+    end
+    
+
+    desc "Complete release of everything - asks for confirmation after steps"
+    # Because in Ruby 1.8.6, Rake doesn't notice subtask failures, so it
+    # won't stop for us.
+    task 'release_everything' do  
+      confirmed_step 'check_manifest'
+      confirmed_step 'export'
+      Dir.chdir(project_exports) do
+        puts "Working in #{Dir.pwd}"
+        confirmed_step 'test'
+        confirmed_step 'upload_pages'
+        confirmed_step 'publish_docs'
+        ENV['VERSION'] = this_release
+        confirmed_step 'release'
+      end
+      confirmed_step 'tag_release'
+    end
+
+  end
+  
+  private
+  
+  def pull(key)
+    @keys[key] || raise("Missing key #{key.inspect}")
+  end
+end

data/lib/s4t-utils/version.rb

@@ -1,3 +1,3 @@
 module S4tUtils
-  Version = '1.0.3'
+  Version = '1.0.4'
 end

data/test/test-util-tests.rb

@@ -1,7 +1,7 @@
 # This file should be copied into a test ending in 'tests.rb' so that
 # the Rakefile knows it's a test.
 
-require "set-standalone-test-paths.rb" unless $started_from_rakefile
+require "set-standalone-test-paths.rb"
 require 'test/unit'
 require 's4t-utils'
 include S4tUtils

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: s4t-utils
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-09-27 00:00:00 -05:00
-summary: _Everyday Scripting with Ruby_ utilities.
+  version: 1.0.4
+date: 2007-11-19 00:00:00 -06:00
+summary: Unified interface to command-line, environment, and configuration files.
 require_paths: 
 - lib
 email: marick@exampler.com
 homepage: http://s4t-utils.rubyforge.org
 rubyforge_project: s4t-utils
-description: _Everyday Scripting with Ruby_ utilities.
+description: Unified interface to command-line, environment, and configuration files.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -35,7 +35,6 @@ files:
 - NOTES.txt
 - README.txt
 - Rakefile
-- Rakefile.hoe
 - bin/make-s4t-project.rb
 - bin/s4t-script-location-file
 - data/make-s4t-project/README-skeleton
@@ -55,6 +54,7 @@ files:
 - lib/s4t-utils/error-handling.rb
 - lib/s4t-utils/friendly-format.rb
 - lib/s4t-utils/hacks.rb
+- lib/s4t-utils/hoelike.rb
 - lib/s4t-utils/load-path-auto-adjuster.rb
 - lib/s4t-utils/more-assertions.rb
 - lib/s4t-utils/os.rb

data/Rakefile.hoe

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Brian Marick on 2007-07-03.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'hoe'
-require 'lib/s4t-utils/version'
-
-
-Hoe.new("s4t-utils", S4tUtils::Version) do |p|
-  p.rubyforge_name = "s4t-utils"
-  p.changes = "See History.txt"
-  p.author = "Brian Marick"
-  p.description = "_Everyday Scripting with Ruby_ utilities."
-  p.summary = p.description
-  p.email = "marick@exampler.com"
-  p.extra_deps = []
-  p.test_globs = "test/**/*-tests.rb"
-  p.rdoc_pattern = %r{README.txt|History.txt|lib/s4t-utils.rb|lib/s4t-utils/.+\.rb}
-  p.url = "http://s4t-utils.rubyforge.org"
-  p.remote_rdoc_dir = 'rdoc'
-end
-
-desc "Tag release with current version."
-task 'tag_release' do
-  root = "svn+ssh://marick@rubyforge.org/var/svn/s4t-utils"
-  from = "#{root}/trunk"
-  to = "#{root}/tags/rel-#{S4tUtils::Version}"
-  message = "Release #{S4tUtils::Version}"
-  exec = "svn copy -m '#{message}' #{from} #{to}"
-  puts exec
-  system(exec)
-end