rails_gem_install 0.3.2 → 0.3.3

data/Rakefile

@@ -10,7 +10,8 @@ begin
     gem.email = "scottwb@gmail.com"
     gem.homepage = "http://github.com/scottwb/rails_gem_install"
     gem.authors = ["Scott W. Bradley"]
-    gem.add_development_dependency "shoulda", ">= 0"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rcov", ">= 0.9.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -18,29 +19,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :test => :check_dependencies
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/rails_gem_install/rails_gem_installer.rb

@@ -28,9 +28,25 @@ class RailsGemInstaller
   # Parses out any dependency gems listed that are not yet satisified.
   def parse_deps(input)
     matches = input.scan(/\s+-\s+\[ \]\s+(\S+)\s+(\S+\s+[0-9.]+)/) || []
-    matches.map do |match|
+
+    gemspecs = matches.map do |match|
       {:name => match[0], :version => match[1]}
     end
+
+    # NOTE: These gemspecs are gems that are not yet loaded. We don't know if
+    #       they are installed or not, so we don't know for sure if the
+    #       dependency will be met at runtime. So, we'll execute a gem command
+    #       to check to see if these are installed and ignore the ones that
+    #       already are.
+    gemspecs.delete_if do |gemspec|
+      cmd = "gem list #{gemspec[:name]} -i -l"
+      if gemspec[:version]
+        cmd << " -v '#{gemspec[:version]}'"
+      end
+      `#{cmd}` =~ /true/
+    end
+
+    return gemspecs
   end
 
   # Gets the set of required gems that need to be installed.

data/spec/rails_gem_installer_spec.rb

@@ -0,0 +1,103 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe RailsGemInstaller do
+  describe "#parse_required" do
+    context "when there is a missing required gem" do
+      it "should return an array of just that gem with no version" do
+        gemspecs = subject.parse_required("no such file to load -- gdata\n")
+        gemspecs.should have(1).gemspec
+        gemspecs.first.should have(1).member
+        gemspecs.first.should have_key(:name)
+        gemspecs.first.should_not have_key(:version)
+        gemspecs.first[:name].should == 'gdata'
+      end
+    end
+
+    context "when there are no missing required gems" do
+      it "should returns an empty array" do
+        gemspecs = subject.parse_required("\n")
+        gemspecs.should be_empty
+      end
+    end
+  end
+
+  describe "#parse_missing" do
+    context "when there are missing gems that specify version numbers" do
+      it "should return an array of gemspec hashes including name and version" do
+        pending "This is currently known to be broken."
+        gemspecs = subject.parse_missing <<EOT
+Missing these required gems:
+  sanitize  = 1.2.1
+
+You're running:
+  ruby 1.8.7.174 at blah blah blah
+EOT
+        gemspecs.should have(1).gemspec
+        gemspecs.first.should have(2).members
+        gemspecs.first[:name].should == 'sanitize'
+        gemspecs.first[:version].should == '= 1.2.1'
+      end
+    end
+
+    context "when there are missing gems that do not specify version numbers" do
+      it "should return an array of gemspec hashes including just the name" do
+        pending "This is currently known to be broken."
+        gemspecs = subject.parse_missing <<EOT
+Missing these required gems:
+  sanitize
+
+You're running:
+  ruby 1.8.7.174 at blah blah blah
+EOT
+        gemspecs.should have(1).gemspec
+        gemspecs.first.should have(1).member
+        gemspecs.first[:name].should == 'sanitize'
+      end
+    end
+  end
+
+  describe "#parse_deps" do
+    context "when there are uninstalled dependencies of a specific version" do
+      it "should return an array of gemspec hashes including name and version" do
+        gemspecs = subject.parse_deps <<EOT
+ - [I] rmagick 
+ - [I] gdata 
+ - [I] responders ~> 0.4.6
+ - [I] sanitize = 1.2.1
+    - [ ] nokogiri ~> 1.4.1
+ - [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 have(1).gemspec
+        gemspecs.first.should have(2).members
+        gemspecs.first[:name].should == 'nokogiri'
+        gemspecs.first[:version].should == '~> 1.4.1'        
+      end
+    end
+
+    context "when there are uninstalled dependencies that do not specify a version" do
+      it "should return an array of gemspec hashes including just the name" do
+        pending "This is currently known to be broken."
+        gemspecs = subject.parse_deps <<EOT
+ - [I] rmagick 
+ - [ ] gdata 
+ - [I] responders ~> 0.4.6
+ - [I] sanitize = 1.2.1
+    - [I] nokogiri ~> 1.4.1
+ - [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 have(1).gemspec
+        gemspecs.first.should have(1).member
+        gemspecs.first[:name].should == 'gdata'
+      end
+    end
+  end
+
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format nested

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,10 +1,9 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rails_gem_install'
+require 'spec'
+require 'spec/autorun'
 
-class Test::Unit::TestCase
+Spec::Runner.configure do |config|
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Scott W. Bradley
@@ -14,21 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-12-07 00:00:00 -08:00
 default_executable: rails_gem_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id002
 description: "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."
 email: scottwb@gmail.com
 executables: 
@@ -50,8 +66,9 @@ files:
 - lib/rails_gem_install.rb
 - lib/rails_gem_install/rails.rb
 - lib/rails_gem_install/rails_gem_installer.rb
-- test/helper.rb
-- test/test_rails_gem_install.rb
+- spec/rails_gem_installer_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/scottwb/rails_gem_install
 licenses: []
@@ -83,5 +100,5 @@ signing_key:
 specification_version: 3
 summary: Installs gem dependencies for a Rails 2 project.
 test_files: 
-- test/helper.rb
-- test/test_rails_gem_install.rb
+- spec/rails_gem_installer_spec.rb
+- spec/spec_helper.rb

data/test/test_rails_gem_install.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRailsGemInstall < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    #flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end