From 5eb7c3eeff9092309b2bff8ffe46cc0c4245e0fb Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:30:43 -0700 Subject: [PATCH 01/10] Bump version to 3.1.1 --- Gemfile.lock | 2 +- VERSION | 2 +- lib/formtastic-bootstrap/version.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index da94939f..8db5143c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ GIT PATH remote: . specs: - formtastic-bootstrap (3.1.0) + formtastic-bootstrap (3.1.1) formtastic (>= 3.0) GEM diff --git a/VERSION b/VERSION index fd2a0186..94ff29cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 +3.1.1 diff --git a/lib/formtastic-bootstrap/version.rb b/lib/formtastic-bootstrap/version.rb index b2ebec7f..fd11c1be 100644 --- a/lib/formtastic-bootstrap/version.rb +++ b/lib/formtastic-bootstrap/version.rb @@ -1,3 +1,3 @@ module FormtasticBootstrap - VERSION = "3.1.0" + VERSION = "3.1.1" end From 4497d4648adadce08556e63ee13ddf72032b42a0 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:32:58 -0700 Subject: [PATCH 02/10] Remove mbj/devtools --- Gemfile | 7 -- Gemfile.lock | 244 +++++---------------------------------------------- 2 files changed, 22 insertions(+), 229 deletions(-) diff --git a/Gemfile b/Gemfile index a8f69469..b4e2a20b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,3 @@ source "https://rubygems.org" gemspec - -group :development, :test do - gem 'devtools', git: 'https://github.com/mbj/devtools.git' -end - -# Added by devtools -eval_gemfile 'Gemfile.devtools' diff --git a/Gemfile.lock b/Gemfile.lock index 8db5143c..8b5a29e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,3 @@ -GIT - remote: https://github.com/mbj/devtools.git - revision: 54d9559790d1c077367db089342027e34f9f1bd3 - specs: - devtools (0.0.2) - coveralls (~> 0.7.2) - flay (~> 2.5.0) - flog (~> 4.3.0) - mutant (~> 0.7.5) - mutant-rspec (~> 0.7.4) - rake (~> 10.4.0) - reek (= 1.4.0) - rspec (~> 3.1.0) - rspec-core (~> 3.1.7) - rspec-its (~> 1.1.0) - rubocop (~> 0.28.0) - simplecov (~> 0.9.1) - yard (~> 0.8.7.6) - yardstick (~> 0.9.9) - PATH remote: . specs: @@ -27,7 +7,6 @@ PATH GEM remote: https://rubygems.org/ specs: - abstract_type (0.0.7) actionpack (3.2.21) activemodel (= 3.2.21) activesupport (= 3.2.21) @@ -44,125 +23,22 @@ GEM activesupport (3.2.21) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) ammeter (0.2.9) activesupport (>= 3.0) railties (>= 3.0) rspec (>= 2.2) rspec-rails (>= 2.2) - anima (0.2.0) - abstract_type (~> 0.0.7) - adamantium (~> 0.1) - equalizer (~> 0.0.8) - ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) builder (3.0.4) - celluloid (0.16.0) - timers (~> 4.0.0) - coderay (1.1.0) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - coveralls (0.7.9) - multi_json (~> 1.10) - rest-client (~> 1.7) - simplecov (~> 0.9.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.1) diff-lcs (1.2.5) - docile (1.1.5) - equalizer (0.0.9) erubis (2.7.0) - ffi (1.9.6) - flay (2.5.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.3.2) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - formatador (0.2.5) formtastic (3.1.3) actionpack (>= 3.2.13) - guard (2.10.5) - formatador (>= 0.2.4) - listen (~> 2.7) - lumberjack (~> 1.0) - nenv (~> 0.1) - pry (>= 0.9.12) - thor (>= 0.18.1) - guard-bundler (2.1.0) - bundler (~> 1.0) - guard (~> 2.2) - guard-compat (~> 1.1) - guard-compat (1.2.1) - guard-rspec (4.5.0) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) - guard-rubocop (1.2.0) - guard (~> 2.0) - rubocop (~> 0.20) hike (1.2.3) - hitimes (1.2.2) i18n (0.7.0) - ice_nine (0.11.1) journey (1.0.4) json (1.8.2) - libnotify (0.9.1) - ffi (>= 1.0.11) - listen (2.8.5) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - lumberjack (1.0.9) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) - mime-types (2.4.3) - morpher (0.2.3) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - anima (~> 0.2.0) - ast (~> 2.0.0) - concord (~> 0.1.4) - equalizer (~> 0.0.9) - ice_nine (~> 0.11.0) - procto (~> 0.0.2) - multi_json (1.10.1) - mutant (0.7.6) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - anima (~> 0.2.0) - ast (~> 2.0) - concord (~> 0.1.5) - diff-lcs (~> 1.2) - equalizer (~> 0.0.9) - ice_nine (~> 0.11.1) - memoizable (~> 0.4.2) - morpher (~> 0.2.3) - parallel (~> 1.3) - parser (~> 2.2.0.2) - procto (~> 0.0.2) - unparser (~> 0.2.2) - mutant-rspec (0.7.6) - mutant (~> 0.7.6) - rspec-core (>= 3.0.0, < 3.2.0) - nenv (0.2.0) - netrc (0.10.2) + multi_json (1.11.0) nokogiri (1.5.11) - parallel (1.3.4) - parser (2.2.0.2) - ast (>= 1.1, < 3.0) - powerpack (0.0.9) - procto (0.0.2) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - racc (1.4.12) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -177,100 +53,43 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rainbow (2.0.0) rake (10.4.2) - rb-fchange (0.0.6) - ffi - rb-fsevent (0.9.4) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - rb-notifu (0.0.4) rdoc (3.12.2) json (~> 1.4) - reek (1.4.0) - rainbow (>= 1.99, < 3.0) - ruby2ruby (>= 2.0.8, < 3.0) - ruby_parser (>= 3.5.0, < 4.0) - sexp_processor (~> 4.4) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec (3.2.0) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-core (3.2.2) + rspec-support (~> 3.2.0) + rspec-expectations (3.2.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-its (1.1.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-support (~> 3.2.0) + rspec-mocks (3.2.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-rails (3.2.1) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-support (~> 3.2.0) + rspec-support (3.2.2) rspec_tag_matchers (1.0.0) nokogiri (>= 1.4.0) rspec-rails (>= 1.2.6) - rubocop (0.28.0) - astrolabe (~> 1.3) - parser (>= 2.2.0.pre.7, < 3.0) - powerpack (~> 0.0.6) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) - ruby-progressbar (1.7.1) - ruby2ruby (2.1.3) - ruby_parser (~> 3.1) - sexp_processor (~> 4.0) - ruby_parser (3.6.4) - sexp_processor (~> 4.1) - rubysl-logger (2.1.0) - rubysl-open-uri (2.0.0) - rubysl-prettyprint (2.0.3) - rubysl-singleton (2.0.0) - sexp_processor (4.4.5) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - slop (3.6.0) sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - term-ansicolor (1.3.0) - tins (~> 1.0) - terminal-notifier-guard (1.6.4) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) - timers (4.0.1) - hitimes - tins (1.3.4) tzinfo (1.2.2) thread_safe (~> 0.1) - unparser (0.2.2) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) - diff-lcs (~> 1.2.5) - equalizer (~> 0.0.9) - parser (~> 2.2.0.2) - procto (~> 0.0.2) - yard (0.8.7.6) - yardstick (0.9.9) - yard (~> 0.8, >= 0.8.7.2) PLATFORMS ruby @@ -279,27 +98,8 @@ DEPENDENCIES actionpack (~> 3.2) ammeter (~> 0.2) bundler - devtools! formtastic-bootstrap! - guard (~> 2.10.3) - guard-bundler (~> 2.1.0) - guard-rspec (~> 4.5.0) - guard-rubocop (~> 1.2.0) - jruby-openssl (~> 0.9.4) - json (~> 1.8.1) - libnotify (~> 0.9.0) - listen (~> 2.8.4) nokogiri (< 1.6.0) - racc (~> 1.4.12) rake - rb-fchange (~> 0.0.6) - rb-fsevent (~> 0.9.4) - rb-inotify (~> 0.9.5) - rb-notifu (~> 0.0.4) rspec_tag_matchers (~> 1.0) - rubysl-logger (~> 2.1.0) - rubysl-open-uri (~> 2.0.0) - rubysl-prettyprint (~> 2.0.3) - rubysl-singleton (~> 2.0.0) - terminal-notifier-guard (~> 1.6.4) tzinfo From f5e8d45b6b0f004c88b5373dccad04ad1b5f806a Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:42:14 -0700 Subject: [PATCH 03/10] Add the pry gem to the development, test groups --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index b4e2a20b..9f3abd68 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,7 @@ source "https://rubygems.org" gemspec + +group :development, :test do + gem 'pry' +end From 038902bb42b8a5e6987732b04d66e4dfaf4393b8 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:42:24 -0700 Subject: [PATCH 04/10] Remove Gemfile.lock --- Gemfile.lock | 105 --------------------------------------------------- 1 file changed, 105 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8b5a29e2..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,105 +0,0 @@ -PATH - remote: . - specs: - formtastic-bootstrap (3.1.1) - formtastic (>= 3.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.21) - activesupport (= 3.2.21) - builder (~> 3.0.0) - activesupport (3.2.21) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - ammeter (0.2.9) - activesupport (>= 3.0) - railties (>= 3.0) - rspec (>= 2.2) - rspec-rails (>= 2.2) - builder (3.0.4) - diff-lcs (1.2.5) - erubis (2.7.0) - formtastic (3.1.3) - actionpack (>= 3.2.13) - hike (1.2.3) - i18n (0.7.0) - journey (1.0.4) - json (1.8.2) - multi_json (1.11.0) - nokogiri (1.5.11) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.4) - rack - rack-test (0.6.3) - rack (>= 1.0) - railties (3.2.21) - actionpack (= 3.2.21) - activesupport (= 3.2.21) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.4.2) - rdoc (3.12.2) - json (~> 1.4) - rspec (3.2.0) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-core (3.2.2) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-mocks (3.2.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.1) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.2) - rspec_tag_matchers (1.0.0) - nokogiri (>= 1.4.0) - rspec-rails (>= 1.2.6) - sprockets (2.2.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (1.4.1) - tzinfo (1.2.2) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack (~> 3.2) - ammeter (~> 0.2) - bundler - formtastic-bootstrap! - nokogiri (< 1.6.0) - rake - rspec_tag_matchers (~> 1.0) - tzinfo From 78e098ba1e98a9254916276e2badccb1d7ea44ec Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:52:07 -0700 Subject: [PATCH 05/10] Ignore Gemfile.lock and vendor/bundle --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4badd80a..88bbe15c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,9 @@ doc .yardoc # bundler -.bundle +/.bundle +/Gemfile.lock +/vendor/bundle # rspec logs log From 52125533b08ff6dccc2c7863513dc6197db103c4 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:54:24 -0700 Subject: [PATCH 06/10] Pin i18n to support tests on Ruby 1.8.7 --- formtastic-bootstrap.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/formtastic-bootstrap.gemspec b/formtastic-bootstrap.gemspec index 889bf151..b4ec425c 100644 --- a/formtastic-bootstrap.gemspec +++ b/formtastic-bootstrap.gemspec @@ -29,6 +29,7 @@ Gem::Specification.new do |s| s.add_development_dependency('rake') s.add_development_dependency('tzinfo') s.add_development_dependency('bundler') + s.add_development_dependency('i18n', ["< 0.7.0"]) s.add_development_dependency('nokogiri', ["< 1.6.0"]) s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"]) s.add_development_dependency('ammeter', ["~> 0.2"]) From d34c609fa2e250e3f603cba76dc7d23cb4beab6d Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:56:37 -0700 Subject: [PATCH 07/10] Add back development dependencies on rspec --- formtastic-bootstrap.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/formtastic-bootstrap.gemspec b/formtastic-bootstrap.gemspec index b4ec425c..ff61b8e0 100644 --- a/formtastic-bootstrap.gemspec +++ b/formtastic-bootstrap.gemspec @@ -31,6 +31,8 @@ Gem::Specification.new do |s| s.add_development_dependency('bundler') s.add_development_dependency('i18n', ["< 0.7.0"]) s.add_development_dependency('nokogiri', ["< 1.6.0"]) + s.add_development_dependency('rspec', ["~> 2.14"]) + s.add_development_dependency('rspec-rails', ["~> 2.14"]) s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"]) s.add_development_dependency('ammeter', ["~> 0.2"]) s.add_development_dependency('actionpack', ["~> 3.2"]) From 0e2060cc086f95a857aaac63302f5a310682d92d Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:58:43 -0700 Subject: [PATCH 08/10] Formtastic no longer supports Ruby 1.8.7, neither can we --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99e43836..d8f19639 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1 From 1fdab98a64ff000092cdef87fdd6eeee9bf2537b Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 20:59:02 -0700 Subject: [PATCH 09/10] Remove gems pinned for Ruby 1.8.7 --- formtastic-bootstrap.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/formtastic-bootstrap.gemspec b/formtastic-bootstrap.gemspec index ff61b8e0..1a6420b0 100644 --- a/formtastic-bootstrap.gemspec +++ b/formtastic-bootstrap.gemspec @@ -29,8 +29,7 @@ Gem::Specification.new do |s| s.add_development_dependency('rake') s.add_development_dependency('tzinfo') s.add_development_dependency('bundler') - s.add_development_dependency('i18n', ["< 0.7.0"]) - s.add_development_dependency('nokogiri', ["< 1.6.0"]) + s.add_development_dependency('nokogiri') s.add_development_dependency('rspec', ["~> 2.14"]) s.add_development_dependency('rspec-rails', ["~> 2.14"]) s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"]) From 26027193449d84ae895e13523d9305f2d0ed4714 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 3 Apr 2015 21:00:23 -0700 Subject: [PATCH 10/10] Update rspec 3.0 development dependency --- formtastic-bootstrap.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/formtastic-bootstrap.gemspec b/formtastic-bootstrap.gemspec index 1a6420b0..78d90fa7 100644 --- a/formtastic-bootstrap.gemspec +++ b/formtastic-bootstrap.gemspec @@ -30,8 +30,8 @@ Gem::Specification.new do |s| s.add_development_dependency('tzinfo') s.add_development_dependency('bundler') s.add_development_dependency('nokogiri') - s.add_development_dependency('rspec', ["~> 2.14"]) - s.add_development_dependency('rspec-rails', ["~> 2.14"]) + s.add_development_dependency('rspec', ["~> 3.0"]) + s.add_development_dependency('rspec-rails', ["~> 3.0"]) s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"]) s.add_development_dependency('ammeter', ["~> 0.2"]) s.add_development_dependency('actionpack', ["~> 3.2"])