summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2006-04-16 02:23:23 +0000
committermurphy <murphy@rubychan.de>2006-04-16 02:23:23 +0000
commitff9cbcf8c58e81bcee2e961e8b2033e6e336c6e9 (patch)
tree38c0a2067d672c2a5a3d9d591de677f75ffc14ef
parent224bb733aa9c2e030f6ec39e34c2209aff4d1ac3 (diff)
downloadcoderay-ff9cbcf8c58e81bcee2e961e8b2033e6e336c6e9.tar.gz
test.rake: debug tags deleted (use rake test diff=+)
gem.rake: renamed up_gem to upload and fixed. Rakefile: added upload meta task. ftp.rb: do login only once.
-rw-r--r--Rakefile2
-rw-r--r--rake_helpers/ftp.rb16
-rw-r--r--rake_tasks/gem.rake6
-rw-r--r--rake_tasks/test.rake7
4 files changed, 15 insertions, 16 deletions
diff --git a/Rakefile b/Rakefile
index 753508e..5e555e9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,3 +15,5 @@ for task_file in Dir['rake_tasks/*.rake']
end
task :default => 'gem:make'
+
+task :upload => %w( gem:upload doc:upload example:upload )
diff --git a/rake_helpers/ftp.rb b/rake_helpers/ftp.rb
index c1eb98c..5a04549 100644
--- a/rake_helpers/ftp.rb
+++ b/rake_helpers/ftp.rb
@@ -1,18 +1,20 @@
+FTP_YAML = 'ftp.yaml'
+FTP_DOMAIN = 'cycnus.de'
+FTP_CODERAY_DIR = 'public_html/raindark/coderay'
+
def prepare_ftp
require 'net/ftp'
require 'yaml'
$username = File.exist?(FTP_YAML) ? YAML.load_file(FTP_YAML)[:username] : 'anonymous'
+ g "ftp login, password for #$username needed: "
+ $password = $stdin.gets.chomp
end
-FTP_YAML = 'ftp.yaml'
-FTP_DOMAIN = 'cycnus.de'
-FTP_CODERAY_DIR = 'public_html/raindark/coderay'
-
def cYcnus_ftp
- prepare_ftp
+ prepare_ftp unless $password
Net::FTP.open(FTP_DOMAIN) do |ftp|
- g 'ftp login, password needed: '
- ftp.login $username, $stdin.gets
+ g "login for #$username..."
+ ftp.login $username, $password
gn 'logged in.'
yield ftp
end
diff --git a/rake_tasks/gem.rake b/rake_tasks/gem.rake
index bf2e2e1..bc81d5e 100644
--- a/rake_tasks/gem.rake
+++ b/rake_tasks/gem.rake
@@ -84,10 +84,10 @@ namespace :gem do
end
desc 'Upload gemfile to ' + FTP_DOMAIN
- task :up_gem => :make do
+ task :upload => :make do
gn 'Uploading gem:'
- Dir.chdir 'gem_server' do
- cYcnus_ftp do |ftp|
+ cYcnus_ftp do |ftp|
+ Dir.chdir 'gem_server' do
uploader = uploader_for ftp
ftp.chdir FTP_CODERAY_DIR
%w(yaml yaml.Z).each &uploader
diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake
index b9cc2a6..9a60c6b 100644
--- a/rake_tasks/test.rake
+++ b/rake_tasks/test.rake
@@ -8,12 +8,7 @@ namespace :test do
task :scanners do
system 'ruby -w ./test/suite.rb'
end
-
- desc 'Test CodeRay with debugging'
- task :scanners_debug do
- system 'ruby -w -d ./test/suite.rb'
- end
end
task :test => 'test:scanners'
-task :debug => 'test:scanners_debug'
+task :demos => 'test:demos'