aiwilliams-plugit 0.0.1 → 0.0.2

data/lib/plugit.rb

@@ -4,8 +4,11 @@ require File.dirname(__FILE__) + '/plugit/descriptor'
 
 module Plugit
   def self.describe(&block)
+    ENV['PLUGIT_ENV'] ||= 'default'
     descriptor = Descriptor.new
     block.call(descriptor)
-    descriptor.install_environment(ENV['PLUGIT_ENV'] || :default)
+    descriptor.install_environment(ENV['PLUGIT_ENV'])
+  rescue UndefinedEnvironmentError
+    puts %Q{No environment named "#{ENV['PLUGIT_ENV']}". Use one of #{descriptor.environments.collect {|e| e.name.to_s}.inspect}.}
   end
 end

data/lib/plugit/descriptor.rb

@@ -1,19 +1,31 @@
 module Plugit
+  class UndefinedEnvironmentError < StandardError; end
+  
   class Descriptor
-    attr_writer :library_root_path
+    attr_writer :environments_root_path
     
     def initialize
       @environments = []
     end
     
+    def [](env_name)
+      @environments.detect {|e|e.name == env_name}
+    end
+    
     def environment(*init_args, &block)
+      init_args << File.expand_path(@environments_root_path || 'environments')
       @environments << (env = Environment.new(*init_args))
       block.call(EnvironmentBuilder.new(env))
+      env
+    end
+    
+    def environments
+      @environments.dup
     end
     
     def install_environment(name)
-      Environment.library_root_path = @library_root_path || File.expand_path('environments')
       env = @environments.detect {|e| e.name == name.to_sym}
+      raise UndefinedEnvironmentError.new(name) unless env
       env.libraries.each do |lib|
         lib.update(env)
         lib.install(env)
@@ -26,8 +38,8 @@ module Plugit
       @env = env
     end
     
-    def library(*init_args)
-      @env.add_library(Library.new(*init_args))
+    def library(*init_args, &block)
+      @env.add_library(Library.new(*init_args, &block))
     end
   end
 end

data/lib/plugit/environment.rb

@@ -1,18 +1,16 @@
 module Plugit
   class Environment
-    class UninitializedRootError < StandardError; end
-    
-    class << self
-      attr_accessor :library_root_path
-    end
-    
     attr_reader :name, :description
     
-    def initialize(name, description)
-      @name, @description = name, description
+    def initialize(name, description, root_path)
+      @name, @description, @root_path = name, description, root_path
       @libraries = []
     end
     
+    def [](library_name)
+      @libraries.detect {|l|l.name == library_name}
+    end
+    
     def add_library(library)
       @libraries << library
     end
@@ -22,9 +20,7 @@ module Plugit
     end
     
     def library_root_path
-      root_path = self.class.library_root_path
-      raise UninitializedRootError unless root_path
-      File.join(root_path, name.to_s)
+      File.join(@root_path, name.to_s)
     end
   end
 end

data/lib/plugit/library.rb

@@ -5,12 +5,14 @@ module Plugit
     include FileUtils
     
     attr_accessor :load_paths, :requires
-    attr_reader   :name, :version, :scm_export_command
+    attr_reader   :configuration, :name
     
-    def initialize(name, version, scm_export_command)
-      @name, @version, @scm_export_command = name, version, scm_export_command
-      @load_paths = ['/lib']
-      @requires = []
+    def initialize(name, configuration = {})
+      @name = name
+      @configuration = configuration
+      @load_paths ||= ['/lib']
+      @requires ||= []
+      
       yield self if block_given?
     end
     
@@ -18,15 +20,37 @@ module Plugit
       @after_update = block
     end
     
+    def before_install(&block)
+      @before_install = block
+    end
+    
     def checkout(target_path)
-      command = "#{scm_export_command} #{target_path}"
+      command = "#{export} #{target_path}"
       puts "Checking out #{name}: #{command}"
       `#{command}`
     end
     
     def install(environment)
-      load_paths.each { |l| $LOAD_PATH << File.join(target_path(environment), l) }
-      Object.send :require, *requires unless requires.empty?
+      target_path = self.target_path(environment)
+      cd(target_path) do
+        instance_eval(&@before_install)
+      end if @before_install
+      load_paths.reverse.each { |l| $LOAD_PATH.unshift File.join(target_path, l) }
+      requires.each { |r| Object.send :require, r }
+    end
+    
+    def method_missing(method, *args)
+      if value = @configuration[method.to_sym]
+        value
+      else
+        super(method, *args)
+      end
+    end
+    
+    def target_path(environment)
+      paths = [environment.library_root_path, name.to_s]
+      paths << version if version
+      File.join(paths)
     end
     
     def update(environment, force = false)
@@ -41,9 +65,8 @@ module Plugit
       end
     end
     
-    protected
-      def target_path(environment)
-        File.join(environment.library_root_path, name.to_s, version)
-      end
+    def version
+      @configuration[:version]
+    end
   end
 end

data/plugit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "plugit"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.date = "2008-05-19"
   s.summary = "Helping you write tests for code that depends on libraries"
   s.email = "adam@thewilliams.ws"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aiwilliams-plugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam Williams
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Helping you write tests for code that depends on libraries