From 3a96886f1dc2aee41504aea30d640cf2a5eb76e6 Mon Sep 17 00:00:00 2001 From: Jeff Dutil Date: Wed, 19 Sep 2012 23:54:23 -0400 Subject: [PATCH] Update sitemap_generator dependency. --- .gitignore | 2 +- Gemfile | 22 ----- Gemfile.lock | 110 +++++++++------------ Rakefile | 8 +- lib/generators/templates/config/sitemap.rb | 20 ++-- spree_sitemap_generator.gemspec | 11 ++- 6 files changed, 66 insertions(+), 107 deletions(-) diff --git a/.gitignore b/.gitignore index a4b3c98..11ae813 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ .DS_Store tmp *.swp -spec/test_app +spec/dummy pkg diff --git a/Gemfile b/Gemfile index 1ee945f..d65e2a6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,25 +1,3 @@ source 'http://rubygems.org' -gem 'sqlite3' - -group :test do - gem 'autotest' - gem 'rspec-rails', '= 2.6.1' - gem 'factory_girl' - gem 'faker' -end - -group :cucumber do - gem 'cucumber-rails', '1.0.0' - gem 'database_cleaner', '= 0.6.7' - gem 'nokogiri' - gem 'capybara', '1.0.1' -end - -if RUBY_VERSION < "1.9" - gem "ruby-debug" -else - gem "ruby-debug19" -end - gemspec diff --git a/Gemfile.lock b/Gemfile.lock index b7dd861..1d130ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: . specs: - spree_logins (0.70.0) - spree_auth (>= 0.70.0) - spree_core (>= 0.70.0) + spree_sitemap_generator (3.0.3) + sitemap_generator (~> 3.1.0) + spree_core (>= 1.0.0) GEM remote: http://rubygems.org/ @@ -23,11 +23,17 @@ GEM rack-mount (~> 0.8.2) rack-test (~> 0.6.1) sprockets (~> 2.0.2) - activemerchant (1.17.0) + active_utils (1.0.5) + activesupport (>= 2.3.11) + i18n + activemerchant (1.20.1) + active_utils (>= 1.0.1) activesupport (>= 2.3.11) braintree (>= 2.0.0) builder (>= 2.0.0) + i18n json (>= 1.5.1) + money (<= 3.7.1) activemodel (3.1.1) activesupport (= 3.1.1) builder (~> 3.0.0) @@ -43,15 +49,12 @@ GEM activesupport (3.1.1) multi_json (~> 1.0) acts_as_list (0.1.4) - archive-tar-minitar (0.5.2) - arel (2.2.1) + arel (2.2.3) autotest (4.4.6) ZenTest (>= 4.4.1) - bcrypt-ruby (3.0.1) - braintree (2.12.0) + braintree (2.17.0) builder (>= 2.0.0) builder (3.0.0) - cancan (1.6.5) capybara (1.0.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -61,8 +64,7 @@ GEM xpath (~> 0.1.4) childprocess (0.2.2) ffi (~> 1.0.6) - cocaine (0.2.0) - columnize (0.3.4) + cocaine (0.3.0) cucumber (1.0.6) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -75,35 +77,31 @@ GEM nokogiri (>= 1.4.4) rack-test (>= 0.5.7) database_cleaner (0.6.7) - deface (0.7.0) + deface (0.9.1) nokogiri (~> 1.5.0) - rails (>= 3.0.9) - devise (1.4.7) - bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - warden (~> 1.0.3) + rails (~> 3.1) diff-lcs (1.1.3) erubis (2.7.0) factory_girl (2.1.2) activesupport faker (1.0.0) i18n (~> 0.4) + ffaker (1.12.1) ffi (1.0.9) gherkin (2.4.21) json (>= 1.4.6) - highline (1.5.1) + highline (1.6.8) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.14) + jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) json (1.6.1) json_pure (1.6.1) - kaminari (0.12.4) - rails (>= 3.0.0) - linecache19 (0.5.12) - ruby_core_source (>= 0.1.4) - mail (2.3.0) + kaminari (0.14.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -113,20 +111,21 @@ GEM activesupport (~> 3.1.0) polyamorous (~> 0.5.0) mime-types (1.16) + money (3.7.1) + i18n (~> 0.4) multi_json (1.0.3) nested_set (1.6.8) activerecord (>= 3.0.0) railties (>= 3.0.0) nokogiri (1.5.0) - orm_adapter (0.0.5) - paperclip (2.4.1) + paperclip (2.7.0) activerecord (>= 2.3.0) activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types polyamorous (0.5.0) activerecord (~> 3.0) - polyglot (0.3.2) + polyglot (0.3.3) rack (1.3.4) rack-cache (1.1) rack (>= 0.4) @@ -152,10 +151,6 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2) - rd_find_by_param (0.1.1) - activerecord (~> 3.0) - activesupport (~> 3.0) - rd_resource_controller (1.0.1) rdoc (3.10) json (~> 1.4) rspec (2.6.0) @@ -171,58 +166,42 @@ GEM activesupport (~> 3.0) railties (~> 3.0) rspec (~> 2.6.0) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) - ruby_core_source (0.1.5) - archive-tar-minitar (>= 0.5.2) rubyzip (0.9.4) selenium-webdriver (2.8.0) childprocess (>= 0.2.1) ffi (>= 1.0.7) json_pure rubyzip - spree_auth (0.70.0) - cancan (= 1.6.5) - devise (= 1.4.7) - spree_core (= 0.70.0) - spree_core (0.70.0) - activemerchant (= 1.17.0) + sitemap_generator (3.1.1) + builder + spree_core (1.0.4) + activemerchant (= 1.20.1) acts_as_list (= 0.1.4) - deface (>= 0.6.1) - faker (= 1.0.0) - highline (= 1.5.1) - jquery-rails (>= 1.0.14) - kaminari (>= 0.12.4) + deface (>= 0.7.2) + ffaker (~> 1.12.0) + highline (= 1.6.8) + jquery-rails (>= 1.0.18, <= 1.0.19) + kaminari (>= 0.13.0) meta_search (= 1.1.1) nested_set (= 1.6.8) - paperclip (= 2.4.1) - rails (= 3.1.1) - rd_find_by_param (= 0.1.1) - rd_resource_controller - state_machine (= 1.0.1) - stringex (= 1.0.3) + paperclip (= 2.7.0) + rails (>= 3.1.1, <= 3.1.4) + state_machine (= 1.1.1) + stringex (~> 1.3.0) sprockets (2.0.2) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.4) - state_machine (1.0.1) - stringex (1.0.3) + state_machine (1.1.1) + stringex (1.3.3) term-ansicolor (1.0.6) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.30) - warden (1.0.6) - rack (>= 1.0) + tzinfo (0.3.33) xpath (0.1.4) nokogiri (~> 1.3) @@ -238,6 +217,5 @@ DEPENDENCIES faker nokogiri rspec-rails (= 2.6.1) - ruby-debug19 - spree_logins! + spree_sitemap_generator! sqlite3 diff --git a/Rakefile b/Rakefile index c178e87..8aa7314 100644 --- a/Rakefile +++ b/Rakefile @@ -3,13 +3,11 @@ require 'rake/testtask' require 'rake/packagetask' require 'rubygems/package_task' require 'rspec/core/rake_task' -require 'cucumber/rake/task' -require 'spree_core/testing_support/common_rake' +require 'spree/core/testing_support/common_rake' RSpec::Core::RakeTask.new -Cucumber::Rake::Task.new -task :default => [:spec, :cucumber ] +task :default => [:spec] spec = eval(File.read('spree_sitemap_generator.gemspec')) @@ -26,6 +24,6 @@ end desc "Generates a dummy app for testing" task :test_app do - ENV['LIB_NAME'] = 'spree_logins' + ENV['LIB_NAME'] = 'spree_sitemap_generator' Rake::Task['common:test_app'].invoke end diff --git a/lib/generators/templates/config/sitemap.rb b/lib/generators/templates/config/sitemap.rb index 17be832..2a1b29b 100644 --- a/lib/generators/templates/config/sitemap.rb +++ b/lib/generators/templates/config/sitemap.rb @@ -1,12 +1,12 @@ SitemapGenerator::Sitemap.default_host = "http://#{Spree::Config[:site_url]}" -SitemapGenerator::Sitemap.add_links do |sitemap| +SitemapGenerator::Sitemap.add_links do # Put links creation logic here. # # The root path '/' and sitemap index file are added automatically. # Links are added to the Sitemap in the order they are specified. # - # Usage: sitemap.add(path, options={}) + # Usage: add(path, options={}) # (default options are used if you don't specify) # # Defaults: :priority => 0.5, :changefreq => 'weekly', @@ -17,17 +17,17 @@ SitemapGenerator::Sitemap.add_links do |sitemap| # # Add '/articles' # - # sitemap.add articles_path, :priority => 0.7, :changefreq => 'daily' + # add articles_path, :priority => 0.7, :changefreq => 'daily' # # Add individual articles: # # Article.find_each do |article| - # sitemap.add article_path(article), :lastmod => article.updated_at + # add article_path(article), :lastmod => article.updated_at # end - sitemap.add_login - sitemap.add_signup - sitemap.add_account - sitemap.add_password_reset - sitemap.add_taxons - sitemap.add_products + add_login + add_signup + add_account + add_password_reset + add_taxons + add_products end diff --git a/spree_sitemap_generator.gemspec b/spree_sitemap_generator.gemspec index 01cb6fe..af1dade 100644 --- a/spree_sitemap_generator.gemspec +++ b/spree_sitemap_generator.gemspec @@ -6,8 +6,8 @@ Gem::Specification.new do |s| #s.description = 'Add (optional) gem description here' s.required_ruby_version = '>= 1.8.7' - s.author = 'Joshua Nussbaum' - s.email = 'joshnuss@gmail.com' + s.author = ['Joshua Nussbaum', 'Jeff Dutil'] + s.email = ['joshnuss@gmail.com', 'jdutil@burlingtonwebapps.com'] # s.homepage = 'http://www.rubyonrails.org' # s.rubyforge_project = 'actionmailer' @@ -16,5 +16,10 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency('spree_core', '>= 1.0.0') - s.add_dependency('sitemap_generator', '~> 2.2.1') + s.add_dependency('sitemap_generator', '~> 3.1.0') + + s.add_development_dependency 'sqlite3' + s.add_development_dependency 'rspec-rails', '= 2.6.1' + s.add_development_dependency 'factory_girl' + s.add_development_dependency 'faker' end