overapp 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTE3YjQ3MTdlYmU0OTBiN2YzY2I2NGM0YTViYjQ3Njc2MDc2NjUzMg==
+    NzYzNmI4Y2M5OWRmYTE0M2E4OGM5MzZlZWQwODE5NGQ0ZjFkMTg5Zg==
   data.tar.gz: !binary |-
-    M2JkZDVkNmM3ODVmNzIzODc2MGI0YmRlODAwODU1YzFjOWRjNDVmMg==
+    NmZiN2JkMmJhNmZhNjc0ZjllZGEzZmJiMDY3OGY3OGQ1OTFiMmMwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTM5NDliOTc3MjBhOGMwZDM5N2RiOTliOTNmZDM0Njg5ZTY3NzJiMmRiYjk4
-    ZGNjZTQ1MGVlMzc1YmE2M2FhYWVkZTUzZWFhYjUyYTgwNzZlYTU3NjUxMWZh
-    MjcyZDNkZDk0MTI5ZDkzNjIxNmU1MTdlYjdiNzhlYWE5MmU0OTA=
+    NmMxNDFjZTVmMWM5YjY0MWQzZGQ5NzQ0YjBiZTYwZTE2YTk1ODI5NTI3NmZl
+    NTQ2ZmVlNjczZDI4OGUwMTBjMmI0ZjAzMWMwMTQzZGVjNDU1NzY2ZmFmNWM0
+    Yzg0NDM4NTk1NzIwZGFkZjEwYTQ3M2ViZmEzOWQ1N2UyNzUxMWE=
   data.tar.gz: !binary |-
-    MDA2MDNhNDUwZjkxNTc1YjVkNGVjMmQ0MTllZDYwNWJhNjhlNmQzYTljZjcz
-    ODNkMjkxMzUxYTU3YzY0NzUwOWM4YzlkZjczMWZmNTcyNWEwYWQyMjdkNWU3
-    MTU2YmUwMDNlNDQzNDU0M2ZmYjYzZDU0MDk1NzUxMWNmMWVlNzc=
+    NTA1YzNjMzc1NTk0Mjc2NDM2MjJmNzBlMjUzMmRlZDA3YzE3ZTg2NzY5NjU4
+    NThhYTQ3NWVlMGRjMWIxZGU0YmVjZGYwOWIxZjM3ZDc4YjVmYzJiNDY0NDZk
+    ZGU4OGVjNDA1YzIxY2I2YzRhNmUyODk5ZDJiZTM5MTUzYTQwNTU=

data/Gemfile

@@ -21,7 +21,7 @@ group :development do
   gem 'lre'
 end
 
-gem 'mharris_ext'
+gem 'mharris_ext',">= 1.7.1"
 #gem "rchoice", :path => "/users/mharris717/gems/rchoice-0.2.0"
 #gem 'rchoice','0.2.0'
 #gem 'rchoice', :git => "git@github.com:mharris717/rchoice.git", :branch => "gemdir"

data/Gemfile.lock

@@ -61,7 +61,7 @@ GEM
       watchr
     lumberjack (1.0.4)
     method_source (0.8.2)
-    mharris_ext (1.7.0)
+    mharris_ext (1.7.1)
       facets
       fattr
     multi_json (1.8.2)
@@ -115,7 +115,7 @@ DEPENDENCIES
   guard-spork
   jeweler (~> 1.8.4)
   lre
-  mharris_ext
+  mharris_ext (>= 1.7.1)
   rb-fsevent (~> 0.9)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/overapp/files.rb

@@ -1,4 +1,13 @@
 module Overapp
+  class MissingBaseFileError < RuntimeError
+    include FromHash
+    attr_accessor :top_file, :base
+    def message
+      res = "Cannot overlay onto missing file #{top_file.path}\nBase File Count: #{base.files.size}\n"
+      res += base.map { |x| x.path }.join("\n")
+      res
+    end
+  end
   class Files
     include FromHash
     include Enumerable
@@ -19,7 +28,7 @@ module Overapp
           new_file = top_file.combined(existing)
           res << new_file if new_file
         elsif top_file.has_note?
-          raise "cannot overlay onto missing file #{top_file.path}"
+          raise MissingBaseFileError.new(:top_file => top_file, :base => self)
         else
           res << top_file
         end
@@ -34,58 +43,13 @@ module Overapp
       each do |f|
         f.write_to! dir
       end
+      self
     end
 
     class << self
-      def dir_files(dir)
-        res = Dir["#{dir}/**/*"] + Dir["#{dir}/**/.*"]
-        res - [".","..",".git"]
-      end
-      def load_dir(dir,ops={})
-        raise "Bad dir" unless dir.present?
-        raise "Dir not there #{dir}" unless FileTest.exist?(dir)
-        res = new
-        res.file_class = ops[:file_class] if ops[:file_class]
-        dir_files(dir).each do |full_file|
-          if FileTest.file?(full_file)
-            f = full_file.gsub("#{dir}/","")
-            raise "bad #{f}" if f == full_file
-            res.add :file => f, :body => File.read(full_file)
-          end
-        end
-        res
-      end
-
       def load_command(cmd,ops)
         FromCommand.new(:command => cmd, :path => ops[:path]||".").files
       end
-
-      def load(descriptor, ops={})
-        raise "bad #{descriptor}" if descriptor.blank?
-        if ops[:type] == :command
-          load_command(descriptor,ops)
-        elsif descriptor =~ /\.git/ || descriptor =~ /file:\/\//
-          load_repo(descriptor)
-        else
-          load_dir(descriptor,ops)
-        end
-      end
-
-      def write_combined(base_dir, top_dir, output_dir)
-        base = load(base_dir)
-        top = load(top_dir)
-        combined = base.apply(top)
-        combined.write_to! output_dir
-      end
-
-      def load_repo(url)
-        url = url.gsub "ROOT_DIR", File.expand_path(File.dirname(__FILE__) + "/../..")
-        dir = "/tmp/#{rand(1000000000000000000)}"
-        ec "git clone #{url} #{dir} 2>&1", :silent => true
-        load dir
-      ensure
-        ec "rm -rf #{dir}", :silent => true
-      end
     end
   end
 end

data/lib/overapp/from_command.rb

@@ -3,18 +3,8 @@ module Overapp
     include FromHash
     attr_accessor :command, :path
 
-    def with_tmp_dir
-      dir = "/tmp/#{rand(1000000000000000000)}"
-      `mkdir #{dir}`
-      Dir.chdir(dir) do
-        yield dir
-      end
-    ensure
-      ec "rm -rf #{dir}", :silent => true
-    end
-
     fattr(:files) do
-      with_tmp_dir do |dir|
+      Overapp.with_tmp_dir do |dir|
         Overapp.ec command, :silent => true
         Files.load [dir,path].select { |x| x.present? }.join("/"), :file_class => BasicFile
       end

data/lib/overapp/load/base.rb

@@ -0,0 +1,20 @@
+module Overapp
+  module Load
+    class Base
+      include FromHash
+      attr_accessor :descriptor
+
+      def apply_to(base,ops)
+        base.apply(load(base,ops))
+      end
+
+      def commit_message
+        "Message Pending"
+      end
+
+      def load(*args)
+        raise "load unimplemented"
+      end
+    end
+  end
+end

data/lib/overapp/load/factory.rb

@@ -0,0 +1,19 @@
+module Overapp
+  module Load
+    class Factory
+      include FromHash
+      attr_accessor :descriptor, :type, :entry_ops
+
+      def loader
+        raise "bad #{descriptor}" if descriptor.blank?
+        if type.to_s.to_sym == :command
+          Command.new(:descriptor => descriptor).tap { |x| x.relative_output_path = entry_ops[:path] if entry_ops[:path].present? }
+        elsif Git.repo?(descriptor)
+          Repo.new(:descriptor => descriptor)
+        else
+          LocalDir.new(:descriptor => descriptor)
+        end
+      end
+    end
+  end
+end

data/lib/overapp/load/instance.rb

