Updated Rakefile and gemspec

3 files changed, 117 insertions, 128 deletions

diff --git a/CHANGELOG.rdoc b/CHANGES.txt
index 3e3224a..3e3224a 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGES.txt
diff --git a/Rakefile b/Rakefile
index d959b21..9907147 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,85 +1,59 @@
+require "rubygems"
+require "rake"
+require "rake/clean"
+require "rdoc/task"
 
-require 'rubygems'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'fileutils'
-include FileUtils
+task :default => ["build"]
+CLEAN.include [ 'pkg', 'rdoc' ]
+name = "net-ssh-multi"
+
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+require './lib/net/ssh/multi/version'
+version = Net::SSH::Multi::Version::STRING.dup
 
 begin
-  require 'hanna/rdoctask'
+  require "jeweler"
+  Jeweler::Tasks.new do |s|
+    s.version = version
+    s.name = name
+    s.rubyforge_project = s.name
+    s.summary = "Control multiple Net::SSH connections via a single interface."
+    s.description = s.summary
+    s.email = "net-ssh@solutious.com"
+    s.homepage = "https://github.com/net-ssh/net-scp"
+    s.authors = ["Jamis Buck", "Delano Mandelbaum"]
+
+    s.add_dependency 'net-ssh', ">=2.6.4"
+    s.add_dependency 'net-ssh-gateway', ">=1.1.1"
+
+    s.add_development_dependency 'test-unit'
+    s.add_development_dependency 'mocha'
+
+    s.license = "MIT"
+
+    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+    s.cert_chain  = ['gem-public_cert.pem']
+  end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  require 'rake/rdoctask'
-end
-
-
-task :default => :package
- 
-# CONFIG =============================================================
-
-# Change the following according to your needs
-README = "README.rdoc"
-CHANGES = "CHANGELOG.rdoc"
-THANKS = ''
-
-# Files and directories to be deleted when you run "rake clean"
-CLEAN.include [ 'pkg', '*.gem', '.config', 'doc']
-
-# Virginia assumes your project and gemspec have the same name
-name = 'net-ssh-multi'
-load "#{name}.gemspec"
-version = @spec.version
-
-# That's it! The following defaults should allow you to get started
-# on other things. 
-
-
-# TESTS/SPECS =========================================================
-
-
-
-# INSTALL =============================================================
-
-Rake::GemPackageTask.new(@spec) do |p|
-  p.need_tar = true if RUBY_PLATFORM !~ /mswin/
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-task :build => [ :package ]
-task :release => [ :rdoc, :package ]
-task :install => [ :rdoc, :package ] do
-	sh %{sudo gem install pkg/#{name}-#{version}.gem}
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs = ["lib", "test"]
 end
-task :uninstall => [ :clean ] do
-	sh %{sudo gem uninstall #{name}}
-end
-
-
-# RUBYFORGE RELEASE / PUBLISH TASKS ==================================
-
-if @spec.rubyforge_project
-  desc 'Publish website to rubyforge'
-  task 'publish:rdoc' => 'doc/index.html' do
-    sh "scp -r doc/* rubyforge.org:/var/www/gforge-projects/#{name}/ssh/v2/api/"
-  end
-
-  desc 'Public release to rubyforge'
-  task 'publish:gem' => [:package] do |t|
-    sh <<-end
-      rubyforge add_release -o Any -a #{CHANGES} -f -n #{README} #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
-      rubyforge add_file -o Any -a #{CHANGES} -f -n #{README} #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
-    end
-  end
-end
-
-
-
-# RUBY DOCS TASK ==================================
 
-Rake::RDocTask.new do |t|
-	t.rdoc_dir = 'doc'
-	t.title    = @spec.summary
-	t.options << '--line-numbers' << '-A cattr_accessor=object'
-	t.options << '--charset' << 'utf-8'
-	t.rdoc_files.include(README)
-	t.rdoc_files.include(CHANGES)
-	t.rdoc_files.include('lib/**/*.rb')
+extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
+RDoc::Task.new do |rdoc|
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "#{name} #{version}"
+  rdoc.generator = 'hanna' # gem install hanna-nouveau
+  rdoc.main = 'README.rdoc'
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("bin/*.rb")
+  rdoc.rdoc_files.include("lib/**/*.rb")
+  extra_files.each { |file|
+    rdoc.rdoc_files.include(file) if File.exists?(file)
+  }
 end
diff --git a/net-ssh-multi.gemspec b/net-ssh-multi.gemspec
index fa7c6ef..b22b7b1 100644
--- a/net-ssh-multi.gemspec
+++ b/net-ssh-multi.gemspec
@@ -1,59 +1,74 @@
-@spec = Gem::Specification.new do |s|
-	s.name = "net-ssh-multi"
-  s.rubyforge_project = 'net-ssh-multi'
-	s.version = "1.1"
-	s.summary = "Control multiple Net::SSH connections via a single interface."
-	s.description = s.summary
-	s.authors = ["Jamis Buck", "Delano Mandelbaum"]
-	s.email = ["net-ssh@solutious.com"]
-	s.homepage = "http://github.com/net-ssh/net-ssh"
-  
-  s.extra_rdoc_files = %w[README.rdoc CHANGELOG.rdoc]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubygems_version = '1.3.2'
-  
-  s.executables = %w[]
-  
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "net-ssh-multi"
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jamis Buck", "Delano Mandelbaum"]
+  s.cert_chain = ["gem-public_cert.pem"]
+  s.date = "2013-02-06"
+  s.description = "Control multiple Net::SSH connections via a single interface."
+  s.email = "net-ssh@solutious.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGES.txt",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "lib/net/ssh/multi.rb",
+    "lib/net/ssh/multi/channel.rb",
+    "lib/net/ssh/multi/channel_proxy.rb",
+    "lib/net/ssh/multi/dynamic_server.rb",
+    "lib/net/ssh/multi/pending_connection.rb",
+    "lib/net/ssh/multi/server.rb",
+    "lib/net/ssh/multi/server_list.rb",
+    "lib/net/ssh/multi/session.rb",
+    "lib/net/ssh/multi/session_actions.rb",
+    "lib/net/ssh/multi/subsession.rb",
+    "lib/net/ssh/multi/version.rb",
+    "net-ssh-multi.gemspec",
+    "test/channel_test.rb",
+    "test/common.rb",
+    "test/multi_test.rb",
+    "test/server_test.rb",
+    "test/session_actions_test.rb",
+    "test/session_test.rb",
+    "test/test_all.rb"
+  ]
+  s.homepage = "https://github.com/net-ssh/net-scp"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "net-ssh-multi"
+  s.rubygems_version = "1.8.25"
+  s.signing_key = "/mnt/gem/gem-private_key.pem"
+  s.summary = "Control multiple Net::SSH connections via a single interface."
+
   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<net-ssh>, [">= 2.1.4"])
