gem_loader 0.1.4 → 0.2.0

data/README.markdown

@@ -23,18 +23,20 @@ You need to create a gem's dependencies file, such as "depends.rb" or any other
 	    gem "sinatra", "1.0"
 	  end
 
-	  scope :development do
+	  scope :optional
+	  
+	  scope :test do
 	    gem "rspec", ">= 1.3.0", :require => nil
 	  end
-  
-	  scope :test => [:runtime, :development]
+	
+	  scope :development => [ :optional, :test ]
   
 	  scope :rakefile do
 	    gem "rake", ">= 0.8.7"
 	    gem "jeweler", ">= 1.4.0"
-	    gem "rspec"
-    
-	    require "spec/rake/spectask"
+	    
+	    gem "rspec", :require => "spec/rake/spectask"   # '>= 1.3.0' version shared at :test scope
+	    
 	  end
 	end
 
@@ -65,5 +67,4 @@ example for Jeweler
 
 ## TODO
 
-  * Shared version of the definition of the gem's depends file
-  * Add a rake support, used to view the dependencies
+  * Add a rake or CLI support, used to view the dependencies

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/depends.rb

@@ -5,17 +5,18 @@ require File.expand_path("../lib/gem_loader", __FILE__)
 GemLoader.setup do
   
   scope :runtime
-
-  scope :development do
-    gem :rspec, ">= 1.3.0", :require => nil
+  
+  scope :optional
+  
+  scope :test do
+    gem "rspec", ">= 1.3.0", :require => nil
   end
   
-  scope :test => [ :runtime, :development ]
+  scope :development => [:optional, :test]
   
-  scope :rakefile => [ :runtime, :development ] do
-    gem :rake, ">= 0.8.7"
-    gem :jeweler, ">= 1.4.0"
-    
-    require "spec/rake/spectask"
+  scope :rakefile do
+    gem "rake", ">= 0.8.7"
+    gem "jeweler", ">= 1.4.0"
+    gem "rspec", :require => "spec/rake/spectask"
   end
 end

data/gem_loader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem_loader}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2010-03-28}
+  s.date = %q{2010-03-29}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,16 +24,18 @@ Gem::Specification.new do |s|
      "depends.rb",
      "gem_loader.gemspec",
      "lib/gem_loader.rb",
-     "lib/gem_loader/base.rb",
-     "lib/gem_loader/base/dsl.rb",
+     "lib/gem_loader/context.rb",
+     "lib/gem_loader/context/dsl.rb",
      "lib/gem_loader/gem.rb",
      "lib/gem_loader/gem/dsl.rb",
+     "lib/gem_loader/gem_requirement.rb",
      "lib/gem_loader/gemspec.rb",
      "lib/gem_loader/scope.rb",
      "lib/gem_loader/scope/dsl.rb",
      "lib/gem_loader/version.rb",
-     "spec/gem_loader/base/dsl_spec.rb",
-     "spec/gem_loader/base_spec.rb",
+     "spec/gem_loader/context/dsl_spec.rb",
+     "spec/gem_loader/context_spec.rb",
+     "spec/gem_loader/gem_requirement.rb",
      "spec/gem_loader/gem_spec.rb",
      "spec/gem_loader/gemspec_spec.rb",
      "spec/gem_loader/scope/dsl_spec.rb",
