overapp 0.4.2 → 0.5.0

data/lib/overapp/util/tmp_dir.rb

@@ -5,7 +5,8 @@ module Overapp
         File.expand_path(File.dirname(__FILE__) + "/../../../tmp")
       end
       def with(ops={})
-        dir = "#{base_dir}/#{rand(1000000000000000000)}"
+        d = Time.now.strftime("%Y%m%d%H%M%S%L")
+        dir = "#{base_dir}/td_#{d}_#{rand(10000000)}"
         `mkdir #{dir}`
         if block_given?
           Dir.chdir(dir) do
@@ -16,7 +17,10 @@ module Overapp
         end
       ensure
         if block_given?
-          ec "rm -rf #{dir}", :silent => true
+          delete = lambda do
+            ec "rm -rf #{dir}", :silent => false
+          end
+          #ObjectSpace.define_finalizer(self, delete)
         end
       end
 

data/lib/overapp/var.rb

@@ -0,0 +1,18 @@
+module Overapp
+  class Var
+    fattr(:vars) { {} }
+    def set(k,v)
+      vars[k.to_s] = v
+    end
+    def clear!
+      self.vars!
+    end
+
+    class << self
+      fattr(:instance) { new }
+      def method_missing(sym,*args,&b)
+        instance.send(sym,*args,&b)
+      end
+    end
+  end
+end

data/lib/overapp.rb

@@ -1,5 +1,6 @@
 require 'mharris_ext'
 require 'ptools'
+require 'ostruct'
 
 class Object
   def klass
@@ -9,7 +10,7 @@ end
 
 module Overapp
   def self.load_files!
-    %w(files template_file project from_command).each do |f|
+    %w(files template_file project from_command var).each do |f|
       load File.dirname(__FILE__) + "/overapp/#{f}.rb"
     end
 
@@ -28,6 +29,10 @@ module Overapp
     %w(tmp_dir git dir cmd write).each do |f|
       load File.dirname(__FILE__) + "/overapp/util/#{f}.rb"
     end
+
+    %w(params body_mod var_obj).each do |f|
+      load File.dirname(__FILE__) + "/overapp/template_file/#{f}.rb"
+    end
   end
 end
 

data/overapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "overapp"
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = "2013-11-16"
+  s.date = "2013-11-22"
   s.description = "overapp"
   s.email = "mharris717@gmail.com"
   s.executables = ["overapp"]
@@ -45,13 +45,19 @@ Gem::Specification.new do |s|
     "lib/overapp/project/config_entry.rb",
     "lib/overapp/project/write.rb",
     "lib/overapp/template_file.rb",
+    "lib/overapp/template_file/body_mod.rb",
+    "lib/overapp/template_file/params.rb",
+    "lib/overapp/template_file/var_obj.rb",
     "lib/overapp/util/cmd.rb",
     "lib/overapp/util/dir.rb",
     "lib/overapp/util/git.rb",
     "lib/overapp/util/tmp_dir.rb",
     "lib/overapp/util/write.rb",
+    "lib/overapp/var.rb",
     "overapp.gemspec",
+    "spec/command_replacement_spec.rb",
     "spec/from_command_spec.rb",
+    "spec/git_spec.rb",
     "spec/input/rails_post_overlay/.overapp",
     "spec/input/rails_post_overlay/app/models/post.rb",
     "spec/input/rails_widget_overlay/.overapp",
@@ -93,11 +99,14 @@ Gem::Specification.new do |s|
     "spec/input/top/place/d.txt",
     "spec/nesting_spec.rb",
     "spec/overapp_spec.rb",
+    "spec/project_context_spec.rb",
     "spec/project_note_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/output_dir.rb",
+    "spec/support/project.rb",
     "spec/support/setup.rb",
     "spec/support/tmp_dir.rb",
+    "spec/template_spec.rb",
     "tmp/.gitkeep",
     "vol/input/base/a.txt",
     "vol/input/base/b.txt",

