From 5e8e50f53348e4256104b1fe90397df4dfd9bfc6 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 6 May 2014 23:48:43 -0300 Subject: [PATCH] Move all Gemfiles to "gemfiles" folder This is a more commonly used name, according to the docs: http://docs.travis-ci.com/user/languages/ruby/ --- .travis.yml | 32 +++++++++++------------ {ci => gemfiles}/Gemfile.no-rails.lock | 0 {ci => gemfiles}/Gemfile.rails-2.3.x | 0 {ci => gemfiles}/Gemfile.rails-2.3.x.lock | 0 {ci => gemfiles}/Gemfile.rails-3.0.x | 0 {ci => gemfiles}/Gemfile.rails-3.0.x.lock | 0 {ci => gemfiles}/Gemfile.rails-3.1.x | 0 {ci => gemfiles}/Gemfile.rails-3.1.x.lock | 0 {ci => gemfiles}/Gemfile.rails-3.2.x | 0 {ci => gemfiles}/Gemfile.rails-3.2.x.lock | 0 {ci => gemfiles}/Gemfile.rails-4.0.x | 0 {ci => gemfiles}/Gemfile.rails-4.0.x.lock | 0 {ci => gemfiles}/Gemfile.rails-4.1.x | 0 {ci => gemfiles}/Gemfile.rails-4.1.x.lock | 0 i18n.gemspec | 2 +- test/run_all.rb | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) rename {ci => gemfiles}/Gemfile.no-rails.lock (100%) rename {ci => gemfiles}/Gemfile.rails-2.3.x (100%) rename {ci => gemfiles}/Gemfile.rails-2.3.x.lock (100%) rename {ci => gemfiles}/Gemfile.rails-3.0.x (100%) rename {ci => gemfiles}/Gemfile.rails-3.0.x.lock (100%) rename {ci => gemfiles}/Gemfile.rails-3.1.x (100%) rename {ci => gemfiles}/Gemfile.rails-3.1.x.lock (100%) rename {ci => gemfiles}/Gemfile.rails-3.2.x (100%) rename {ci => gemfiles}/Gemfile.rails-3.2.x.lock (100%) rename {ci => gemfiles}/Gemfile.rails-4.0.x (100%) rename {ci => gemfiles}/Gemfile.rails-4.0.x.lock (100%) rename {ci => gemfiles}/Gemfile.rails-4.1.x (100%) rename {ci => gemfiles}/Gemfile.rails-4.1.x.lock (100%) diff --git a/.travis.yml b/.travis.yml index d568e31c..cf58debc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,12 @@ rvm: gemfile: - Gemfile - - ci/Gemfile.rails-2.3.x - - ci/Gemfile.rails-3.0.x - - ci/Gemfile.rails-3.1.x - - ci/Gemfile.rails-3.2.x - - ci/Gemfile.rails-4.0.x - - ci/Gemfile.rails-4.1.x + - gemfiles/Gemfile.rails-2.3.x + - gemfiles/Gemfile.rails-3.0.x + - gemfiles/Gemfile.rails-3.1.x + - gemfiles/Gemfile.rails-3.2.x + - gemfiles/Gemfile.rails-4.0.x + - gemfiles/Gemfile.rails-4.1.x matrix: allow_failures: @@ -24,24 +24,24 @@ matrix: - rvm: rbx - rvm: jruby exclude: - - gemfile: ci/Gemfile.rails-2.3.x + - gemfile: gemfiles/Gemfile.rails-2.3.x rvm: 2.0.0 - - gemfile: ci/Gemfile.rails-2.3.x + - gemfile: gemfiles/Gemfile.rails-2.3.x rvm: 2.1.1 - - gemfile: ci/Gemfile.rails-2.3.x + - gemfile: gemfiles/Gemfile.rails-2.3.x rvm: rbx - - gemfile: ci/Gemfile.rails-2.3.x + - gemfile: gemfiles/Gemfile.rails-2.3.x rvm: jruby - - gemfile: ci/Gemfile.rails-4.0.x + - gemfile: gemfiles/Gemfile.rails-4.0.x rvm: 1.8.7 - - gemfile: ci/Gemfile.rails-4.0.x + - gemfile: gemfiles/Gemfile.rails-4.0.x rvm: 1.9.2 - - gemfile: ci/Gemfile.rails-4.0.x + - gemfile: gemfiles/Gemfile.rails-4.0.x rvm: ree - - gemfile: ci/Gemfile.rails-4.1.x + - gemfile: gemfiles/Gemfile.rails-4.1.x rvm: 1.8.7 - - gemfile: ci/Gemfile.rails-4.1.x + - gemfile: gemfiles/Gemfile.rails-4.1.x rvm: 1.9.2 - - gemfile: ci/Gemfile.rails-4.1.x + - gemfile: gemfiles/Gemfile.rails-4.1.x rvm: ree fast_finish: true diff --git a/ci/Gemfile.no-rails.lock b/gemfiles/Gemfile.no-rails.lock similarity index 100% rename from ci/Gemfile.no-rails.lock rename to gemfiles/Gemfile.no-rails.lock diff --git a/ci/Gemfile.rails-2.3.x b/gemfiles/Gemfile.rails-2.3.x similarity index 100% rename from ci/Gemfile.rails-2.3.x rename to gemfiles/Gemfile.rails-2.3.x diff --git a/ci/Gemfile.rails-2.3.x.lock b/gemfiles/Gemfile.rails-2.3.x.lock similarity index 100% rename from ci/Gemfile.rails-2.3.x.lock rename to gemfiles/Gemfile.rails-2.3.x.lock diff --git a/ci/Gemfile.rails-3.0.x b/gemfiles/Gemfile.rails-3.0.x similarity index 100% rename from ci/Gemfile.rails-3.0.x rename to gemfiles/Gemfile.rails-3.0.x diff --git a/ci/Gemfile.rails-3.0.x.lock b/gemfiles/Gemfile.rails-3.0.x.lock similarity index 100% rename from ci/Gemfile.rails-3.0.x.lock rename to gemfiles/Gemfile.rails-3.0.x.lock diff --git a/ci/Gemfile.rails-3.1.x b/gemfiles/Gemfile.rails-3.1.x similarity index 100% rename from ci/Gemfile.rails-3.1.x rename to gemfiles/Gemfile.rails-3.1.x diff --git a/ci/Gemfile.rails-3.1.x.lock b/gemfiles/Gemfile.rails-3.1.x.lock similarity index 100% rename from ci/Gemfile.rails-3.1.x.lock rename to gemfiles/Gemfile.rails-3.1.x.lock diff --git a/ci/Gemfile.rails-3.2.x b/gemfiles/Gemfile.rails-3.2.x similarity index 100% rename from ci/Gemfile.rails-3.2.x rename to gemfiles/Gemfile.rails-3.2.x diff --git a/ci/Gemfile.rails-3.2.x.lock b/gemfiles/Gemfile.rails-3.2.x.lock similarity index 100% rename from ci/Gemfile.rails-3.2.x.lock rename to gemfiles/Gemfile.rails-3.2.x.lock diff --git a/ci/Gemfile.rails-4.0.x b/gemfiles/Gemfile.rails-4.0.x similarity index 100% rename from ci/Gemfile.rails-4.0.x rename to gemfiles/Gemfile.rails-4.0.x diff --git a/ci/Gemfile.rails-4.0.x.lock b/gemfiles/Gemfile.rails-4.0.x.lock similarity index 100% rename from ci/Gemfile.rails-4.0.x.lock rename to gemfiles/Gemfile.rails-4.0.x.lock diff --git a/ci/Gemfile.rails-4.1.x b/gemfiles/Gemfile.rails-4.1.x similarity index 100% rename from ci/Gemfile.rails-4.1.x rename to gemfiles/Gemfile.rails-4.1.x diff --git a/ci/Gemfile.rails-4.1.x.lock b/gemfiles/Gemfile.rails-4.1.x.lock similarity index 100% rename from ci/Gemfile.rails-4.1.x.lock rename to gemfiles/Gemfile.rails-4.1.x.lock diff --git a/i18n.gemspec b/i18n.gemspec index f4530698..9feefe41 100644 --- a/i18n.gemspec +++ b/i18n.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.description = "New wave Internationalization support for Ruby." s.license = "MIT" - s.files = Dir.glob("{ci,lib,test}/**/**") + %w(README.md MIT-LICENSE) + s.files = Dir.glob("{gemfiles,lib,test}/**/**") + %w(README.md MIT-LICENSE) s.platform = Gem::Platform::RUBY s.require_path = 'lib' s.rubyforge_project = '[none]' diff --git a/test/run_all.rb b/test/run_all.rb index 0c31db7c..4c37bb42 100644 --- a/test/run_all.rb +++ b/test/run_all.rb @@ -3,7 +3,7 @@ def bundle_check end command = 'ruby -w -Ilib -Itest test/all.rb' -gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails) +gemfiles = %w(gemfiles/Gemfile.rails-3.x gemfiles/Gemfile.rails-2.3.x gemfiles/Gemfile.no-rails) results = gemfiles.map do |gemfile| puts "BUNDLE_GEMFILE=#{gemfile}"