loki 0.0.2 → 0.0.4

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+example

data/README.markdown

@@ -0,0 +1,12 @@
+Loki
+====
+
+Loki is a highly experimental and simplistic Rake-like DSL. It is intended to work well with Thor.
+
+This project is decidedly not ready for any kind of serious use yet.
+
+License
+-------
+
+Copyright (c) 2011 Patrick Hogan, released under the MIT License.
+http://www.opensource.org/licenses/mit-license

data/bin/loki

@@ -2,4 +2,6 @@
 
 # require "rubygems"
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "loki"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "loki"))
+
+puts "This doesn't do anything useful yet."

data/lib/loki.rb

@@ -15,7 +15,7 @@ require "loki/task/make"
 
 module Loki
 
-  def self.task(name = :task, &block)
+  def task(name = :task, &block)
     task = Task::Task.new(name)
     task.instance_eval(&block)
     # task.list
@@ -27,7 +27,7 @@ module Loki
 
   def self.block_unique_id(&block)
     source = block.source_location
-    ::File.expand_path(source[0]) + ":#{source[1]}"
+    ::File.expand_path(source[0]) + ":" + source[1].to_s
   end
 
 end # module

data/lib/loki/file_pattern.rb

@@ -19,8 +19,8 @@ module Loki
         yield FilePath.new(file) if block_given?
       end
     end
-    
-    
+
+
     def interpolate_each(result_pattern, &block)
       each do |source_path|
         yield source_path, interpolate(source_path, result_pattern) if block_given?
@@ -51,8 +51,8 @@ module Loki
     def to_s
       @path.to_s
     end
-    
-    
+
+
     private
 
     def interpolate(source_path, result_pattern)

data/lib/loki/identity.rb

@@ -3,7 +3,7 @@ module Loki
   IDENTITY_MAP = {}
 
   module Identity