data/spec/command_replacement_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class MockLoadFactory
+  include FromHash
+  attr_accessor :descriptor, :type, :entry_ops
+  def loader
+    OpenStruct.new(:foo => :bar)
+  end
+end
+
+
+describe "Command Replacement" do
+  describe 'Basic' do
+    let(:config_body) do
+      "c.overapp :bar"
+    end
+
+    let(:project) do
+      res = Overapp::Project.new(:path => "/fun")
+      res.stub(:config_body) { config_body }
+      res.load_factory_class = MockLoadFactory
+      res
+    end
+
+    it 'size' do
+      project.overapps.size.should == 2
+    end
+
+    it 'foo' do
+      project.overapps.first.foo.should == :bar
+    end
+  end
+end

data/spec/from_command_spec.rb

@@ -27,3 +27,32 @@ describe 'FromCommand' do
     Dir["#{output_dir}/**/*.*"].sort.should == ['abc.txt','place.txt'].sort.map { |x| "#{output_dir}/#{x}" }
   end
 end
+
+describe 'FromCommand2' do
+  include_context "tmp dir"
+  include_context "output dir"
+
+  let(:command) do
+    "echo stuff > abc.txt"
+  end
+
+  let(:config_body) do
+    "c.command '#{command}'"
+  end
+
+  before do
+    File.create "#{tmp_dir}/place.txt","fun"
+  end
+
+  let(:project) do
+    res = Overapp::Project.new(:path => tmp_dir)
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  it 'runs' do
+    project.write_to! output_dir
+    Dir["#{output_dir}/**/*.*"].sort.should == ['abc.txt','place.txt'].sort.map { |x| "#{output_dir}/#{x}" }
+  end
+end
+

data/spec/git_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Git' do
+  it 'smoke' do
+    Overapp::TmpDir.with do |dir|
+      Overapp::Git.commit(dir,"stuff") do
+        File.create "#{dir}/abc.txt","hello"
+      end
+    end
+    2.should == 2
+  end
+end

data/spec/nesting_spec.rb

@@ -1,44 +0,0 @@
-if true
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'Nesting' do
-  include_context "tmp dir"
-
-  let(:widget_overlay_dir) do
-    File.expand_path(File.dirname(__FILE__) + "/input/rails_widget_overlay")
-  end
-
-  let(:post_overlay_dir) do
-    File.expand_path(File.dirname(__FILE__) + "/input/rails_post_overlay")
-  end
-
-  describe 'basic' do
-    before do
-      Overapp.write_project widget_overlay_dir,tmp_dir
-    end
-
-    it 'wrote' do
-      File.read("#{tmp_dir}/app/models/widget.rb").should == "class Widget < ActiveRecord::Base\nend"
-      File.read("#{tmp_dir}/config/routes.rb").should == "route stuff\n"
-    end
-  end
-
-  describe 'runs base overlay commands' do
-    before do
-      Overapp.write_project post_overlay_dir,tmp_dir
-    end
-
-    it 'has post model' do
-      FileTest.should be_exist("#{tmp_dir}/app/models/post.rb")
-    end
-
-    it 'has widget model' do
-      FileTest.should be_exist("#{tmp_dir}/app/models/widget.rb")
-    end
-
-    it 'has routes file' do
-      FileTest.should be_exist("#{tmp_dir}/config/routes.rb")
-    end
-  end
-end
-end

data/spec/project_context_spec.rb

