overapp 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVjNDY1MjViY2YwMGE5MzQ1ZGViODNkZGU5YWMwNWZlZjAzYTJhZA==
+    OGFjY2IyZTI1NDcxZDcxMjM4ZjQ4MTM1NzUwYTkwM2VkM2RiNjc2Mg==
   data.tar.gz: !binary |-
-    Njg5MWYwNGY0Yzk0ODFlYWE5OGFlMDIxNjI2NWRlZjU0MThmMTAxYg==
+    MWQ1NWM5MjA4MDIyYWE3MTIxODcyZTYzZmYzNWZlZDNiMmZiMjQ5MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTgwNjQ0OTI3Y2VjMGVjMWUxZWM1NTVmNDJjMzBhMTYyNGQ2MjIxYTlmOGEw
-    MDExYTM1OWI5YTA0ZWI0ZDJmODExOTYxMjM3NGIzZTAxYzFhZWU4Yzg0YTY2
-    NDVmMzAyMGM0MTg0MGY3MDU4ODIzNzliYjFhZWE0MTA3ZWQzYmE=
+    NDAyMzNlNTMyZWFjODIyOTllNTI4ZjQxOWNlMjdhMjczMzBlM2I5OWU0Njky
+    NzQ4MTY4MzZhOTQzMDNjMTcyNjExMTFhY2VmYzAwZWI0Y2Y3ODA5N2NiNDJj
+    ZmJjZTNkZWZlOTIzOWM0ZTNlNDgxOWM2OWJjMjVkZTk2NDRmNzQ=
   data.tar.gz: !binary |-
-    ZDg2NTIyNTM1N2UxMTZlOGRkYjQ1OWQwNTE3MzU2MWVjZWRhNTk1YmRhYmVh
-    YzE3ZDViYmZjMjhmZDZlMmM3ODNiY2ZjMGE1ZjYzMjZmNzczMTgxNTQzNjMz
-    YzQ0OGEzNDU3NzliYzc1NjdjNTI5ODg5MmY1YWE4NjU0OTFlM2Y=
+    ZjJmMWU4Y2Y3ZDQ3NjY1Y2QzYjc2ZGQ0NDdlNDA4NzQ3NzFmOGZhMDNiZWZi
+    MzgyZWE5YmVmN2NhYTc0Y2QwMDMyZTQ2MWQ5ODdlMmU4ZTliNDg2YjUyYzdk
+    MDhlY2IwZTFlM2I3NzI5MmYxNjEwOTJlNjFhMmQ1NTE0YTMxNTY=

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/overapp.rb

@@ -1,6 +1,7 @@
 require 'mharris_ext'
 require 'ptools'
 require 'ostruct'
+require 'andand'
 
 class Object
   def klass
@@ -26,7 +27,7 @@ module Overapp
       load File.dirname(__FILE__) + "/overapp/project/#{f}.rb"
     end
 
-    %w(tmp_dir git dir cmd write).each do |f|
+    %w(tmp_dir git dir cmd write file).each do |f|
       load File.dirname(__FILE__) + "/overapp/util/#{f}.rb"
     end
 

data/lib/overapp/files.rb

@@ -11,36 +11,45 @@ module Overapp
   class Files
     include FromHash
     include Enumerable
-    fattr(:files) { [] }
+    fattr(:files) { {} }
     fattr(:file_class) { TemplateFile }
     def add(ops)
-      files << file_class.new(:path => ops[:file], :full_body => ops[:body])
+      ops = file_class.new(:path => ops[:file], :full_body => ops[:body]) if ops.kind_of?(Hash)
+      self.files[ops.path] = ops
     end
+    def delete(path)
+      self.files.delete(path)
+    end
+
     def size
       files.size
     end
+
     def apply(on_top,ops={})
-      res = files.clone
+      res = self.class.new(:files => files.clone)
       on_top.each do |top_file|
-        if ops[:vars] && ops[:vars].size > 0
-          #raise ops[:vars].inspect
-          top_file.vars = ops[:vars]
-        end
-        existing = res.find { |x| x.path == top_file.path }
-        if existing
-          res -= [existing]
-          new_file = top_file.combined(existing)
-          res << new_file if new_file
-        elsif top_file.has_note?
-          raise MissingBaseFileError.new(:top_file => top_file, :base => self)
-        else
-          res << top_file.parsed
-        end
+        res.apply_file(top_file,ops)
+      end
+      res
+    end
+
+    def apply_file(top_file,ops={})
+      if ops[:vars] && ops[:vars].size > 0
+        top_file.vars = ops[:vars]
+      end
+      existing = files[top_file.path]
+      raise MissingBaseFileError.new(:top_file => top_file, :base => self) if !existing && top_file.has_note?
+      new_file = top_file.combined(existing)
+      if new_file
+        add new_file
+      else
+        delete top_file.path
       end
