rails4_upgrade 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 19de36d8bed934a744197d51f6d001578f63e02c
+  data.tar.gz: 39baac836441ae38f2e794d1ee0982259e2ad0f3
+SHA512:
+  metadata.gz: ceb90705ba7ca73d048d729c0eeb0da81f6d44bb917320d1c6059802ef4ab876843f196712445cee5b42c601e06056fcbb474fbfbca3198ea13c8b9a85c4e570
+  data.tar.gz: 21ab28067925272b51603ede70fa70c9d52189f79cd6c34e0e405b500d95118fddc7457581c7987e60ae3af68f4a0f209d49c58f5f02cf65116e8dad5438e483

data/lib/rails4_upgrade/incompatible_gems.rb

@@ -23,8 +23,10 @@ module Rails4Upgrade
           if !dependency.satisfied_by_rails4?
             incompatibilities << GemIncompatibility.new(dependency, dependency_path)
           end
-        elsif gem = @gemfile[dependency.name]
-          incompatibilities.concat(incompatibilities_for(gem, dependency_path))
+        elsif gem.name != dependency.name
+          if gem_dependency = @gemfile[dependency.name]
+            incompatibilities.concat(incompatibilities_for(gem_dependency, dependency_path))
+          end
         end
 
         incompatibilities

data/lib/rails4_upgrade/version.rb

@@ -1,3 +1,3 @@
 module Rails4Upgrade
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/fixtures/gemfiles/Gemfile_with_recursive_dependency.lock

