From c818dbc4b5e07dcef89f62ea8d8e6cab76042311 Mon Sep 17 00:00:00 2001 From: lukebayes Date: Sun, 11 Mar 2012 13:46:05 -0700 Subject: [PATCH 1/4] Incremented revision, removed out-of-date rcov dependencies. --- Gemfile | 6 ------ VERSION | 2 +- rakefile.rb | 30 ------------------------------ 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 6a7ca4dc..073a73b7 100644 --- a/Gemfile +++ b/Gemfile @@ -19,11 +19,5 @@ group :development do gem "flay" gem "flog" gem "heckle" - - # rcov doesn't appear to install on - # debian/ubuntu. Boo. Ideas? - if RUBY_PLATFORM =~ /darwin/i - gem "rcov" - end end diff --git a/VERSION b/VERSION index 78d6c753..876d1771 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.15.pre +1.1.16.pre diff --git a/rakefile.rb b/rakefile.rb index 8dd6b261..686f7b31 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -32,36 +32,6 @@ task(:clean) { rm_f "coverage.data" } end - # Apparently, rcov does not work on Windows or Ubuntu? - # Hide these tasks so that we can at least - # run the others... - if(RUBY_PLATFORM =~ /darwin/i) - require 'rcov/rcovtask' - - CLEAN.add('coverage.data') - CLEAN.add('.coverage') - - # Hold collection in case we need it: - #%w[unit functional integration].each do |target| - %w[unit].each do |target| - namespace :coverage do - Rcov::RcovTask.new(target) do |t| - t.libs = ["lib", "test"] - t.test_files = FileList["test/#{target}/**/*_test.rb"] - t.output_dir = ".coverage/#{target}" - t.verbose = true - t.rcov_opts = ["--sort coverage", - "--aggregate coverage.data", - "--exclude .bundle", - "--exclude .gem", - "--exclude errors.rb", - "--exclude progress_bar.rb"] - end - end - task :coverage => "test:coverage:#{target}" - end - end - namespace :torture do desc "Flog the Sprouts" task :flog do From fff58fdd73d3f8f17c8f9b91de074bc7dd31ae2d Mon Sep 17 00:00:00 2001 From: lukebayes Date: Sun, 11 Mar 2012 13:46:34 -0700 Subject: [PATCH 2/4] Incremented revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 876d1771..65437573 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.16.pre +1.1.17.pre From e8e6c60438cd1a4d598645760b00ea005eb1cc2c Mon Sep 17 00:00:00 2001 From: lukebayes Date: Sun, 11 Mar 2012 14:37:24 -0700 Subject: [PATCH 3/4] Renamed template files in order to avoid parse errors with modern gem installation rules. --- VERSION | 2 +- lib/sprout/generators/generator/generator_generator.rb | 6 +++--- .../{generator_class.rb => generator_class.erb} | 0 .../templates/{generator_test.rb => generator_test.erb} | 0 ...enerator_test_helper.rb => generator_test_helper.erb} | 0 lib/sprout/generators/library/library_generator.rb | 2 +- .../library/templates/{library.rb => library.erb} | 0 lib/sprout/generators/ruby/ruby_generator.rb | 9 ++++----- .../ruby/templates/{ruby_base.rb => ruby_base.erb} | 0 .../ruby/templates/{ruby_input.rb => ruby_input.erb} | 0 .../templates/{ruby_test_case.rb => ruby_test_case.erb} | 0 .../{ruby_test_helper.rb => ruby_test_helper.erb} | 0 .../generators/tool/templates/{tool.rb => tool.erb} | 2 -- lib/sprout/generators/tool/tool_generator.rb | 2 +- 14 files changed, 10 insertions(+), 13 deletions(-) rename lib/sprout/generators/generator/templates/{generator_class.rb => generator_class.erb} (100%) rename lib/sprout/generators/generator/templates/{generator_test.rb => generator_test.erb} (100%) rename lib/sprout/generators/generator/templates/{generator_test_helper.rb => generator_test_helper.erb} (100%) rename lib/sprout/generators/library/templates/{library.rb => library.erb} (100%) rename lib/sprout/generators/ruby/templates/{ruby_base.rb => ruby_base.erb} (100%) rename lib/sprout/generators/ruby/templates/{ruby_input.rb => ruby_input.erb} (100%) rename lib/sprout/generators/ruby/templates/{ruby_test_case.rb => ruby_test_case.erb} (100%) rename lib/sprout/generators/ruby/templates/{ruby_test_helper.rb => ruby_test_helper.erb} (100%) rename lib/sprout/generators/tool/templates/{tool.rb => tool.erb} (99%) diff --git a/VERSION b/VERSION index 65437573..4c354617 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.17.pre +1.1.18.pre diff --git a/lib/sprout/generators/generator/generator_generator.rb b/lib/sprout/generators/generator/generator_generator.rb index ba0d3d99..af7b2e79 100644 --- a/lib/sprout/generators/generator/generator_generator.rb +++ b/lib/sprout/generators/generator/generator_generator.rb @@ -57,7 +57,7 @@ def manifest #We need to add a folder with the same name as the module to be used in order to faux namespace our generators to avoid collisions from super classes directory namespace do directory generators do - template "#{input.snake_case}_generator.rb", "generator_class.rb" + template "#{input.snake_case}_generator.rb", "generator_class.erb" directory "templates" do template "#{input.camel_case}#{extension}", "generator_template" end @@ -67,8 +67,8 @@ def manifest directory test do directory unit do - template "#{input.snake_case}_generator_test.rb", "generator_test.rb" - template "test_helper.rb", "generator_test_helper.rb" + template "#{input.snake_case}_generator_test.rb", "generator_test.erb" + template "test_helper.rb", "generator_test_helper.erb" end directory fixtures do directory "generators" diff --git a/lib/sprout/generators/generator/templates/generator_class.rb b/lib/sprout/generators/generator/templates/generator_class.erb similarity index 100% rename from lib/sprout/generators/generator/templates/generator_class.rb rename to lib/sprout/generators/generator/templates/generator_class.erb diff --git a/lib/sprout/generators/generator/templates/generator_test.rb b/lib/sprout/generators/generator/templates/generator_test.erb similarity index 100% rename from lib/sprout/generators/generator/templates/generator_test.rb rename to lib/sprout/generators/generator/templates/generator_test.erb diff --git a/lib/sprout/generators/generator/templates/generator_test_helper.rb b/lib/sprout/generators/generator/templates/generator_test_helper.erb similarity index 100% rename from lib/sprout/generators/generator/templates/generator_test_helper.rb rename to lib/sprout/generators/generator/templates/generator_test_helper.erb diff --git a/lib/sprout/generators/library/library_generator.rb b/lib/sprout/generators/library/library_generator.rb index 0d6df8c7..262b1366 100644 --- a/lib/sprout/generators/library/library_generator.rb +++ b/lib/sprout/generators/library/library_generator.rb @@ -12,7 +12,7 @@ class LibraryGenerator < Generator::Base def manifest template "#{input.snake_case}.gemspec", 'library.gemspec' - template "#{input.snake_case}.rb", 'library.rb' + template "#{input.snake_case}.rb", 'library.erb' end end diff --git a/lib/sprout/generators/library/templates/library.rb b/lib/sprout/generators/library/templates/library.erb similarity index 100% rename from lib/sprout/generators/library/templates/library.rb rename to lib/sprout/generators/library/templates/library.erb diff --git a/lib/sprout/generators/ruby/ruby_generator.rb b/lib/sprout/generators/ruby/ruby_generator.rb index e3307c2d..f343b09b 100644 --- a/lib/sprout/generators/ruby/ruby_generator.rb +++ b/lib/sprout/generators/ruby/ruby_generator.rb @@ -40,17 +40,17 @@ def manifest template "#{input.snake_case}.gemspec", 'ruby_gemspec' directory lib do - template "#{snake}.rb", 'ruby_input.rb' + template "#{snake}.rb", 'ruby_input.erb' directory snake do - template 'base.rb', 'ruby_base.rb' + template 'base.rb', 'ruby_base.erb' end end directory test do directory fixtures directory unit do - template "#{input.snake_case}_test.rb", 'ruby_test_case.rb' - template 'test_helper.rb', 'ruby_test_helper.rb' + template "#{input.snake_case}_test.rb", 'ruby_test_case.erb' + template 'test_helper.rb', 'ruby_test_helper.erb' end end @@ -61,4 +61,3 @@ def manifest end end end - diff --git a/lib/sprout/generators/ruby/templates/ruby_base.rb b/lib/sprout/generators/ruby/templates/ruby_base.erb similarity index 100% rename from lib/sprout/generators/ruby/templates/ruby_base.rb rename to lib/sprout/generators/ruby/templates/ruby_base.erb diff --git a/lib/sprout/generators/ruby/templates/ruby_input.rb b/lib/sprout/generators/ruby/templates/ruby_input.erb similarity index 100% rename from lib/sprout/generators/ruby/templates/ruby_input.rb rename to lib/sprout/generators/ruby/templates/ruby_input.erb diff --git a/lib/sprout/generators/ruby/templates/ruby_test_case.rb b/lib/sprout/generators/ruby/templates/ruby_test_case.erb similarity index 100% rename from lib/sprout/generators/ruby/templates/ruby_test_case.rb rename to lib/sprout/generators/ruby/templates/ruby_test_case.erb diff --git a/lib/sprout/generators/ruby/templates/ruby_test_helper.rb b/lib/sprout/generators/ruby/templates/ruby_test_helper.erb similarity index 100% rename from lib/sprout/generators/ruby/templates/ruby_test_helper.rb rename to lib/sprout/generators/ruby/templates/ruby_test_helper.erb diff --git a/lib/sprout/generators/tool/templates/tool.rb b/lib/sprout/generators/tool/templates/tool.erb similarity index 99% rename from lib/sprout/generators/tool/templates/tool.rb rename to lib/sprout/generators/tool/templates/tool.erb index 5f907459..2a89be24 100644 --- a/lib/sprout/generators/tool/templates/tool.rb +++ b/lib/sprout/generators/tool/templates/tool.erb @@ -34,5 +34,3 @@ module VERSION end end - - diff --git a/lib/sprout/generators/tool/tool_generator.rb b/lib/sprout/generators/tool/tool_generator.rb index 9533eec3..b53ad26f 100644 --- a/lib/sprout/generators/tool/tool_generator.rb +++ b/lib/sprout/generators/tool/tool_generator.rb @@ -22,7 +22,7 @@ def manifest directory snake_input do template 'Gemfile' template "#{snake_input}.gemspec", 'tool.gemspec' - template "#{snake_input}.rb", 'tool.rb' + template "#{snake_input}.rb", 'tool.erb' end end From d25f1f632522f4715e89c04c2a118c510f5f7ff0 Mon Sep 17 00:00:00 2001 From: Luke Bayes Date: Wed, 15 Aug 2018 15:03:11 -0400 Subject: [PATCH 4/4] Updated rubyzip dependency for security vulnerability --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 073a73b7..6a5b0255 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" gem "bundler", ">= 0.9.19" gem "rake", ">= 0.9.2" -gem "rubyzip", "0.9.4" +gem "rubyzip", "~> 1.2.1" gem "archive-tar-minitar", "0.5.2" if RUBY_PLATFORM =~ /mswin/i