@@ -0,0 +1,131 @@
+describe "projects" do
+  include_context "projects"
+  include_context "output dir"
+
+  describe "basic file loading" do
+    project do |p|
+      p.file "abc.txt","hello"
+    end
+
+    has_files 1
+    has_file "abc.txt","hello"
+  end
+
+  describe "multiple projects" do
+    project "main" do |p|
+      p.config "c.overlay 'widget'"
+      p.file "README","hello"
+    end
+
+    project "widget" do |p|
+      p.file "widget.rb","class Widget; end"
+    end
+
+    has_files 2
+  end
+
+  describe "multiple projects" do
+    project "auth" do |p|
+      p.config "c.overlay 'base'"
+      p.file "README","\nauth stuff", :action => :append
+    end
+
+    project "base" do |p|
+      p.file "README","hello"
+    end
+
+    has_files 1
+    has_file "README","hello\nauth stuff"
+  end
+
+  describe "project nesting" do
+    project "auth" do |p|
+      p.config "c.overlay 'widget'"
+      p.file "auth.coffee","auth setup"
+      p.file "app.js","\nauth = true", :action => :append
+    end
+
+    project "widget" do |p|
+      p.config "c.overlay 'base'"
+      p.file "widget.coffee","Widget = Em.Object.extend()"
+    end
+
+    project "base" do |p|
+      p.file "app.js","App = Em.Application.create()"
+      p.file "README","Hello"
+    end
+
+    has_files 4
+    has_file "README"
+    has_file "app.js","App = Em.Application.create()\nauth = true"
+  end
+
+  describe "missing base file" do
+    project do |p|
+      p.file "README","Hello",action: :append
+    end
+
+    it 'errors' do
+      lambda { combined.size }.should raise_error(Overapp::MissingBaseFileError,/./)
+    end
+  end
+
+  describe "template file with project var" do
+    project do |p|
+      p.file "README","Hello <%= foo %>", :template => "erb"
+      p.var "foo","bar"
+    end
+
+    has_files 1
+    has_file "README","Hello bar"
+  end
+
+  describe "template file with global var" do
+    project do |p|
+      p.file "README","Hello <%= foo %>", :template => "erb"
+    end
+
+    var "foo","bar"
+
+    has_files 1
+    has_file "README","Hello bar"
+  end
+
+  describe "template file with global var in config" do
+    project do |p|
+      p.file "README","Hello <%= foo %>", :template => "erb"
+      p.config "c.var 'foo','bar'"
+    end
+
+    has_files 1
+    has_file "README","Hello bar"
+  end
+
+  describe "template file with global var and local var" do
+    project do |p|
+      p.file "README","Hello <%= foo %>", :template => "erb"
+      p.var "foo","baz"
+    end
+
+    var "foo","bar"
+
+    has_files 1
+    has_file "README","Hello baz"
+  end
+
+  describe "refs self", :pending => true do
+    project "base" do |p|
+      p.config "c.overlay :self; c.overlay 'auth'"
+      p.file "README","hello"
+    end
+
+    project "auth" do |p|
+      p.file "README"," auth stuff", :action => :append
+    end
+
+    has_files 1
+    has_file "README","hello auth stuff"
+  end
+end
+
+

data/spec/project_note_spec.rb

@@ -1,23 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "ProjectConfig" do
+shared_context "p1" do
   let(:config) do
     res = Overapp::ProjectConfig.new
     res.body = config_body
+    res.load!
     res
   end
 
+  let(:project) do
+    res = Overapp::Project.new(:path => "/fun")
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  before do
+    Overapp::Files.stub(:load) { Overapp::Files.new }
+  end
+end
+
+describe "ProjectConfig" do
+  include_context "p1"
+
   describe "one base" do
     let(:config_body) do
       "c.base :foo"
     end
 
-    it 'smoke' do
-      config.should be
-    end
-
     it 'eval' do
-      config.load!
       config.overapps.first.descriptor.should == :foo
     end
   end
@@ -29,7 +39,6 @@ describe "ProjectConfig" do
     end
 
     it 'eval' do
-      config.load!
       config.overapps.map { |x| x.descriptor }.should == [:foo,:bar]
     end
   end
@@ -40,66 +49,49 @@ describe "ProjectConfig" do
 end
 
 describe 'Project' do
+  include_context "p1"
   let(:config_body) do
     "c.base :foo
     c.overapp :bar"
   end
 
-  let(:project) do
-    res = Overapp::Project.new(:path => "/fun")
-    res.stub(:config_body) { config_body }
-    res
-  end
-
-  before do
-    Overapp::Files.stub(:load) { Overapp::Files.new }
-  end
-
   it 'overapps' do
     project.overapps.size.should == 3
     project.overapp_entries.last.descriptor.should == "/fun"
   end
 end
 
-describe 'Project with command' do
-  let(:config_body) do
-    "c.base :foo
-    c.overapp :bar
-    c.command 'ls'"
+describe 'Project2' do
+  include_context "projects"
+  project do |p|
+    p.config "c.base :foo; c.overapp :bar"
   end
 
-  let(:project) do
-    res = Overapp::Project.new(:path => "/fun")
-    res.stub(:config_body) { config_body }
-    res
+  it 'overapps' do
+    project.overapps.size.should == 3
+    project.overapp_entries.last.descriptor.should == project.path
   end
+end
 
-  before do
-    Overapp::Files.stub(:load) { Overapp::Files.new }
+describe 'Project with command' do
+  include_context "projects"
+  project do |p|
+    p.config "c.base :foo; c.overapp :bar; c.command 'ls'"
   end
 
   it 'commands' do
-    #project.commands(:after).should == ["ls"]
+    project.overapps.size.should == 4
   end
 end
 
 describe 'Project order' do
+  include_context "p1"
   let(:config_body) do
     "c.base :foo
     c.overapp :bar
     c.command 'ls'"
   end
 
-  let(:project) do
-    res = Overapp::Project.new(:path => "/tmp/a/b/c/fun")
-    res.stub(:config_body) { config_body }
-    res
-  end
-
-  before do
-    Overapp::Files.stub(:load) { Overapp::Files.new }
-  end
-
   if false
     it 'write' do
       output_path = "/tmp/f/t/r/r"
@@ -117,62 +109,18 @@ describe 'Project order' do
 end
 
 describe 'Project order' do
+  include_context "p1"
   let(:config_body) do
     "c.base :foo
     c.overapp '.'
     c.overapp :bar"
   end
 
-  let(:project) do
-    res = Overapp::Project.new(:path => "/tmp/a/b/c/fun")
-    res.stub(:config_body) { config_body }
-    res
-  end
-
-  before do
-    Overapp::Files.stub(:load) { Overapp::Files.new }
-  end
-
   it "doesn't have self twice" do
     project.overapp_entries.size.should == 3
-    project.overapp_entries[1].descriptor.should == "/tmp/a/b/c/fun"
-  end
-end
-
-if false
-describe 'Project with no base' do
-  let(:config_body) do
-    "c.base 'mkdir foo && echo stuff > foo/abc.txt', :type => :command, :path => :foo"
-  end
-
-  let(:output_path) do
-    res = "/tmp/#{rand(1000000000000000)}"
-    `mkdir #{res}`
-    res
-  end
-
-  after do
-    #`rm -rf #{output_path}`
-  end
-
-  let(:project) do
-    res = Overapp::Project.new(:path => "/tmp/a/b/c/fun")
-    res.stub(:config_body) { config_body }
-    res
-  end
-
-  it 'write' do
-    #Overapp.should_receive(:ec).with("echo stuff > abc.txt", :silent => true)
-    project.stub(:git_commit)
-    project.stub(:overapp_paths) { [] }
-
-    project.write_to! output_path
-
-    File.read("#{output_path}/abc.txt").strip.should == 'stuff'
+    project.overapp_entries[1].descriptor.should == "/fun"
   end
 end
-end
-
 
 describe "write project" do
   include_context "output dir"
@@ -211,20 +159,4 @@ describe "write project" do
       File.read("#{output_dir}/b.txt").should == %w(a 1 2 b c d).join("\n") + "\n"
     end
   end
-
-  if false
-    describe "from combined" do
-      before do
-        Overapp::Files.write_combined repo_dir,overapp_dir,output_dir
-      end
-
-      it 'has README' do
-        files_equal repo_dir, output_dir, "README.md"
-      end
-
-      it 'has .abc' do
-        files_equal repo_dir, output_dir, ".abc"
-      end
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -40,7 +40,7 @@ Spork.prefork do
 
   RSpec.configure do |config|
     #config.filter_run :focus => true
-    config.fail_fast = false
+    config.fail_fast = true
 
     repo_dirs = %w(repo)