-      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.6.4"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.1.1"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<net-ssh>, [">= 2.1.4"])
-      s.add_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+      s.add_dependency(%q<net-ssh>, [">= 2.6.4"])
+      s.add_dependency(%q<net-ssh-gateway>, [">= 1.1.1"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<net-ssh>, [">= 2.1.4"])
-    s.add_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+    s.add_dependency(%q<net-ssh>, [">= 2.6.4"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 1.1.1"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
   end
-  
-  # = MANIFEST =
-  s.files = %w(
-  CHANGELOG.rdoc
-  README.rdoc
-  Rakefile
-  lib/net/ssh/multi.rb
-  lib/net/ssh/multi/channel.rb
-  lib/net/ssh/multi/channel_proxy.rb
-  lib/net/ssh/multi/dynamic_server.rb
-  lib/net/ssh/multi/pending_connection.rb
-  lib/net/ssh/multi/server.rb
-  lib/net/ssh/multi/server_list.rb
-  lib/net/ssh/multi/session.rb
-  lib/net/ssh/multi/session_actions.rb
-  lib/net/ssh/multi/subsession.rb
-  lib/net/ssh/multi/version.rb
-  test/channel_test.rb
-  test/common.rb
-  test/multi_test.rb
-  test/server_test.rb
-  test/session_actions_test.rb
-  test/session_test.rb
-  test/test_all.rb
-  )
-end
\ No newline at end of file
+end
+