@@ -1 +1,6 @@ -pkg/* +*.sw? +.DS_Store +coverage +rdoc +pkg + .gitignore @@ -1,3 +1,6 @@ +=== 0.4.0 2009-06-06 + * Using technicalpickles/jeweler to manage gem now. See : http://github.com/technicalpickles/jeweler/tree/master + === 0.3.8 2009-04-16 * Applied patch, with updated tests to fix issue with base64 encoded user data (rsanheim). * Applied patch, fixing an issue with EU Signature version 2 creation (delano). CHANGELOG @@ -1,37 +1,93 @@ require 'rubygems' -require 'rake/gempackagetask' -require 'rake/testtask' -require 'rake/rdoctask' +require 'rake' -# read the contents of the gemspec, eval it, and assign it to 'spec' -# this lets us maintain all gemspec info in one place. Nice and DRY. -spec = eval(IO.read("amazon-ec2.gemspec")) +begin + require 'jeweler' + Jeweler::Tasks.new do |gem| + gem.name = "amazon-ec2" + gem.summary = %Q{Amazon EC2 Ruby Gem} + gem.description = %Q{An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.} + gem.email = "glenn@rempe.us" + gem.homepage = "http://github.com/grempe/amazon-ec2" + gem.authors = ["Glenn Rempe"] + # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings -Rake::GemPackageTask.new(spec) do |pkg| - pkg.gem_spec = spec -end +# gem.autorequire = 'EC2' + gem.rdoc_options = ["--quiet", "--title", "amazon-ec2 documentation", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"] + + gem.rubyforge_project = 'amazon-ec2' -desc "Package and then install the gem locally" -task :install => [:package] do - sh %{sudo gem install pkg/#{GEM}-#{VER}} + gem.add_dependency('xml-simple', '>= 1.0.11') + gem.add_development_dependency('mocha', '>= 0.9.0') + gem.add_development_dependency('test-spec', '>= 0.9.0') + gem.add_development_dependency('rcov', '>= 0.8.1.2.0') + + end + +rescue LoadError + puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler" end -desc "Package and then install the gem locally omitting documentation" -task :install_nodoc => [:package] do - sh %{sudo gem install --no-ri --no-rdoc pkg/#{GEM}-#{VER}} +require 'rake/testtask' +Rake::TestTask.new(:test) do |test| + test.libs << 'lib' << 'test' + test.pattern = 'test/**/test_*.rb' + test.verbose = true end -Rake::TestTask.new do |t| - t.libs << "test" - t.test_files = FileList['test/test*.rb'] - t.verbose = true +begin + require 'rcov/rcovtask' + Rcov::RcovTask.new do |test| + test.libs << 'test' + test.pattern = 'test/**/test_*.rb' + test.verbose = true + end +rescue LoadError + task :rcov do + abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov" + end end -Rake::RDocTask.new do |rd| - rd.main = "README.rdoc" - rd.rdoc_files.include("README.rdoc", "lib/**/*.rb") - rd.rdoc_dir = 'doc' - rd.options = spec.rdoc_options + +task :default => :test + +require 'rake/rdoctask' +Rake::RDocTask.new do |rdoc| + if File.exist?('VERSION.yml') + config = YAML.load(File.read('VERSION.yml')) + version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}" + else + version = "" + end + + rdoc.rdoc_dir = 'rdoc' + rdoc.title = "amazon-ec2 #{version}" + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('lib/**/*.rb') end -task :default => :test \ No newline at end of file +begin + require 'rake/contrib/sshpublisher' + namespace :rubyforge do + + desc "Release gem and RDoc documentation to RubyForge" + task :release => ["rubyforge:release:gem", "rubyforge:release:docs"] + + namespace :release do + desc "Publish RDoc to RubyForge." + task :docs => [:rdoc] do + config = YAML.load( + File.read(File.expand_path('~/.rubyforge/user-config.yml')) + ) + + host = "#{config['username']}@rubyforge.org" + remote_dir = "/var/www/gforge-projects/the-perfect-gem/" + local_dir = 'rdoc' + + Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload + end + end + end +rescue LoadError + puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured." +end Rakefile @@ -1,48 +1,108 @@ -GEM = "amazon-ec2" -VER = "0.3.8" -AUTHOR = "Glenn Rempe" -EMAIL = "glenn@rempe.us" -HOMEPAGE = "http://github.com/grempe/amazon-ec2/" -SUMMARY = "An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers." +# -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = GEM - s.version = VER - s.author = AUTHOR - s.email = EMAIL - s.homepage = HOMEPAGE - s.summary = SUMMARY - s.description = s.summary + s.name = %q{amazon-ec2} + s.version = "0.4.0" - s.require_path = 'lib' - s.autorequire = 'EC2' + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Glenn Rempe"] + s.date = %q{2009-06-06} + s.description = %q{An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.} + s.email = %q{glenn@rempe.us} s.executables = ["ec2-gem-example.rb", "ec2sh", "setup.rb"] - - # get this easily and accurately by running 'Dir.glob("{lib,test}/**/*")' - # in an IRB session. However, GitHub won't allow that command hence - # we spell it out. - s.files = ["README.rdoc", "LICENSE", "CHANGELOG", "Rakefile", "lib/EC2", "lib/EC2/availability_zones.rb", "lib/EC2/console.rb", "lib/EC2/elastic_ips.rb", "lib/EC2/exceptions.rb", "lib/EC2/image_attributes.rb", "lib/EC2/images.rb", "lib/EC2/instances.rb", "lib/EC2/keypairs.rb", "lib/EC2/products.rb", "lib/EC2/responses.rb", "lib/EC2/security_groups.rb", "lib/EC2/snapshots.rb", "lib/EC2/volumes.rb", "lib/EC2.rb", "test/test_EC2.rb", "test/test_EC2_availability_zones.rb", "test/test_EC2_console.rb", "test/test_EC2_elastic_ips.rb", "test/test_EC2_image_attributes.rb", "test/test_EC2_images.rb", "test/test_EC2_instances.rb", "test/test_EC2_keypairs.rb", "test/test_EC2_products.rb", "test/test_EC2_responses.rb", "test/test_EC2_security_groups.rb", "test/test_EC2_snapshots.rb", "test/test_EC2_volumes.rb", "test/test_helper.rb"] - - s.test_files = ["test/test_EC2.rb", "test/test_EC2_availability_zones.rb", "test/test_EC2_console.rb", "test/test_EC2_elastic_ips.rb", "test/test_EC2_image_attributes.rb", "test/test_EC2_images.rb", "test/test_EC2_instances.rb", "test/test_EC2_keypairs.rb", "test/test_EC2_products.rb", "test/test_EC2_responses.rb", "test/test_EC2_s3_xmlsimple.rb", "test/test_EC2_security_groups.rb", "test/test_EC2_snapshots.rb", "test/test_EC2_volumes.rb", "test/test_helper.rb"] - - s.has_rdoc = true + s.extra_rdoc_files = [ + "ChangeLog", + "LICENSE", + "README.rdoc" + ] + s.files = [ + ".gitignore", + "CHANGELOG", + "LICENSE", + "README.rdoc", + "Rakefile", + "VERSION", + "amazon-ec2.gemspec", + "bin/ec2-gem-example.rb", + "bin/ec2sh", + "bin/setup.rb", + "lib/EC2.rb", + "lib/EC2/availability_zones.rb", + "lib/EC2/console.rb", + "lib/EC2/elastic_ips.rb", + "lib/EC2/exceptions.rb", + "lib/EC2/image_attributes.rb", + "lib/EC2/images.rb", + "lib/EC2/instances.rb", + "lib/EC2/keypairs.rb", + "lib/EC2/products.rb", + "lib/EC2/responses.rb", + "lib/EC2/security_groups.rb", + "lib/EC2/snapshots.rb", + "lib/EC2/volumes.rb", + "test/test_EC2.rb", + "test/test_EC2_availability_zones.rb", + "test/test_EC2_console.rb", + "test/test_EC2_elastic_ips.rb", + "test/test_EC2_image_attributes.rb", + "test/test_EC2_images.rb", + "test/test_EC2_instances.rb", + "test/test_EC2_keypairs.rb", + "test/test_EC2_products.rb", + "test/test_EC2_responses.rb", + "test/test_EC2_s3_xmlsimple.rb", + "test/test_EC2_security_groups.rb", + "test/test_EC2_snapshots.rb", + "test/test_EC2_volumes.rb", + "test/test_helper.rb", + "wsdl/2007-08-29.ec2.wsdl", + "wsdl/2008-02-01.ec2.wsdl", + "wsdl/2008-05-05.ec2.wsdl", + "wsdl/2008-12-01.ec2.wsdl" + ] + s.homepage = %q{http://github.com/grempe/amazon-ec2} s.rdoc_options = ["--quiet", "--title", "amazon-ec2 documentation", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"] - s.extra_rdoc_files = ["README.rdoc", "CHANGELOG", "LICENSE"] + s.require_paths = ["lib"] + s.rubyforge_project = %q{amazon-ec2} + s.rubygems_version = %q{1.3.4} + s.summary = %q{Amazon EC2 Ruby Gem} + s.test_files = [ + "test/test_EC2.rb", + "test/test_EC2_availability_zones.rb", + "test/test_EC2_console.rb", + "test/test_EC2_elastic_ips.rb", + "test/test_EC2_image_attributes.rb", + "test/test_EC2_images.rb", + "test/test_EC2_instances.rb", + "test/test_EC2_keypairs.rb", + "test/test_EC2_products.rb", + "test/test_EC2_responses.rb", + "test/test_EC2_s3_xmlsimple.rb", + "test/test_EC2_security_groups.rb", + "test/test_EC2_snapshots.rb", + "test/test_EC2_volumes.rb", + "test/test_helper.rb" + ] - # Commenting out since GitHub bug prevents building when specifying - # 'add_runtime_dependency'. See bug: - # http://bit.ly/2WaAgV - #s.add_runtime_dependency('xml-simple', '>= 1.0.11') - s.add_dependency('xml-simple', '>= 1.0.11') - - #s.add_development_dependency('mocha', '>= 0.9.0') - #s.add_development_dependency('test-spec', '>= 0.9.0') - #s.add_development_dependency('rcov', '>= 0.8.1.2.0') - - # comment out until we can specify these as purely dev dependencies (see github bug comment above) - #s.add_dependency('mocha', '>= 0.9.0') - #s.add_dependency('test-spec', '>= 0.9.0') - #s.add_dependency('rcov', '>= 0.8.1.2.0') + 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<xml-simple>, [">= 1.0.11"]) + s.add_development_dependency(%q<mocha>, [">= 0.9.0"]) + s.add_development_dependency(%q<test-spec>, [">= 0.9.0"]) + s.add_development_dependency(%q<rcov>, [">= 0.8.1.2.0"]) + else + s.add_dependency(%q<xml-simple>, [">= 1.0.11"]) + s.add_dependency(%q<mocha>, [">= 0.9.0"]) + s.add_dependency(%q<test-spec>, [">= 0.9.0"]) + s.add_dependency(%q<rcov>, [">= 0.8.1.2.0"]) + end + else + s.add_dependency(%q<xml-simple>, [">= 1.0.11"]) + s.add_dependency(%q<mocha>, [">= 0.9.0"]) + s.add_dependency(%q<test-spec>, [">= 0.9.0"]) + s.add_dependency(%q<rcov>, [">= 0.8.1.2.0"]) + end end - amazon-ec2.gemspec @@ -50,8 +50,8 @@ if ( ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY'] ) returns : an Array of EC2::Response objects, each an EC2 image and its data >> @ec2.describe_images.imagesSet.item - >> @ec2.describe_images.imagesSet.item[0] (an OpenStruct of a single item in that array) - >> @ec2.describe_images.imagesSet.item[0].to_s (a String representation of that OpenStruct item) + >> @ec2.describe_images.imagesSet.item[0] (a hash representing a single item in that array) + >> @ec2.describe_images.imagesSet.item[0].to_s (a String representation of that item) MESSAGE bin/ec2sh 5752961019909b99002d7e12b17111fd68262190 Glenn Rempe glenn@rempe.us http://github.com/grempe/amazon-ec2/commit/6e31869124e69202afd021ba3d68debdf4202226 6e31869124e69202afd021ba3d68debdf4202226 2009-06-06T23:23:18-07:00 2009-06-06T23:23:18-07:00 Converted to technicalpickles/jeweler to manage the gem. c83765d5387d08ffbd037a00126b9add2a008818 Glenn Rempe glenn@rempe.us