rails_gem_install 0.3.3 → 0.3.4

data/CHANGES.rdoc

@@ -1,3 +1,13 @@
+== 0.3.4
+
+* Workaround to detect missing required gems that use a slash in their 
+  require path, but need to use a dash when installin the gem by name.
+
+== 0.3.3
+
+* Fixed the installation of non-loaded gems to first check whether or not
+  they are actually installed (just not loaded).
+
 == 0.3.2
 
 * Fixed non-root gem install issues on FreeBSD.

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/rails_gem_install/rails_gem_installer.rb

@@ -73,7 +73,18 @@ class RailsGemInstaller
     end
 
     puts cmd
-    system cmd
+    exit_code = system(cmd)
+    if !exit_code && (gemspec[:name] =~ /^(.+)\/(.+)$/)
+      # The gem we're shooting for failed and has a slash in it's name,
+      # this is likely because there was a require that listed a path. One way
+      # this happens is when multiple gems like to install to the same
+      # require namespace to act like separate parts of a larger whole. For
+      # example redis and redis-namespace gems. To attempt to handle this,
+      # try the failed a/b gem as a-b.
+      exit_code = install_gem(gemspec.merge(:name => "#{$1}-#{$2}"))
+    end
+
+    return exit_code
   end
 
   # Finds all the gems that need to be installed for this Rails project to

data/rails_gem_install.gemspec

@@ -0,0 +1,64 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rails_gem_install}
+  s.version = "0.3.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Scott W. Bradley"]
+  s.date = %q{2010-12-27}
+  s.default_executable = %q{rails_gem_install}
+  s.description = %q{Installs gem dependencies for a Rails 2 project where `rake gems:install` fails. I.e.: breaks the circular dependencies of requiring Rails and anything your vendored gems/plugins require in order to install these requirements.}
+  s.email = %q{scottwb@gmail.com}
+  s.executables = ["rails_gem_install"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "CHANGES.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/rails_gem_install",
+     "lib/rails_gem_install.rb",
+     "lib/rails_gem_install/rails.rb",
+     "lib/rails_gem_install/rails_gem_installer.rb",
+     "rails_gem_install.gemspec",
+     "spec/rails_gem_installer_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/scottwb/rails_gem_install}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Installs gem dependencies for a Rails 2 project.}
+  s.test_files = [
+    "spec/rails_gem_installer_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rcov>, [">= 0.9.8"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rcov>, [">= 0.9.8"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rcov>, [">= 0.9.8"])
+  end
+end
+

data/spec/rails_gem_installer_spec.rb

@@ -64,7 +64,7 @@ EOT
  - [I] gdata 
  - [I] responders ~> 0.4.6
  - [I] sanitize = 1.2.1
-    - [ ] nokogiri ~> 1.4.1
+    - [ ] somemissinggem ~> 1.4.1
  - [I] panztel-actionwebservice = 2.3.5
     - [R] actionpack = 2.3.5
     - [R] activerecord = 2.3.5
@@ -73,7 +73,7 @@ EOT
 EOT
         gemspecs.should have(1).gemspec
         gemspecs.first.should have(2).members
-        gemspecs.first[:name].should == 'nokogiri'
+        gemspecs.first[:name].should == 'somemissinggem'
         gemspecs.first[:version].should == '~> 1.4.1'        
       end
     end
@@ -98,6 +98,26 @@ EOT
         gemspecs.first[:name].should == 'gdata'
       end
     end
+
+    context "when there are installed-but-not-loaded dependencies" do
+      it "should not return those gems" do
+        # REVISIT: This assumes you have rspec installed, cuz who doesn't
+        #          have that but is still trying to run specs?
+        gemspecs = subject.parse_deps <<EOT
+ - [I] rmagick 
+ - [I] gdata 
+ - [I] responders ~> 0.4.6
+ - [I] sanitize = 1.2.1
+    - [ ] rspec
+ - [I] panztel-actionwebservice = 2.3.5
+    - [R] actionpack = 2.3.5
+    - [R] activerecord = 2.3.5
+ - [I] fastthread 
+ - [I] jammit = 0.4.4
+EOT
+        gemspecs.should be_empty
+      end
+    end
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Scott W. Bradley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2010-12-27 00:00:00 -08:00
 default_executable: rails_gem_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
 - lib/rails_gem_install.rb
 - lib/rails_gem_install/rails.rb
 - lib/rails_gem_install/rails_gem_installer.rb
+- rails_gem_install.gemspec
 - spec/rails_gem_installer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb