overapp 0.4.2 → 0.5.0

data/spec/support/project.rb

@@ -0,0 +1,134 @@
+class Object
+  def dsl_method(name)
+    attr_writer name
+    define_method(name) do |*args|
+      if args.size == 0
+        instance_variable_get("@#{name}")
+      elsif args.size == 1
+        send("#{name}=",args.first)
+      else
+        raise "Bad"
+      end
+    end
+  end
+end
+
+class ProjectDSL
+  dsl_method :config
+  dsl_method :path
+
+  attr_accessor :name
+  include FromHash
+
+  fattr(:project) do
+    res = Overapp::Project.new
+    res.config_body = config || ""
+    res.path = path || "/tmp/#{rand(100000000000000000)}"
+
+    res.vars = res.vars.merge(vars)
+    res
+  end
+
+  def file(path,body,overlay_ops={})
+    if overlay_ops.size > 0
+      inner = []
+      overlay_ops.each do |k,v|
+        inner << "#{k}: #{v}"
+      end
+      str = "<overlay>\n" + inner.join("\n") + "\n</overlay>"
+      body = str + body
+    end
+
+    self.files << OpenStruct.new(:path => path, :body => body)
+  end
+
+  def var(k,v)
+    vars[k] = v
+  end
+
+  fattr(:files) { [] }
+  fattr(:vars) { {} }
+end
+
+shared_context "projects" do
+  class << self
+    def project(name="default",&b)
+      dsl = ProjectDSL.new(:name => name)
+      b[dsl]
+      raise "project #{name} already exists" if project_dsls[name]
+      self.project_dsls[name] = dsl
+    end
+    def project_dsls
+      @project_dsls ||= {}
+    end
+    fattr(:vars) { {} }
+    def var(k,v)
+      vars[k] = v
+    end
+
+    def has_files(num)
+      it "has #{num} files" do
+        combined.size.should == num
+      end
+    end
+
+    def has_file(name,*args)
+      it "file #{name} has proper body" do
+        file = combined.find { |x| x.path == name }
+        file.should be
+        if args.size > 0
+          file.body.should == args.first
+        end
+      end
+    end
+  end
+
+  let(:project) do
+    self.class.project_dsls.values.first.project
+  end
+
+  let(:combined) do
+    project.combined_files
+  end
+
+  before do
+    Overapp.stub(:dir_files_full) do |dir|
+      dsl = self.class.project_dsls.values.find { |x| x.project.path == dir || x.name.to_s == dir.to_s }
+      if dsl
+        dsl.files.map do |f|
+          {:file => f.path, :body => f.body}
+        end
+      else
+        raise "no dir #{dir}, possible: \n" + self.class.project_dsls.values.map { |x| x.project.path }.join("\n")
+      end
+    end
+
+    Overapp::Project.stub("project?") do |dir|
+      dsl = self.class.project_dsls.values.find { |x| x.project.path == dir || x.name.to_s == dir.to_s }
+      if dsl
+        dsl.config.present?
+      else
+        raise "no dir #{dir}, possible: \n" + self.class.project_dsls.values.map { |x| x.project.path }.join("\n")
+      end
+    end
+
+    Overapp::Project.stub("load") do |ops|
+      dir = ops[:path]
+      dsl = self.class.project_dsls.values.find { |x| x.project.path == dir || x.name.to_s == dir.to_s }
+      if dsl
+        dsl.project
+      else
+        raise "no dir #{dir}, possible: \n" + self.class.project_dsls.values.map { |x| x.project.path }.join("\n")
+      end
+    end
+
+    self.class.vars.each do |k,v|
+      Overapp::Var.set k,v
+    end
+
+  end
+
+  after do
+    Overapp::Var.clear!
+  end
+end

data/spec/template_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Template' do
+  let(:template_file) do
+    Overapp::TemplateFile.new(:full_body => full_body)
+  end
+
+  let(:base) do
+    OpenStruct.new(:full_body => "abc")
+  end
+
+  let(:combined) do
+    template_file.combined(base)
+  end
+
+  let(:full_body) do
+    "<overapp>
+    action: append
+    template: erb
+    </overapp>
+#{body}"
+  end
+
+  describe "no vars" do
+    let(:body) do
+      "<%= 2+2 %>"
+    end
+
+    it 'works' do
+      combined.full_body.should == "abc\n4"
+    end
+  end
+
+  describe "no vars, no base" do
+    let(:body) do
+      "<%= 2+2 %>"
+    end
+
+    it 'works' do
+      template_file.parsed.full_body.should == "\n4"
+    end
+  end
+
+  describe "has var" do
+    let(:body) do
+      "<%= foo %>"
+    end
+
+    before do
+      template_file.vars[:foo] = "bar"
+    end
+
+    it 'works' do
+      combined.full_body.should == "abc\nbar"
+    end
+  end
+
+  describe "not using template" do
+    let(:full_body) do
+      "<overapp>
+      action: append
+      </overapp>
+#{body}"
+    end
+    let(:body) do
+      "<%= 2+2 %>"
+    end
+
+    it 'works' do
+      combined.full_body.should == "abc\n<%= 2+2 %>"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext
@@ -214,13 +214,19 @@ files:
 - 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
@@ -262,11 +268,14 @@ files:
 - 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