@@ -0,0 +1,254 @@
+GIT
+  remote: git://github.com/alindeman/rails4_upgrade.git
+  revision: 2fd7e69c664a7b781c5c0467e69a0824ee2d67b9
+  specs:
+    rails4_upgrade (0.0.4)
+      bundler (>= 1.2.2)
+      terminal-table (>= 1.4.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      mail (~> 2.5.3)
+    actionpack (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta1)
+      activemodel (= 4.0.0.beta1)
+      activerecord-deprecated_finders (~> 0.0.3)
+      activesupport (= 4.0.0.beta1)
+      arel (~> 4.0.0.beta1)
+    activerecord-deprecated_finders (0.0.3)
+    activesupport (4.0.0.beta1)
+      i18n (~> 0.6.2)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    addressable (2.3.3)
+    arel (4.0.0.beta2)
+    atomic (1.0.1)
+    awesome_print (1.1.0)
+    bcrypt-ruby (3.0.1-x86-mingw32)
+    better_errors (0.7.2)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
+    bootstrap-datepicker-rails (1.0.0.2)
+      railties (>= 3.0)
+    bootstrap-sass (2.3.1.0)
+      sass (~> 3.2)
+    builder (3.1.4)
+    capybara (2.0.3)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
+    coffee-rails (4.0.0.beta1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0.beta, < 5.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.2)
+    columnize (0.3.6)
+    cucumber (1.2.3)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    cucumber-rails (1.3.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.8)
+      nokogiri (>= 1.5.0)
+    database_cleaner (0.9.1)
+    debug_inspector (0.0.2)
+    debugger (1.5.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
+    devise (1.5.4)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.1)
+    diff-lcs (1.2.1)
+    email_spec (1.4.0)
+      launchy (~> 2.1)
+      mail (~> 2.2)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+    ffi (1.6.0-x86-mingw32)
+    figaro (0.6.3)
+      bundler (~> 1.0)
+      rails (>= 3, < 5)
+    formtastic (2.2.1)
+      actionpack (>= 3.0)
+    formtastic-bootstrap (2.0.0)
+      formtastic (~> 2.2)
+      formtastic-bootstrap
+    gherkin (2.11.6-x86-mingw32)
+      json (>= 1.7.6)
+    haml (4.0.1)
+      tilt
+    haml-rails (0.4)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (>= 3.1, < 4.1)
+      railties (>= 3.1, < 4.1)
+    hike (1.2.1)
+    hirb (0.7.1)
+    i18n (0.6.4)
+    jbuilder (1.0.2)
+      activesupport (>= 3.0.0)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    launchy (2.2.0)
+      addressable (~> 2.3)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    minitest (4.7.0)
+    multi_json (1.7.2)
+    nokogiri (1.5.9-x86-mingw32)
+    orm_adapter (0.0.7)
+    pg (0.15.0-x86-mingw32)
+    polyglot (0.3.3)
+    puma (1.6.3)
+      rack (~> 1.2)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0.beta1)
+      actionmailer (= 4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activerecord (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0.beta1)
+      sprockets-rails (~> 2.0.0.rc3)
+    railties (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.17.0, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rubyzip (0.9.9)
+    sass (3.2.7)
+    sass-rails (4.0.0.beta1)
+      railties (>= 4.0.0.beta, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0.rc0)
+      tilt (~> 1.3)
+    selenium-webdriver (2.31.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    sprockets (2.9.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.rc3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7-x86-mingw32)
+    terminal-table (1.4.5)
+    thor (0.18.0)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.3.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    turbolinks (1.1.0)
+      coffee-rails
+    tzinfo (0.3.37)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
+    websocket (1.0.7)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  awesome_print
+  better_errors
+  binding_of_caller
+  bootstrap-datepicker-rails
+  bootstrap-sass
+  capybara
+  coffee-rails (~> 4.0.0.beta1)
+  cucumber-rails
+  database_cleaner
+  debugger
+  devise
+  email_spec
+  factory_girl_rails
+  figaro
+  formtastic
+  formtastic-bootstrap
+  haml
+  haml-rails
+  hirb
+  jbuilder (~> 1.0.1)
+  jquery-rails
+  launchy
+  pg
+  puma
+  quiet_assets
+  rails (= 4.0.0.beta1)
+  rails4_upgrade!
+  rspec-rails
+  sass-rails (~> 4.0.0.beta1)
+  sqlite3 (= 1.3.7)
+  turbolinks
+  uglifier (>= 1.0.3)

data/spec/incompatible_gems_spec.rb

@@ -51,5 +51,16 @@ module Rails4Upgrade
         expect(incompatibilities[2].path[1].name).to eq("polyamorous")
       end
     end
+
+    context "with a Gemfile that has a recursive dependency" do
+      let(:gemfile_path) { File.join(File.dirname(__FILE__), "fixtures", "gemfiles", "Gemfile_with_recursive_dependency.lock") }
+      let(:gemfile) { Rails4Upgrade::Gemfile.new(File.open(gemfile_path)) }
+      subject(:incompatible_gems) { IncompatibleGems.new(gemfile) }
+
+      it "lists incompatibilities" do
+        incompatibilities = incompatible_gems.incompatibilities
+        expect(incompatibilities.size).to eq(0)
+      end
+    end
   end
 end

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rails4_upgrade
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Andy Lindeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-    none: false
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
-    none: false
   type: :runtime
   prerelease: false
-  name: bundler
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.5
-    none: false
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.5
-    none: false
   type: :runtime
   prerelease: false
-  name: terminal-table
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.0
-    none: false
+        version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
   type: :development
   prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-    none: false
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
   type: :development
   prerelease: false
-  name: rspec
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    none: false
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
-    none: false
   type: :development
   prerelease: false
-  name: vcr
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
-    none: false
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
-    none: false
   type: :development
   prerelease: false
-  name: webmock
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: Upgrade assistant for transitioning applications from Rails 3 to Rails
   4
 email:
@@ -136,42 +123,37 @@ files:
 - rails4_upgrade.gemspec
 - spec/fixtures/gemfiles/Gemfile_with_devise.lock
 - spec/fixtures/gemfiles/Gemfile_with_ransack.lock
+- spec/fixtures/gemfiles/Gemfile_with_recursive_dependency.lock
 - spec/gemfile_spec.rb
 - spec/incompatible_gems_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.upgradingtorails4.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 278273491
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 278273491
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Upgrade assistant for transitioning applications from Rails 3 to Rails 4
 test_files:
 - spec/fixtures/gemfiles/Gemfile_with_devise.lock
 - spec/fixtures/gemfiles/Gemfile_with_ransack.lock
+- spec/fixtures/gemfiles/Gemfile_with_recursive_dependency.lock
 - spec/gemfile_spec.rb
 - spec/incompatible_gems_spec.rb
 - spec/spec_helper.rb