gemfresh 1.0.2 → 1.0.3

data/README.md

@@ -4,17 +4,20 @@ Scans your bundler Gemfile and lets you know how up-to-date your gems are.
 ## Installation and Usage
 
 To install, simply grab the gem:
+
     gem install gemfresh
-    
+
 Change a project directory with a Gemfile (e.g. Your Rails v3+ project) and
 type:
+
     gemfresh
 
 This will output a list of current, updateable and obsolete gems. For more
 information on what this means, run gemfresh with the --help option:
+    
     gemfresh --help
     
 ## License
 MIT Licensed. See MIT-LICENSE.txt for more information.
 
-Thanks [@jonathannen](http://twitter.com/jonathannen).
+Thanks, [@jonathannen](http://twitter.com/jonathannen).

data/gemfresh.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'gemfresh'
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Jon Williams']
   s.email       = ['jon@jonathannen.com']

data/gemfresh.rb

@@ -14,13 +14,17 @@ if ARGV.include?('--help')
   your current directory. Generally you'll simply invoke gemfresh from your 
   Rails (or similar) project directory.
     
-  Gemfresh will list three categories of gems. "Current" gems are up-to-date.
-  "Obsolete" gems 
+  Gemfresh will list three categories of gems:
+    
+    "Current" gems are up-to-date.
+    
+    "Obsolete" gems have a newer version than the one specified in your Gemfile
   
-  "Updateable" gems that have a 'fuzzy' gemspec - e.g. '~> 2.2.0' is a fuzzy
-  match for 2.2.1, 2.2.2, etc. Running bundle update will attempt to update
-  your gems. If something is listed at updateable, you have an older version
-  - e.g. "2.2.1", when the current is "2.2.2".
+    "Updateable" gems have a newer version, and it is within the version in your Gemfile
+    e.g. Gemfile:      '~> 2.2.0'
+         Gemfile.lock: 2.2.1
+         Latest:       2.2.2
+    Running bundle update will attempt to update these gems.
 
   Just because a gem is updateable or obsolete, doesn't mean it can be 
   updated. There might be dependencies that limit you to specific versions.
@@ -28,7 +32,7 @@ if ARGV.include?('--help')
   Check the bundler documentation (http://gembundler.com/) for more 
   information on Gemfiles.
   HELP
-  exit
+  exit 1
 end
 
 # Check for gemfile and lockfiles
@@ -36,34 +40,14 @@ gemfile = ARGV[0] || './Gemfile'
 lockfile = ARGV[1] || './Gemfile.lock'
 unless File.exists?(gemfile)
   puts "Couldn't find #{gemfile}.\nRun gemfresh with --help if you need more information."
-  exit
+  exit -1
 end
 unless File.exists?(lockfile)
   puts "Couldn't find #{lockfile}.\nRun gemfresh with --help if you need more information."
-  exit
-end
-
-# Front for RubyGems
-class RubyGemReader < Struct.new('RubyGemReader', :uri)
-  def get(path, data={}, content_type='application/x-www-form-urlencoded')
-    request = Net::HTTP::Get.new(path)
-    request.add_field 'Connection', 'keep-alive'
-    request.add_field 'Keep-Alive', '30'
-    request.add_field 'User-Agent', 'github.com/jonathannen/gemfresh'
-    response = connection.request request
-    response.body  
-  end
-  private
-  # A persistent connection
-  def connection(host = Gem.host)
-    return @connection unless @connection.nil?
-    @connection = Net::HTTP.new self.uri.host, self.uri.port
-    @connection.start    
-    @connection
-  end
+  exit -1
 end
 
-# Start in earnets
+# Start in earnest
 puts "Checking the freshness of your Gemfile.\n"
 
 # Get the data from bundler
@@ -77,6 +61,8 @@ sources = {}
 results = { :current => [], :update => [], :obsolete => [] }
 count = 0
 prereleases = 0
+unavailable = 0
+untracked = 0
 
 # Map dependencies to their specs, then select RubyGem sources
 dep_specs = deps.map { |dep| [dep, specs.find { |spec| spec.name == dep.name }] }
@@ -85,43 +71,67 @@ dep_specs = dep_specs.select { |dep, spec| !spec.nil? && (spec.source.class == B
 # Do we have any deps?
 if deps.empty?
   puts "No top-level RubyGem dependencies found in your Gemfile.\nRun gemfresh with --help if you need more information."
-  exit
+  exit true # Successful in that everything is theoretically up-to-date
 end
 
 # Iterate through the deps, checking the spec against the latest version
 print "Hitting up your RubyGems sources: "
 dep_specs.each do |dep, spec|
   name = dep.name
-  # version = spec.version.to_s
-  
-  # Get a connection to the rubygem repository, reusing if we can
-  remote = spec.source.remotes.first
-  next if remote.nil?
-  reader = sources[remote]
-  reader = sources[remote] = RubyGemReader.new(remote) if reader.nil?
-  
-  # Get the RubyGems data
-  # lookup = RubyGems.get("/api/v1/gems/#{name}.yaml")
-  gemdata = reader.get("/api/v1/gems/#{name}.yaml")
-  gemdata = YAML.load(gemdata)
-
-  # Get the versions list as well
-  versions = reader.get("/api/v1/versions/#{name}.yaml")
-  versions = YAML.load(versions)
-  
-  # Store the result as a diff object
-  diff = SpecDiff.new(dep, spec, gemdata, versions)
-  results[diff.classify] << diff
-  
-  # Stats
-  prereleases +=1 if diff.prerelease?
-  count += 1
-  print "."
+
+  # Get a connection to the rubygem repository, reusing the source
+  # connection if we can. Any error and that source is marked unavailable.
+  gemdata = versions = false
+  spec.source.remotes.each do |remote|
+    begin 
+      next if remote.nil?
+      reader = sources[remote]
+      next if reader == :unavailable # Source previously marked unavailable
+      reader = sources[remote] = RubyGemReader.new(remote) if reader.nil?
+
+      # Get the RubyGems data
+      # lookup = RubyGems.get("/api/v1/gems/#{name}.yaml")
+      gemdata = reader.get("/api/v1/gems/#{name}.yaml")
+      gemdata = YAML.load(gemdata)
+
+      # Get the versions list as well
+      versions = reader.get("/api/v1/versions/#{name}.yaml")
+      versions = YAML.load(versions)
+      
+      # Break if we've got the data we need
+      break unless !gemdata || !versions
+            
+    rescue SourceUnavailableError => sae
+      # Mark source as unavailable
+      sources[remote] = :unavailable
+    end
+  end
+
+  # No Gem Data or Version information? Not a versioned or tracked gem, so
+  # nothing we can deal with
+  if !gemdata || !versions || gemdata['version'].nil?
+    unavailable =+ 1
+    print "x"
+ 
+  # Otherwise, all good - store as a diff and move on
+  else
+    diff = SpecDiff.new(dep, spec, gemdata, versions)
+    results[diff.classify] << diff
+    prereleases +=1 if diff.prerelease?
+    count += 1
+    print "."
+  end
+
   STDOUT.flush
 end
 puts " Done!"
 
-# Let the user about prereleases
+# Let the user know about prereleases
+if unavailable > 0
+  puts "\nCouldn't get data for #{unavailable} gem#{unavailable == 1 ? '' : 's'}. It might be the RubyGem source is down or unaccessible. Give it another try in a moment."
+end
+
+# Let the user know about prereleases
 if prereleases > 0
   puts "\nYou have #{prereleases} prerelease gem#{prereleases == 1 ? '' : 's'}. Prereleases will be marked with a '*'."
 end
@@ -170,30 +180,5 @@ else
   end
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+# Exit code is determined by presence of obsolete gems
+exit results[:obsolete].empty?

data/support.rb

@@ -1,3 +1,42 @@
+# Front for RubyGems
+class SourceUnavailableError < StandardError; end
+class RubyGemReader
+  attr_reader :uri
+  
+  def initialize(uri)
+    @connection = nil
+    @uri = uri #.gsub('https://', 'http://') # No SSL for the moment
+    # puts @uri.inspect
+    # puts @uri.scheme
+  end
+  
+  # May raise SourceUnavailableError if the source can't be accessed
+  def get(path, data={}, content_type='application/x-www-form-urlencoded')
+    begin
+      request = Net::HTTP::Get.new(path)
+      request.add_field 'Connection', 'keep-alive'
+      request.add_field 'Keep-Alive', '30'
+      request.add_field 'User-Agent', 'github.com/jonathannen/gemfresh'
+      response = connection.request request
+      response.body  
+    rescue StandardError => se
+      # For now we assume this is an unavailable repo
+      raise SourceUnavailableError.new(se.message)
+    end
+  end
+  
+  private
+  # A persistent connection
+  def connection
+    return @connection unless @connection.nil?
+    @connection = Net::HTTP.new self.uri.host, self.uri.port
+    @connection.start    
+    @connection
+  end
+end
+
+
+# A class to encapsulate the difference between gem states
 class SpecDiff < Struct.new(:dep, :spec, :gemdata, :versions)
   
   # Configure the diff

metadata

@@ -1,49 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gemfresh
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Jon Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-29 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70155552550560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70155552550560
 description: Scans Gemfiles to check for obsolete and updateable gems.
-email: 
+email:
 - jon@jonathannen.com
-executables: 
+executables:
 - gemfresh
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE.txt
@@ -53,39 +39,28 @@ files:
 - gemfresh.gemspec
 - gemfresh.rb
 - support.rb
-has_rdoc: true
 homepage: https://github.com/jonathannen/gemfresh
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Checks the freshness of your Gemfile.
 test_files: []
-