@@ -0,0 +1,35 @@
+module Overapp
+  module Load
+    class Instance
+      include FromHash
+      attr_accessor :path, :overlays
+
+      fattr(:starting_files) do
+        raise "path doesn't exist #{path}" unless FileTest.exist?(path)
+        if Overapp.dir_files(path).empty?
+          Overapp::Files.new
+        else
+          RawDir.new(:descriptor => path).load(nil,{})
+        end
+      end
+
+      fattr(:combined_files) do
+        files = starting_files
+        
+        overlays.each do |overlay|
+          files = apply_overlay(files,overlay)
+        end
+
+        files
+      end
+
+      def apply_overlay(base,overlay)
+        Overapp::Git.commit(path,overlay.commit_message) do
+          overlay.apply_to(base, :path => path).tap do |res|
+            res.write_to! path
+          end
+        end.tap { |res| raise "nil return" unless res }
+      end
+    end
+  end
+end

data/lib/overapp/load/types/command.rb

@@ -0,0 +1,19 @@
+module Overapp
+  module Load
+    class Command < Base
+      attr_accessor :relative_output_path
+      def command; descriptor; end
+      def load(base,ops={})
+        if relative_output_path.present?
+          TmpDir.with do |dir|
+            Overapp.ec "cd #{dir} && #{command}", :silent => true
+            RawDir.new(:descriptor => "#{dir}/#{relative_output_path}").load(base,ops)
+          end
+        else
+          Overapp.ec "cd #{ops[:path]} && #{command}", :silent => true
+          RawDir.new(:descriptor => ops[:path]).load(base,ops)
+        end
+      end
+    end
+  end
+end

data/lib/overapp/load/types/empty.rb

@@ -0,0 +1,9 @@
+module Overapp
+  module Load
+    class Empty
+      def load(base,ops)
+        Overapp::Files.new
+      end
+    end
+  end
+end

data/lib/overapp/load/types/local_dir.rb

@@ -0,0 +1,15 @@
+module Overapp
+  module Load
+    class LocalDir < Base
+      def path; Overapp.to_proper_dir(descriptor); end
+
+      def load(base,ops)
+        if Overapp::Project.project? path
+          Project.new(:descriptor => path).load(base,ops)
+        else
+          RawDir.new(:descriptor => path).load(base,ops)
+        end
+      end
+    end
+  end
+end

data/lib/overapp/load/types/project.rb

@@ -0,0 +1,12 @@
+module Overapp
+  module Load
+    class Project < Base
+      def path; descriptor; end
+      def load(base,ops={})
+        project = Overapp::Project.new(:path => path)
+        project.write_to! ops[:path]
+        RawDir.new(:descriptor => ops[:path]).load(base,ops)
+      end
+    end
+  end
+end

data/lib/overapp/load/types/raw_dir.rb

@@ -0,0 +1,22 @@
+module Overapp
+  module Load
+    class RawDir < Base
+      def dir; Overapp.to_proper_dir(descriptor); end
+      def load(base,ops)
+        ops = {}
+        raise "Bad dir" unless dir.present?
+        raise "Dir not there #{dir}" unless FileTest.exist?(dir)
+        res = Files.new
+        res.file_class = ops[:file_class] if ops[:file_class]
+        Overapp.dir_files(dir).each do |full_file|
+          if FileTest.file?(full_file)
+            f = full_file.gsub("#{dir}/","")
+            raise "bad #{f}" if f == full_file
+            res.add :file => f, :body => File.read(full_file)
+          end
+        end
+        res
+      end
+    end
+  end
+end

data/lib/overapp/load/types/repo.rb

@@ -0,0 +1,13 @@
+module Overapp
+  module Load
+    class Repo < Base
+      def url; descriptor; end
+
+      def load(base,ops)
+        TmpDir.with_repo_path(url) do |dir|
+          LocalDir.new(:descriptor => dir).load(base,ops)
+        end
+      end
+    end
+  end
+end

data/lib/overapp/project/config.rb