@@ -48,8 +50,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{a tiny gem's dependencies loader.}
   s.test_files = [
-    "spec/gem_loader/base/dsl_spec.rb",
-     "spec/gem_loader/base_spec.rb",
+    "spec/gem_loader/context/dsl_spec.rb",
+     "spec/gem_loader/context_spec.rb",
+     "spec/gem_loader/gem_requirement.rb",
      "spec/gem_loader/gem_spec.rb",
      "spec/gem_loader/gemspec_spec.rb",
      "spec/gem_loader/scope/dsl_spec.rb",

data/lib/gem_loader.rb

@@ -1,5 +1,5 @@
 require File.expand_path("../gem_loader/version", __FILE__)
-require File.expand_path("../gem_loader/base", __FILE__)
+require File.expand_path("../gem_loader/context", __FILE__)
 require File.expand_path("../gem_loader/gemspec", __FILE__)
 
 

data/lib/gem_loader/{base.rb → context.rb}

@@ -1,24 +1,26 @@
 require File.expand_path("../scope", __FILE__)
+require File.expand_path("../gem_requirement", __FILE__)
 require File.expand_path("../gem", __FILE__)
-require File.expand_path("../base/dsl", __FILE__)
+require File.expand_path("../context/dsl", __FILE__)
 
 module GemLoader
-  class Base
-    attr_accessor :scopes
+  class Context
+    attr_accessor :scopes, :gem_requirements
     
     def initialize
       self.scopes = {}
+      self.gem_requirements = {}
     end
     
-    def scope(name, depend_scopes = [])
-      self.scopes ||= {}
-      self.scopes[name] ||= Scope.new(name, depend_scopes)
+    def scope(name)
+      self.scopes[name] ||= Scope.new(self, name)
     end
     
-    def setup(&block)
-      self.dsl(&block)
+    def gem_requirement(name)
+      self.gem_requirements[name] ||= GemRequirement.new(name)
     end
     
+    
     def load(*args)
       scope_names = [ args ].flatten
       scope_names.each do |scope_name|
@@ -37,7 +39,7 @@ module GemLoader
   end
   
   def self.instance
-    @instance ||= Base.new
+    @instance ||= Context.new
   end
   
   def self.method_missing(sym, *args, &block)

data/lib/gem_loader/context/dsl.rb

@@ -0,0 +1,38 @@
+module GemLoader
+  class Context
+    
+    def setup(&block)
+      self.dsl(&block)
+    end
+    
+    def dsl(&block)
+      Dsl.new(self, &block)
+    end
+    
+    class Dsl
+      attr_accessor :context
+      
+      def initialize(context, &block)
+        self.context = context
+        instance_eval(&block) if block
+      end
+      
+      def scope(arg, &block)
+        if arg.is_a?(Hash)
+          name = arg.keys.first
+          depend_scope_names = [ arg[name] ].flatten
+        else
+          name = arg
+          depend_scope_names = []
+        end
+        
+        scope = self.context.scope(name)
+        depend_scope_names.each do |name|
+          scope.add_depend_scope(self.context.scope(name))
+        end
+        
+        scope.dsl(&block)
+      end
+    end
+  end
+end

data/lib/gem_loader/gem.rb

@@ -2,16 +2,29 @@ require File.expand_path("../gem/dsl", __FILE__)
 
 module GemLoader
   class Gem
-    attr_accessor :name, :version, :options, :requires
+    attr_accessor :name, :gem_requirement, :version_requirement, :options
     
-    def initialize(name, version = nil, options = {})
+    def initialize(name, gem_requirement, *args)
       self.name = name.to_s
-      self.version = version
-      self.options = options || {}
+      self.gem_requirement = gem_requirement
+      self.options = {}
+
+      self.parse_args(*args)
+    end
+    
+    def parse_args(*args)
+      self.options = args.pop if args.last.is_a?(Hash)
+      self.version_requirement = args.first
+      self.gem_requirement.add_version_requirement(version_requirement)
+      self
+    end
+    
+    def version_requirements
+      self.gem_requirement.version_requirements
     end
     
     def gem_args
-      [self.name, self.version].compact
+      [self.name, self.version_requirements ].compact.flatten
     end
     
     def load

data/lib/gem_loader/gem/dsl.rb

@@ -6,10 +6,10 @@ module GemLoader
     end
     
     class Dsl
-      attr_accessor :parent
+      attr_accessor :gem
 
-      def initialize(parent, &block)
-        self.parent = parent
+      def initialize(gem, &block)
+        self.gem = gem
         instance_eval(&block) if block
       end
     end

data/lib/gem_loader/gem_requirement.rb

@@ -0,0 +1,18 @@
+require File.expand_path("../gem/dsl", __FILE__)
+
+module GemLoader
+  class GemRequirement
+    
+    attr_accessor :name, :version_requirements
+    
+    def initialize(name)
+      self.name = name
+      self.version_requirements = []
+    end
+    
+    def add_version_requirement(version_requirement)
+      self.version_requirements << version_requirement if version_requirement
+    end
+    
+  end
+end

data/lib/gem_loader/scope.rb

@@ -2,13 +2,16 @@ require File.expand_path("../scope/dsl", __FILE__)
 
 module GemLoader
   class Scope
-    attr_accessor :name, :depend_scopes, :gems, :libs
+    attr_accessor :context, :name, :depend_scopes, :gems, :libs
     
-    def initialize(name, depend_scopes = [])
+    def initialize(context, name)
+      self.context = context
       self.name = name
-      self.depend_scopes = depend_scopes
-      self.gems = []
-      self.libs = []
+      self.depend_scopes, self.gems, self.libs = [], [], []
+    end
+    
+    def add_depend_scope(scope)
+      self.depend_scopes << scope
     end
     
     def all_gems
@@ -31,9 +34,10 @@ module GemLoader
       end
     end
     
-    def gem(name, version, options)
-      (self.gems ||= []) << Gem.new(name, version, options)
-      self.gems.last
+    def gem(name)
+      gem_requirement = self.context.gem_requirement(name)
+      gem = Gem.new(name, gem_requirement)
+      (self.gems << gem).last
     end
     
   end

data/lib/gem_loader/scope/dsl.rb

@@ -6,22 +6,19 @@ module GemLoader
     end
     
     class Dsl
-      attr_accessor :parent
+      attr_accessor :scope
       
-      def initialize(parent, &block)
-        self.parent = parent
+      def initialize(scope, &block)
+        self.scope = scope
         instance_eval(&block) if block
       end
       
-      def gem(*args, &block)
-        options = args.pop if args.last.is_a?(Hash)
-        name, version = *args
-        
-        self.parent.gem(name, version, options).dsl(&block)
+      def gem(name, *args, &block)
+        self.scope.gem(name).parse_args(*args).dsl(&block)
       end
       
       def require(*args)
-        self.parent.libs << [ args ].flatten
+        self.scope.libs << [ args ].flatten
       end
     end
   end

data/spec/gem_loader/context/dsl_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe GemLoader::Context::Dsl do
+  
+  
+  it "should say scope successful" do
+    @context.dsl do
+      scope :foo
+    end
+    
+    @context.scope(:foo).should_not be_nil
+  end
+  
+  it "should say scope with depend other scopes successful" do
+    @context.dsl do
+      scope :development => :test
+    end
+    
+    scope = @context.scope(:development)
+    scope.depend_scopes.last.should == @context.scope(:test)
+  end
+  
+end

data/spec/gem_loader/context_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe GemLoader::Context do
+  
+  it "should be build scope successful" do
+    scope = @context.scope("name")
+    @context.scope("name").should == scope
+    
+    scope2 = @context.scope("name") # reinvoke
+    scope.should == scope2
+  end
+  
+  it "should be build gem requirement successful" do
+    gem_requirement = @context.gem_requirement("name")
+    @context.gem_requirement("name").should == gem_requirement
+    
+    gem_requirement2 = @context.gem_requirement("name") # reinvoke
+    gem_requirement.should == gem_requirement2
+  end
+  
+end

data/spec/gem_loader/gem_requirement.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe GemLoader::GemRequirement do
+  
+ 
+  
+end

data/spec/gem_loader/gem_spec.rb

@@ -1,37 +1,46 @@
 require "spec_helper"
 
 describe GemLoader::Gem do
+
+  before(:each) do
+    gem_requirement = GemLoader::GemRequirement.new("foo")
+    @foo_gem = GemLoader::Gem.new("foo", gem_requirement)
+    @foo_gem2 = GemLoader::Gem.new("foo", gem_requirement)
+  end
   
   describe "should load and require by" do
     it "name only" do
-      @gem = GemLoader::Gem.new("foo")
       Kernel.should_receive(:gem).with("foo")
       Kernel.should_receive(:require).with("foo")
     end
 
     it "name and version" do
-      @gem = GemLoader::Gem.new("foo", "0.1")
-      Kernel.should_receive(:gem).with("foo", "0.1")
+      @foo_gem.parse_args("0.1")
+      @foo_gem2.parse_args(">= 0.2")
+      
+      Kernel.should_receive(:gem).with("foo", "0.1", ">= 0.2")
       Kernel.should_receive(:require).with("foo")
     end
 
     it "with require lib" do
-      @gem = GemLoader::Gem.new("actionpack", "~> 2.3.5", :require => ["action_pack", "action_view", "action_controller"])
-      Kernel.should_receive(:gem).with("actionpack", "~> 2.3.5")
+      @foo_gem.parse_args("~> 2.3.5", :require => ["action_pack", "action_view", "action_controller"])
+      
+      Kernel.should_receive(:gem).with("foo", "~> 2.3.5")
       Kernel.should_receive(:require).with("action_pack")
       Kernel.should_receive(:require).with("action_view")
       Kernel.should_receive(:require).with("action_controller")
     end
     
     it "skip require" do
-      @gem = GemLoader::Gem.new("foo", "0.1", :require => nil)
+      @foo_gem.parse_args("0.1", :require => nil)
+      
       Kernel.should_receive(:gem).with("foo", "0.1")
       Kernel.stub!(:require).and_raise("fail")
     end
     
     after(:each) do
-      @gem.load
-      @gem.require
+      @foo_gem.load
+      @foo_gem.require
     end
   end
   

data/spec/gem_loader/gemspec_spec.rb

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 describe GemLoader::Gemspec do
-  before(:each) do
-    @base = GemLoader::Base.new
-    GemLoader.stub!(:instance).and_return(@base)
-  end
   
   it "should integrate gemspec with gem_loader" do
     spec = Gem::Specification.new
@@ -13,7 +9,7 @@ describe GemLoader::Gemspec do
   end
   
   it "should integrate to gemspec" do
-    @base.setup do
+    @context.setup do
       scope :runtime do
         gem "run", "= 0.2"
       end

data/spec/gem_loader/scope/dsl_spec.rb

@@ -3,13 +3,13 @@ require "spec_helper"
 describe GemLoader::Scope::Dsl do
   
   before(:each) do
-    @scope = GemLoader::Scope.new("test")
+    @scope = @context.scope(:test)
     @dsl = GemLoader::Scope::Dsl.new(@scope)
   end
   
   it "should say gem success" do
-    @dsl.gem(:foo)
-    @scope.gems.last.name.should == "foo"
+    @scope.dsl { gem("foo") }
+    @scope.gem("foo").should_not be_nil
   end
   
   it "should say require success" do

data/spec/gem_loader/scope_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe GemLoader::Scope do
   
   before(:each) do
-    @scope = GemLoader::Scope.new("test")
+    @scope = @context.scope(:test)
   end
   
   it "should require by gem and libs" do
-    @scope.gems << GemLoader::Gem.new("foo")
+    @scope.gem("foo")
     @scope.libs << [ "bar", "biz" ]
     
     Kernel.should_receive(:require).with("foo")
@@ -18,9 +18,9 @@ describe GemLoader::Scope do
   end
   
   it "should include depends scope gems" do
-    depend_scope = GemLoader::Scope.new("depend")
-    depend_scope.gems << GemLoader::Gem.new("depend_gem")
-    @scope.gems << GemLoader::Gem.new("test_gem")
+    depend_scope = @context.scope("depend")
+    depend_scope.gem("depend_gem")
+    @scope.gem("test_gem")
     @scope.depend_scopes << depend_scope
     
     @scope.all_gems.should == [ depend_scope.gems + @scope.gems ].flatten

data/spec/spec_helper.rb

@@ -2,8 +2,14 @@ require File.expand_path("../../depends.rb", __FILE__)
 require "gem_loader"
 
 GemLoader.require(:test)
+GemLoader.require(:runtime, :development)
 
 
 Spec::Runner.configure do |config|
-
+  
+  config.before(:each) do
+    @context = GemLoader::Context.new
+    GemLoader.stub!(:instance).and_return(@context)
+  end
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sunteya
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-28 00:00:00 +08:00
+date: 2010-03-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,16 +49,18 @@ files:
 - depends.rb
 - gem_loader.gemspec
 - lib/gem_loader.rb
-- lib/gem_loader/base.rb
-- lib/gem_loader/base/dsl.rb
+- lib/gem_loader/context.rb
+- lib/gem_loader/context/dsl.rb
 - lib/gem_loader/gem.rb
 - lib/gem_loader/gem/dsl.rb
+- lib/gem_loader/gem_requirement.rb
 - lib/gem_loader/gemspec.rb
 - lib/gem_loader/scope.rb
 - lib/gem_loader/scope/dsl.rb
 - lib/gem_loader/version.rb
-- spec/gem_loader/base/dsl_spec.rb
-- spec/gem_loader/base_spec.rb
+- spec/gem_loader/context/dsl_spec.rb
+- spec/gem_loader/context_spec.rb
+- spec/gem_loader/gem_requirement.rb
 - spec/gem_loader/gem_spec.rb
 - spec/gem_loader/gemspec_spec.rb
 - spec/gem_loader/scope/dsl_spec.rb
@@ -97,8 +99,9 @@ signing_key:
 specification_version: 3
 summary: a tiny gem's dependencies loader.
 test_files: 
-- spec/gem_loader/base/dsl_spec.rb
-- spec/gem_loader/base_spec.rb
+- spec/gem_loader/context/dsl_spec.rb
+- spec/gem_loader/context_spec.rb
+- spec/gem_loader/gem_requirement.rb
 - spec/gem_loader/gem_spec.rb
 - spec/gem_loader/gemspec_spec.rb
 - spec/gem_loader/scope/dsl_spec.rb

data/lib/gem_loader/base/dsl.rb

@@ -1,31 +0,0 @@
-module GemLoader
-  class Base
-    
-    def dsl(&block)
-      Dsl.new(self, &block)
-    end
-    
-    class Dsl
-      attr_accessor :parent
-      
-      def initialize(parent, &block)
-        self.parent = parent
-        instance_eval(&block) if block
-      end
-      
-      def scope(arg, &block)
-        case arg
-        when Hash
-          name = arg.keys.first
-          dep_names = [ arg[name] ].flatten
-        else
-          name = arg
-          dep_names = []
-        end
-        
-        dep_scopes = dep_names.map{ |dep_name| self.parent.scope(dep_name) }
-        self.parent.scope(name, dep_scopes).dsl(&block)
-      end
-    end
-  end
-end

data/spec/gem_loader/base/dsl_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-describe GemLoader::Base::Dsl do
-  
-  before(:each) do
-    @base = GemLoader::Base.new
-    @dsl = GemLoader::Base::Dsl.new(@base)
-  end
-  
-  it "should say scope success" do
-    @dsl.scope(:foo)
-    @base.scopes[:foo].should_not be_nil
-  end
-  
-  it "should say scope with depends" do
-    @dsl.scope(:foo => [:bar])
-    @base.scopes[:bar].should_not be_nil
-    @base.scopes[:foo].depend_scopes.should be_include @base.scopes[:bar]
-  end
-end

data/spec/gem_loader/base_spec.rb

@@ -1,6 +0,0 @@
-require "spec_helper"
-
-describe GemLoader::Base do
-  
-
-end