-    def self.included(other)  
+    def self.included(other)
       other.class_eval %{
         class << self
           alias_method :__#{other.to_s.gsub(':','')}_new, :new

data/lib/loki/logger.rb

@@ -1,7 +1,7 @@
 module Loki
   class Logger
     include Singleton
-    
+
 
     COLORS = {
       :red     => 31,
@@ -26,6 +26,11 @@ module Loki
     end
 
 
+    def indented?
+      @indent > 0
+    end
+
+
     def push
       @indent += 1
     end
@@ -44,10 +49,10 @@ module Loki
     def line
       $stdout.puts("-" * 80) if @indent == 0
     end
-    
-    
+
+
     public
-    
+
     def paint(text, color = :white)
       "\e[#{COLORS[color]}m#{text}\e[0m"
     end

data/lib/loki/task/base.rb

@@ -11,7 +11,7 @@ module Loki
 
 
       def work(&block)
-        Loki.logger.puts "#{@name}"
+        Loki.logger.puts "#{@name}" if Loki.logger.indented?
         Loki.logger.push
         yield if block_given?
         Loki.logger.pull
@@ -56,7 +56,12 @@ module Loki
 
 
       def siblings
-        @parent.children.reject { |task| task == self }
+        @parent.children.reject { |child| child.equal?(self) }
+      end
+
+
+      def siblings_prior
+        @parent.children.take_while { |child| !child.equal?(self) }
       end
 
 

data/lib/loki/task/file.rb

@@ -4,7 +4,8 @@ module Loki
       include Identity
 
 
-      def initialize(path)
+      def initialize(path, sources = nil)
+        @sources = Array(sources).map { |s| File.new(s) }
         @path = FilePath.new(path)
         super(@path.relative)
       end
@@ -15,6 +16,21 @@ module Loki
       end
 
 
+      def sources
+        @sources.collect(&:path)
+      end
+
+
+      def source_path
+        @sources.first.path
+      end
+
+
+      def result_path
+        @path.path
+      end
+
+
       def path
         @path.path
       end
@@ -31,7 +47,7 @@ module Loki
 
 
       def up_to_date?
-        @children.none? { |task| task.time > time }
+        (@children + @sources).none? { |task| task.time > time }
       end
 
 

data/lib/loki/task/make.rb

@@ -1,39 +1,42 @@
 module Loki
   module Task
-    class Make < File
-      include Identity
-
-
-      def initialize(path, sources = nil)
-        @sources = Array(sources).map { |s| File.new(s) }
-        super(path)
-      end
-
-
-      def sources
-        @sources.collect(&:path)
+    class Make < Task
+
+      def initialize(result_pattern, source_pattern = nil, &block)
+        @source_pattern = FilePattern.new(source_pattern)
+        @result_pattern = FilePattern.new(result_pattern)
+        @block = block
+        @expanded = false
+        super(source_pattern.to_s + " => " + result_pattern.to_s)
+        @children = nil
       end
 
 
-      def source_path
-        @sources.first.path
+      def children
+        @children ||= expand_patterns
       end
 
 
-      def result_path
-        @path.path
-      end
-
-
-      def up_to_date?
-        (@children + @sources).none? { |task| task.time > time }
-      end
-      
-      def test?
-        @children.find_all { |task| task.time > time }.each do |o|
-          ap "#{o.name} #{o.time}"
+      private
+
+      def expand_patterns
+        @children = []
+        if @source_pattern.nil?
+          if @result_pattern.individual?
+            add_dependency(File.new(@result_pattern.to_s), &@block)
+          else
+            raise "result must specify a single file if no source pattern specified"
+          end
+        else
+          if @result_pattern.individual?
+            add_dependency(File.new(@result_pattern, @source_pattern.to_a), &@block)
+          else
+            @source_pattern.interpolate_each(@result_pattern) do |source_path, result_path|
+              add_dependency(File.new(result_path, source_path), &@block)
+            end
+          end
         end
-        (@children + @sources).reject(&:sham?).none? { |task| task.time > time }
+        @children
       end
 
     end # class

data/lib/loki/task/task.rb

@@ -23,19 +23,7 @@ module Loki
 
 
       def make(result_pattern, source_pattern = nil, &block)
-        if source_pattern.nil?
-          add_dependency Make.new(result_pattern), &block
-        else
-          source_pattern = FilePattern.new(source_pattern)
-          result_pattern = FilePattern.new(result_pattern)
-          if result_pattern.individual?
-            add_dependency Make.new(result_pattern, source_pattern.to_a), &block
-          else
-            source_pattern.interpolate_each(result_pattern) do |source_path, result_path|
-              add_dependency Make.new(result_path, source_path), &block
-            end
-          end
-        end
+        add_dependency Make.new(result_pattern, source_pattern, &block)
       end
 
 
@@ -49,7 +37,7 @@ module Loki
 
       def work
         super do
-          @children.each do |task|
+          children.each do |task|
             task.work unless task.done?
           end
         end
@@ -57,18 +45,18 @@ module Loki
 
 
       def done?
-        @children.reject(&:sham?).all?(&:done?)
+        children.reject(&:sham?).all?(&:done?)
       end
 
 
       def time
-        @children.collect(&:time).max || super
+        children.collect(&:time).max || super
       end
 
 
       def list
         super do
-          @children.each do |task|
+          children.each do |task|
             task.list
           end
         end
@@ -80,7 +68,7 @@ module Loki
       def add_dependency(task, &block)
         unless children.include?(task)
           task.parent = self
-          children << task
+          @children << task
           task.evaluate(&block) if block_given?
         end
         task

data/lib/loki/version.rb

@@ -1,3 +1,3 @@
 module Loki
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loki
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 0.0.2
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Patrick Hogan
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-30 00:00:00 Z
 dependencies: []
 
 description: A highly experimental and simplistic Rake-like DSL.
@@ -25,6 +30,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README.markdown
 - Rakefile
 - bin/loki
 - lib/loki.rb
@@ -53,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3930385297513677759
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -62,14 +68,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3930385297513677759
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A highly experimental and simplistic Rake-like DSL.