@@ -0,0 +1,28 @@
+module Overapp
+  class ProjectConfig
+    include FromHash
+    attr_accessor :body, :base_ops
+    fattr(:overapps) { [] }
+
+    def base(*args)
+      overapp(*args)
+    end
+
+    def overapp(name)
+      self.overapps << ConfigEntry.new(:descriptor => name, :type => :overapp)
+    end
+
+    def overlay(name)
+      overapp(name)
+    end
+
+    def command(cmd,ops={})
+      self.overapps << ConfigEntry.new(:descriptor => cmd, :type => :command, :entry_ops => ops)
+    end
+
+    def load!
+      c = self
+      eval(body)
+    end
+  end
+end

data/lib/overapp/project/config_entry.rb

@@ -0,0 +1,6 @@
+module Overapp
+  class ConfigEntry
+    include FromHash
+    attr_accessor :descriptor, :type, :entry_ops
+  end
+end

data/lib/overapp/project/write.rb

@@ -0,0 +1,21 @@
+module Overapp
+  class Project
+    class Write
+      include FromHash
+      attr_accessor :output_path, :project
+
+      fattr(:instance) do
+        Load::Instance.new(:path => output_path, :overlays => project.overapps)
+      end
+
+      def combined_files
+        instance.combined_files
+      end
+
+      def write!
+        raise "no combined files" unless combined_files
+        combined_files.write_to!(output_path)
+      end
+    end
+  end
+end

data/lib/overapp/project.rb

@@ -3,15 +3,22 @@ module Overapp
     include FromHash
     attr_accessor :path
 
+    class << self
+      def project_files
+        %w(.fstemplate .overapp .overlay)
+      end
+
+      def project?(path)
+        !!project_files.map { |x| "#{path}/#{x}" }.find { |x| FileTest.exist?(x) }
+      end
+    end
+
     def config_body
-      if FileTest.exist?("#{path}/.fstemplate")
-        File.read("#{path}/.fstemplate")
-      elsif FileTest.exist?("#{path}/.overapp")
-        File.read("#{path}/.overapp")
-      elsif FileTest.exist?("#{path}/.overlay")
-        File.read("#{path}/.overlay")
+      file = klass.project_files.map { |x| "#{path}/#{x}" }.find { |x| FileTest.exist?(x) }
+      if file
+        File.read(file)
       else
-        raise "no config"
+        raise "no config found in #{path}"
       end
     end
 
@@ -22,92 +29,27 @@ module Overapp
       res
     end
 
-    def overapp_paths
-      config.overapps + [path]
-    end
-
-    def commands(phase)
-      config.commands.select { |x| x[:phase] == phase }.map { |x| x[:command] }
-    end
-
-    fattr(:overapps) do
-      overapp_paths.map { |x| Files.load(x) }
+    def overapp_entries
+      config.overapps + [ConfigEntry.new(:descriptor => path)]
     end
 
-    fattr(:base_files) do
-      if config.base
-        Files.load(config.base,config.base_ops)
-      else
-        nil
+    def overapps
+      overapp_entries.map do |entry|
+        if path == entry.descriptor
+          Load::RawDir.new(:descriptor => path)
+        else
+          Load::Factory.new(:descriptor => entry.descriptor, :type => entry.type, :entry_ops => entry.entry_ops).loader
+        end
       end
     end
 
-    fattr(:combined_files) do
-      res = base_files
-      overapps.each do |overapp|
-        res = res.apply(overapp)
-      end
-      res
-    end
-
-    def git_commit(output_path,message,init=false)
-      if init
-        `rm -rf #{output_path}/.git`
-        ec "cd #{output_path} && git init && git config user.email johnsmith@fake.com && git config user.name 'John Smith'", :silent => true
-      end
-      ec "cd #{output_path} && git add . && git commit -m '#{message}'", :silent => true
-    end
-
-
     def write_to!(output_path)
