gemist 0.0.5 → 0.1.0

data/HISTORY.md

@@ -1,3 +1,9 @@
+v0.1.0 - May 28, 2011
+---------------------
+
+### Added:
+  * Gemfile.lock support
+
 v0.0.5 - May 15, 2011
 ---------------------
 

data/README.md

@@ -1,18 +1,25 @@
 # Gemist
 #### An extremely minimal solution to gem isolation
 
-**Bundler + faster + smaller (<4kb) = Gemist**
+Gemist is a solution to load the correct gems for a project based on a Gemfile 
+manifest.
 
-You don't need Bundler for gem management. Rubygems can do it already. Let me 
-show you what I mean:
+Gemist is a leaner (4kb), faster runtime that is Bundler-compatible. It does not 
+actually require Bundler.
 
 ## Getting started
 
+Install it:
+
+    $ gem install gemist
+
 Make a file in your project called `Gemfile`.
 
 ``` ruby
 # Gemfile
 gem "sinatra"
+gem "haml"
+gem "sass"
 gem "ohm", "0.1.3"
 
 # These will only be for the development environment
@@ -22,10 +29,13 @@ end
 
 # You may specify multiple files to be required
 gem "rails", ">= 3.0", require: ['rails', 'action_controller']
+
+# You can also specify more than one version requirement
+gem "compass", "~> 0.11.1", "<= 0.11.5"
 ```
 
 In your project file, do this.
-This `require`s the gems defined in the Gemfile.
+This `require`s the gems defined in the Gemfile based on the `RACK_ENV`.
 
 ``` ruby
 require 'gemist'
@@ -77,18 +87,18 @@ handle.
 
 ### Freezing gem versions
 
-Gemist doesn't care about your `Gemfile.lock`.
+If your project has a Bundler-generated `Gemfile.lock` file, Gemist will use it.  
+This file can be generated using `bundle update --local`. Note that this is 
+completely optional!
 
-This means that to ensure your app will work with future gem releases, you
-should add versions like so (using `~>` is highly recommended):
+Also, to ensure your app will work with future gem releases, you should add 
+versions like so (using `~>` is highly recommended):
 
 ``` ruby
 # Gemfile
 gem "sinatra", "~> 1.1"
 ```
 
-If you need a Gemfile.lock for whatever reason, use `bundle update --local`.
-
 ### Vendoring gems
 
 Gemist does NOT vendor gems for you. Rubygems helps you with that already!
@@ -148,14 +158,6 @@ Benchmark.measure { require 'bundler'; Bundler.require }  #=> 2.5s average
 Benchmark.measure { require 'gemist';  Gemist.require }   #=> 1.6s average
 ```
 
-## Don't use this
-
-This is merely a proof-of-concept. It works (very well), but:
-
-1. The world has enough gem management tools, it doesn't need another.
-
-2. Bundler is better (though it's more bloated and does more things).
-
 ## Not going to happen
 
 Gemist will never have:

data/lib/gemist.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 
 # Gem environment manager.
 module Gemist
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 
   def self.version
     VERSION
@@ -72,6 +72,10 @@ class Gemist::Gemfile
     Dir["./{Gemistfile,Gemfile,Isolate}"].first
   end
 
+  def self.lockfile_path
+    Dir["./{Gemistfile,Gemfile,Isolate}.lock"].first
+  end
+
   # Checks if the project has a Gemfile manifest.
   def self.exists?
     !!path
@@ -79,11 +83,25 @@ class Gemist::Gemfile
 
   # Returns a Gemfile instance made from the project's manifest.
   def self.load
-    new File.read(path)  if exists?
+    new(File.read(path), lockfile_contents)  if exists?
   end
 
-  def initialize(contents)
+  def initialize(contents, lockfile)
     instance_eval contents
+
+    # Parse the lockfile
+    if lockfile
+      lockfile.split("\n").each { |s|
+        name, version = s.scan(/^    ([^ ]+) \(([0-9].*?)\)$/).first
+        gem = self[name]
+        gem.versions = [version]  if gem
+      }
+    end
+  end
+
+  # Returns a gem
+  def [](name)
+    gems.select { |gem| gem.name == name }.first
   end
 
   # The list of gems the Gemfile. Returns an array of Gem instances.
@@ -96,7 +114,11 @@ class Gemist::Gemfile
     gems.select { |g| g.group == nil || g.group.include?(env.to_s.to_sym) }
   end
 
-private
+protected
+  def self.lockfile_contents
+    File.read(lockfile_path)  if lockfile_path
+  end
+
   # (DSL) Adds a gem.
   #
   # == Example
@@ -113,7 +135,13 @@ private
     options[:version] ||= args
     options[:group]   ||= @group
 
-    self.gems << Gemist::Gem.new(options)
+    gem = self[name]
+
+    if gem
+      gem.update options
+    else
+      self.gems << Gemist::Gem.new(options)
+    end
   end
 
   # (DSL) Defines a group.
@@ -144,11 +172,15 @@ class Gemist::Gem
   attr_accessor :group
   attr_reader :error
 
-  def initialize(options)
-    self.name     ||= options[:name]
-    self.versions ||= options[:version]
-    self.group    ||= options[:group]
-    self.require  ||= options[:require]
+  def initialize(options={})
+    update options
+  end
+
+  def update(options={})
+    self.name       = options[:name]     unless options[:name].nil?
+    self.versions   = options[:version]  unless options[:version].nil?
+    self.group      = options[:group]    unless options[:group].nil?
+    self.require    = options[:require]  unless options[:require].nil?
     self.require    = self.name  if self.require.nil?
   end
 

data/test/fixtures/lock/Gemfile

@@ -0,0 +1 @@
+gem "sinatra", "~> 1.2.6"

data/test/fixtures/lock/Gemfile.lock

@@ -0,0 +1,15 @@
+GEM
+  specs:
+    contest (0.1.2)
+    rack (1.2.1)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    tilt (1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  contest
+  sinatra (~> 1.2.6)

data/test/lock_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class LockTest < Test::Unit::TestCase
+  setup do
+    Dir.chdir fx('lock/')
+    use_gemfile nil
+  end
+
+  teardown do
+    Dir.chdir fx
+  end
+
+  test "Gemfile.lock" do
+    Gem.expects(:activate).with('sinatra', '1.2.6').returns(true)
+
+    Gemist.setup
+  end
+end

data/test/test_helper.rb

@@ -20,11 +20,16 @@ class Test::Unit::TestCase
   end
 
   def fixture(path)
-    File.expand_path("../fixtures/#{path}", __FILE__)
+    fx path
   end
 
   def use_gemfile(what)
-    ENV['GEMFILE'] = fixture(what)
+    ENV['GEMFILE'] = what.nil? ? nil : fixture(what)
     Gemist.class_variable_set :@@gemfile, nil
   end
 end
+
+def fx(path='')
+  File.expand_path("../fixtures/#{path}", __FILE__)
+end
+

metadata

@@ -2,7 +2,7 @@
 name: gemist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +08:00
+date: 2011-05-28 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -29,9 +29,12 @@ files:
 - lib/gemist.rb
 - test/bogus_test.rb
 - test/fixtures/bogus.gemfile
+- test/fixtures/lock/Gemfile
+- test/fixtures/lock/Gemfile.lock
 - test/fixtures/require.gemfile
 - test/fixtures/sample.gemfile
 - test/gemist_test.rb
+- test/lock_test.rb
 - test/require_test.rb
 - test/test_helper.rb
 - HISTORY.md