-      self.class.new(:files => res)
     end
+
+
     def each(&b)
-      files.each(&b)
+      files.values.each(&b)
     end
 
     def write_to!(dir)

data/lib/overapp/project.rb

@@ -37,7 +37,7 @@ module Overapp
 
     def overapp_entries
       res = config.overapps
-      local = config.overapps.find { |x| x.descriptor == "." || x.descriptor == :self }
+      local = config.overapps.find { |x| ['.',:self,path].include?(x.descriptor) }
       if local
         local.descriptor = path
         res

data/lib/overapp/project/config.rb

@@ -9,12 +9,12 @@ module Overapp
       overapp(*args)
     end
 
-    def overapp(name)
+    def overapp(name,ops={})
       self.overapps << ConfigEntry.new(:descriptor => name, :type => :overapp)
     end
 
-    def overlay(name)
-      overapp(name)
+    def overlay(*args)
+      overapp(*args)
     end
 
     def command(cmd,ops={})

data/lib/overapp/project/write.rb

@@ -14,7 +14,9 @@ module Overapp
 
       def write!
         raise "no combined files" unless combined_files
-        combined_files.write_to!(output_path)
+        Overapp::Git.commit(output_path,"Overlay Created") do
+          combined_files.write_to!(output_path)
+        end
       end
     end
   end

data/lib/overapp/template_file.rb

@@ -4,7 +4,7 @@ module Overapp
     attr_accessor :path, :full_body
 
     fattr(:params_obj) do
-      Params.new(:full_body => full_body)
+      Params.new(:full_body => full_body, :path => path)
     end
 
     def has_note?
@@ -41,8 +41,8 @@ module Overapp
       full_body
     end 
 
-    def combined(base)
-      b = apply_body_to(base.full_body)
+    def combined(base=nil)
+      b = apply_body_to(base ? base.full_body : "")
       if b == :delete
         nil
       else
@@ -53,14 +53,11 @@ module Overapp
     def write_to!(dir)
       raise "bad path" if path.blank?
       d = File.dirname("#{dir}/#{path}")
-      `mkdir -p #{d}`
-      File.create "#{dir}/#{path}",body
+      Overapp.ec "mkdir -p #{d}", :silent => true
+      Overapp.file_create "#{dir}/#{path}",body
     end
 
     fattr(:vars) { {} }
-    def parsed
-      combined(OpenStruct.new(:full_body => ""))
-    end
   end
 
   class BasicFile < TemplateFile

data/lib/overapp/template_file/params.rb

@@ -2,7 +2,7 @@ module Overapp
   class TemplateFile
     class Params
       include FromHash
-      attr_accessor :full_body
+      attr_accessor :full_body, :path
       def body; full_body; end
       include Enumerable
       def each(&b)
@@ -30,11 +30,9 @@ module Overapp
         end
         res
       rescue => exp
-        puts "Error in split_note_and_body #{path}"
-        raise exp
+        raise "split_note_and_body #{path} #{exp.message}"
       end
 
-
       def note_params_single(one)
         res = {}
         note = one[:note]

data/lib/overapp/util/dir.rb

@@ -3,18 +3,28 @@ module Overapp
     def dir_files(dir)
       res = Dir["#{dir}/**/*"] + Dir["#{dir}/**/.*"]
       res = res - [".","..",".git"]
-      res.reject { |x| FileTest.file?(x) && File.binary?(x) && !(x =~ /\.txt/) }
-      res.select { |x| FileTest.file?(x) }
+      res = res.select { |x| FileTest.file?(x) }
     end
     def dir_files_full(dir)
       raise "Dir not there #{dir}" unless FileTest.exist?(dir)
       dir_files(dir).map do |full_file|
         f = full_file.gsub("#{dir}/","")
         raise "bad #{f}" if f == full_file
-        {:file => f, :body => File.read(full_file)}
+        {:file => f, :body => read(full_file)}
       end
     end
 
+    def read(file)
+      if File.binary?(file)
+        File.open(file,"rb") do |f|
+          f.read
+        end
+      else
+        File.read(file)
+      end
+    end
+
+
     def with_local_path(overapp_path,&b)
       if Git.repo?(overapp_path)
         TmpDir.with_repo_path(overapp_path) do |dir|

data/lib/overapp/util/file.rb

@@ -0,0 +1,7 @@
+module Overapp
+  class << self
+    def file_create(*args)
+      File.create(*args)
+    end
+  end
+end

data/overapp.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = "overapp"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = "2013-11-22"
+  s.date = "2013-11-27"
   s.description = "overapp"
   s.email = "mharris717@gmail.com"
   s.executables = ["overapp"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "Guardfile",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/overapp",
@@ -50,14 +50,17 @@ Gem::Specification.new do |s|
     "lib/overapp/template_file/var_obj.rb",
     "lib/overapp/util/cmd.rb",
     "lib/overapp/util/dir.rb",
+    "lib/overapp/util/file.rb",
     "lib/overapp/util/git.rb",
     "lib/overapp/util/tmp_dir.rb",
     "lib/overapp/util/write.rb",
     "lib/overapp/var.rb",
     "overapp.gemspec",
+    "spec/binary_copy_spec.rb",
     "spec/command_replacement_spec.rb",
     "spec/from_command_spec.rb",
     "spec/git_spec.rb",
+    "spec/input/rails.png",
     "spec/input/rails_post_overlay/.overapp",
     "spec/input/rails_post_overlay/app/models/post.rb",
     "spec/input/rails_widget_overlay/.overapp",

data/spec/binary_copy_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'binary' do
+  it 'smoke' do
+    path = File.dirname(__FILE__) + "/input/rails.png"
+    body = Overapp.read(path)
+    template_file = Overapp::TemplateFile.new(:path => path, :full_body => body)
+    template_file.should_not be_has_note
+  end
+
+  describe 'manual' do
+    include_context "projects"
+    include_context "output dir"
+
+    let(:mock_file_methods) { false }
+
+    project "main" do |p|
+      p.config :overlay,:widget
+      p.file "README","hello"
+      p.file "rails.png",Overapp.read(File.dirname(__FILE__) + "/input/rails.png")
+    end
+
+    project "widget" do |p|
+      p.file "widget.rb","widget"
+    end
+
+    def fix_overlay_path
+      path = project("main").path + "/.overlay"
+      body = File.read(path)
+
+      body = body.gsub("widget",project("widget").path)
+      File.create path, body
+      project("main").tap do |p|
+        p.config_body!
+        p.config!
+      end
+    end
+
+    before do
+      fix_overlay_path
+    end
+
+    has_file "README"
+    has_file "rails.png"
+    has_files 4
+
+    it 'thing' do
+      project('main').write_to! output_dir
+      2.should == 2
+    end
+  end
+end

data/spec/command_replacement_spec.rb

@@ -30,4 +30,32 @@ describe "Command Replacement" do
       project.overapps.first.foo.should == :bar
     end
   end
-end
+end
+
+describe 'thing' do
+  include_context "projects"
+
+  project "auth" do |p|
+    p.config :overlay, :basic_app
+    p.file "auth.coffee","auth = true"
+  end
+
+  project :basic_app do |p|
+    p.config :overlay, :widget, :name => :sample
+    p.file "main.coffee","stuff"
+  end
+
+  project :widget do |p|
+    p.file "widget.rb","widget"
+  end
+
+  has_files 3
+
+  it 'has name' do
+    project(:basic_app).overapps.first
+  end
+end
+
+
+
+

data/spec/from_command_spec.rb

@@ -4,55 +4,46 @@ describe 'FromCommand' do
   include_context "tmp dir"
   include_context "output dir"
 
-  let(:command) do
-    "mkdir abc && cd abc && echo stuff > abc.txt"
-  end
-
-  let(:config_body) do
-    "c.command '#{command}', :path => 'abc'"
-  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
+  before do
+    File.create "#{tmp_dir}/place.txt","fun"
     project.write_to! output_dir
-    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"
+  def files_should_equal(files)
+    Dir["#{output_dir}/**/*.*"].sort.should == files.sort.map { |x| "#{output_dir}/#{x}" }
   end
 
-  let(:config_body) do
-    "c.command '#{command}'"
-  end
+  describe "with subdir" do
+    let(:command) do
+      "mkdir abc && cd abc && echo stuff > abc.txt"
+    end
 
-  before do
-    File.create "#{tmp_dir}/place.txt","fun"
-  end
+    let(:config_body) do
+      "c.command '#{command}', :path => 'abc'"
+    end
 
-  let(:project) do
-    res = Overapp::Project.new(:path => tmp_dir)
-    res.stub(:config_body) { config_body }
-    res
+    it 'has files' do
+      files_should_equal ['abc.txt','place.txt']
+    end
   end
 
-  it 'runs' do
-    project.write_to! output_dir
-    Dir["#{output_dir}/**/*.*"].sort.should == ['abc.txt','place.txt'].sort.map { |x| "#{output_dir}/#{x}" }
+  describe "at root" do
+    let(:command) do
+      "echo stuff > abc.txt"
+    end
+
+    let(:config_body) do
+      "c.command '#{command}'"
+    end
+
+    it 'has files' do
+      files_should_equal ['abc.txt','place.txt']
+    end
   end
 end
-

data/spec/git_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe 'Git' do
+describe 'Git Coverage' do
   it 'smoke' do
     Overapp::TmpDir.with do |dir|
       Overapp::Git.commit(dir,"stuff") do
@@ -10,3 +10,25 @@ describe 'Git' do
     2.should == 2
   end
 end
+
+describe 'overapp output is checked into git' do
+  before do
+    Overapp.stub(:file_create) { |*args| }
+    Overapp.stub(:ec) { |*args| }
+  end
+
+  include_context "projects"
+
+  project do |p|
+    p.file "README","Hello"
+  end
+
+  let(:output_path) do
+    "/tmp/asdfsfwefwef/fgdfgeefgefgefge#{rand(100000000000000)}"
+  end
+
+  it 'write' do
+    Overapp::Git.should_receive(:commit_inner).with(output_path,"Overlay Created",true)
+    project.write_to! output_path
+  end
+end

data/spec/overapp_spec.rb

@@ -35,7 +35,7 @@ describe "combine" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == 'other'
   end
 end
@@ -52,7 +52,7 @@ describe "dotfile" do
   end
 
   it 'dotfile there' do
-    f = combined.files.find { |x| x.path == ".abc" }
+    f = combined.find { |x| x.path == ".abc" }
     f.body.should == 'stuff'
   end
 end
@@ -71,7 +71,7 @@ describe "combine - append format2" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "here\nother"
   end
 end
@@ -88,7 +88,7 @@ describe "combine - insert after" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "123\n456\nabc\n789"
   end
 end
@@ -105,7 +105,7 @@ describe "combine - insert after with colon" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "123\n45: 6\nabc\n789"
   end
 end
@@ -122,7 +122,7 @@ describe "combine - insert before" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "123\nabc\n456\n789"
   end
 end
@@ -151,7 +151,7 @@ describe "combine - multiple directives" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "abc\ndef\n789"
   end
 end
@@ -168,7 +168,7 @@ describe "combine - replace" do
   end
 
   it 'combined file should overwrite' do
-    f = combined.files.find { |x| x.path == "b.txt" }
+    f = combined.find { |x| x.path == "b.txt" }
     f.body.should == "123\nabc\n789"
   end
 end

data/spec/project_context_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
 describe "projects" do
   include_context "projects"
   include_context "output dir"
@@ -13,7 +15,7 @@ describe "projects" do
 
   describe "multiple projects" do
     project "main" do |p|
-      p.config "c.overlay 'widget'"
+      p.config :overlay, :widget
       p.file "README","hello"
     end
 
@@ -113,9 +115,10 @@ describe "projects" do
     has_file "README","Hello baz"
   end
 
-  describe "refs self", :pending => true do
+  describe "refs self", :pending => false do
     project "base" do |p|
-      p.config "c.overlay :self; c.overlay 'auth'"
+      p.config :overlay, "."
+      p.config :overlay,:auth
       p.file "README","hello"
     end
 
@@ -126,6 +129,10 @@ describe "projects" do
     has_files 1
     has_file "README","hello auth stuff"
   end
+
+  
 end
 
 
+
+

data/spec/project_note_spec.rb

@@ -143,7 +143,7 @@ describe "write project" do
   end
 
   describe "from git" do
-    before do
+    before(:all) do
       Overapp.write_project overapp_dir, output_dir
     end
 

data/spec/support/output_dir.rb

@@ -6,6 +6,6 @@ shared_context "output dir" do
     output_dir
   end
   after do
-    ec "rm -rf #{output_dir}", :silent => true
+    #ec "rm -rf #{output_dir}", :silent => true
   end
 end

data/spec/support/project.rb

@@ -14,21 +14,53 @@ class Object
 end
 
 class ProjectDSL
-  dsl_method :config
   dsl_method :path
+  attr_accessor :main
 
   attr_accessor :name
   include FromHash
 
+  def config_hash(method,arg,ops={})
+    res = "c.#{method} '#{arg}'"
+    ops.each do |k,v|
+      res << ", :#{k} => '#{v}'"
+    end
+    config res
+  end
+  def config(*args)
+    if args.length >= 2
+      config_hash(*args)
+    elsif args.first.kind_of?(Hash)
+      raise "first hash arg"
+    elsif args.size == 1
+      self.configs << args.first
+    else
+      raise "bad"
+    end
+  end
+  def config_body
+    configs.join("\n")
+  end
+  fattr(:configs) { [] }
+
   fattr(:project) do
     res = Overapp::Project.new
-    res.config_body = config || ""
+    res.config_body = config_body
     res.path = path || "/tmp/#{rand(100000000000000000)}"
 
     res.vars = res.vars.merge(vars)
     res
   end
 
+  def write_to_tmp!
+    Overapp.ec "rm -rf #{project.path}", :silent => true if FileTest.exist?(project.path)
+    Overapp.ec "mkdir #{project.path}", :silent => true
+    File.create "#{project.path}/.overlay",config_body
+    files.each do |f|
+      File.create "#{project.path}/#{f.path}",f.body
+    end
+  end
+
   def file(path,body,overlay_ops={})
     if overlay_ops.size > 0
       inner = []
@@ -52,8 +84,9 @@ end
 
 shared_context "projects" do
   class << self
-    def project(name="default",&b)
-      dsl = ProjectDSL.new(:name => name)
+    def project(name="default",ops={},&b)
+      ops = {:name => name}.merge(ops)
+      dsl = ProjectDSL.new(ops)
       b[dsl]
       raise "project #{name} already exists" if project_dsls[name]
       self.project_dsls[name] = dsl
@@ -83,42 +116,55 @@ shared_context "projects" do
     end
   end
 
-  let(:project) do
-    self.class.project_dsls.values.first.project
+  def dsls
+    self.class.project_dsls.values
+  end
+
+  def main_project
+    mains = dsls.select { |x| x.main }
+    raise "bad" if mains.size > 1
+    (mains.first || dsls.first).project
+  end
+
+  def project(name=nil)
+    if name
+      self.class.project_dsls[name].project
+    else
+      main_project
+    end
   end
 
   let(:combined) do
     project.combined_files
   end
 
+  def find_dsl(dir)
+    dsl = self.class.project_dsls.values.find { |x| x.project.path == dir || x.name.to_s == dir.to_s }
+    raise "no dir #{dir}, possible: \n" + self.class.project_dsls.values.map { |x| x.project.path }.join("\n") unless dsl
+    dsl
+  end
+
+  let(:mock_file_methods) { true }
+
   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|
+    if mock_file_methods
+      Overapp.stub(:dir_files_full) do |dir|
+        find_dsl(dir).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")
+      Overapp::Project.stub("project?") do |dir|
+        find_dsl(dir).config_body.present?
       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")
+      Overapp::Project.stub("load") do |ops|
+        dir = ops[:path]
+        find_dsl(dir).project
+      end
+    else
+      self.class.project_dsls.values.each do |dsl|
+        dsl.write_to_tmp!
       end
     end
 

data/spec/template_spec.rb

@@ -37,7 +37,7 @@ describe 'Template' do
     end
 
     it 'works' do
-      template_file.parsed.full_body.should == "\n4"
+      template_file.combined(nil).full_body.should == "\n4"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext
@@ -185,7 +185,7 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .rspec
@@ -193,7 +193,7 @@ files:
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/overapp
@@ -219,14 +219,17 @@ files:
 - lib/overapp/template_file/var_obj.rb
 - lib/overapp/util/cmd.rb
 - lib/overapp/util/dir.rb
+- lib/overapp/util/file.rb
 - lib/overapp/util/git.rb
 - lib/overapp/util/tmp_dir.rb
 - lib/overapp/util/write.rb
 - lib/overapp/var.rb
 - overapp.gemspec
+- spec/binary_copy_spec.rb
 - spec/command_replacement_spec.rb
 - spec/from_command_spec.rb
 - spec/git_spec.rb
+- spec/input/rails.png
 - spec/input/rails_post_overlay/.overapp
 - spec/input/rails_post_overlay/app/models/post.rb
 - spec/input/rails_widget_overlay/.overapp