-      commands(:before).each do |cmd|
-        Overapp.ec "cd #{output_path} && #{cmd}", :silent => true
-        git_commit output_path, "Ran Command: #{cmd}"
-      end
-
-      base_files.write_to! output_path
-
-      git_commit output_path, "Base Files #{config.base}", true
-      combined_files.write_to!(output_path)
-      git_commit output_path, "Overapp Files #{path}"
-
-      commands(:after).each do |cmd|
-        Overapp.ec "cd #{output_path} && #{cmd}", :silent => true
-        git_commit output_path, "Ran Command: #{cmd}"
-      end
-    end
-  end
-
-  class ProjectConfig
-    include FromHash
-    attr_accessor :body, :base, :base_ops
-    fattr(:overapps) { [] }
-    fattr(:commands) { [] }
-
-    def base(*args)
-      if args.empty?
-        @base
-      else
-        @base = args.first
-        @base_ops = args[1] || {}
-      end
-    end
-
-    def overapp(name)
-      self.overapps << name
-    end
-
-    def overlay(name)
-      overapp(name)
-    end
-
-    def command(cmd,phase=:after)
-      self.commands << {:command => cmd, :phase => phase}
+      Write.new(:output_path => output_path, :project => self).write!
     end
 
-    def load!
-      c = self
-      eval(body)
+    def combined_files(output_path)
+      raise 'here'
+      Write.new(:output_path => output_path, :project => self).combined_files
     end
   end
 end

data/lib/overapp/util/cmd.rb

@@ -0,0 +1,7 @@
+module Overapp
+  class << self
+    def ec(*args)
+      MharrisExt.ec(*args)
+    end
+  end
+end

data/lib/overapp/util/dir.rb

@@ -0,0 +1,23 @@
+module Overapp
+  class << self
+    def dir_files(dir)
+      res = Dir["#{dir}/**/*"] + Dir["#{dir}/**/.*"]
+      res - [".","..",".git"]
+    end
+
+    def with_local_path(overapp_path,&b)
+      if Git.repo?(overapp_path)
+        TmpDir.with_repo_path(overapp_path) do |dir|
+          b[dir]
+        end
+      else
+        yield overapp_path
+      end
+    end
+
+    def to_proper_dir(dir)
+      base = File.expand_path(File.dirname(__FILE__) + "/../../..")
+      dir.gsub("OVERAPP_ROOT_DIR",base)
+    end
+  end
+end

data/lib/overapp/util/git.rb

@@ -0,0 +1,25 @@
+module Overapp
+  class Git
+    class << self
+      def commit_inner(output_path,message,init,&b)
+        res = nil
+        res = yield if block_given?
+        if init
+          `rm -rf #{output_path}/.git`
+          ec "cd #{output_path} && git init && git config user.email johnsmith@fake.com && git config user.name 'John Smith'", :silent => true
+        end
+
+        ec "cd #{output_path} && git add . && git commit -m '#{message}'", :silent => true
+        res
+      end
+      def commit(output_path,message,&b)
+        init = !FileTest.exist?("#{output_path}/.git")
+        commit_inner(output_path,message,init,&b)
+      end
+
+      def repo?(path)
+        path =~ /\.git/ || path =~ /file:\/\// || path =~ /git:\/\//
+      end
+    end
+  end
+end

data/lib/overapp/util/tmp_dir.rb

@@ -0,0 +1,32 @@
+module Overapp
+  class TmpDir
+    class << self
+      def base_dir
+        File.expand_path(File.dirname(__FILE__) + "/../../../tmp")
+      end
+      def with(ops={})
+        dir = "#{base_dir}/#{rand(1000000000000000000)}"
+        `mkdir #{dir}`
+        if block_given?
+          Dir.chdir(dir) do
+            yield dir
+          end
+        else
+          dir
+        end
+      ensure
+        if block_given?
+          ec "rm -rf #{dir}", :silent => true
+        end
+      end
+
+      def with_repo_path(url)
+        url = Overapp.to_proper_dir(url)
+        with do |dir|
+          `git clone #{url} . 2>&1`
+          yield dir
+        end
+      end
+    end
+  end
+end

data/lib/overapp/util/write.rb

@@ -0,0 +1,9 @@
+module Overapp
+  class << self
+    def write_project(overapp_path,output_path)
+      Overapp.with_local_path(overapp_path) do |dir|
+        Overapp::Project.new(:path => dir).write_to!(output_path)
+      end
+    end
+  end
+end