overapp 0.2.0

data/lib/overapp.rb

@@ -0,0 +1,38 @@
+require 'mharris_ext'
+
+%w(files template_file thor_file project from_command).each do |f|
+  load File.dirname(__FILE__) + "/overapp/#{f}.rb"
+end
+
+module Overapp
+  class << self
+    def with_repo_path(url)
+      dir = "/tmp/#{rand(100000000000000000000)}"
+      `mkdir #{dir}`
+      Dir.chdir(dir) do
+        `git clone #{url} .`
+      end
+      yield dir
+    ensure
+      `rm -rf #{dir}`
+    end
+    def with_local_path(overapp_path,&b)
+      if overapp_path =~ /git/
+        with_repo_path(overapp_path) do |dir|
+          b[dir]
+        end
+      else
+        yield overapp_path
+      end
+    end
+    def write_project(overapp_path,output_path)
+      with_local_path(overapp_path) do |dir|
+        Overapp::Project.new(:path => dir).write_to!(output_path)
+      end
+    end
+
+    def ec(cmd,ops={})
+      `#{cmd}`
+    end
+  end
+end

data/overapp.gemspec

@@ -0,0 +1,104 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "overapp"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mike Harris"]
+  s.date = "2013-11-07"
+  s.description = "overapp"
+  s.email = "mharris717@gmail.com"
+  s.executables = ["overapp"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/overapp",
+    "lib/overapp.rb",
+    "lib/overapp/files.rb",
+    "lib/overapp/from_command.rb",
+    "lib/overapp/project.rb",
+    "lib/overapp/template_file.rb",
+    "lib/overapp/thor_file.rb",
+    "overapp.gemspec",
+    "spec/from_command_spec.rb",
+    "spec/input/top/.overlay",
+    "spec/input/top/b.txt",
+    "spec/input/top/c.txt",
+    "spec/input/top/place/d.txt",
+    "spec/overapp_spec.rb",
+    "spec/project_note_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/output_dir.rb",
+    "spec/support/setup.rb",
+    "vol/input/base/a.txt",
+    "vol/input/base/b.txt",
+    "vol/input/top/.fstemplate",
+    "vol/input/top/b.txt",
+    "vol/input/top/c.txt",
+    "vol/input/top/place/d.txt",
+    "vol/test_write.rb"
+  ]
+  s.homepage = "http://github.com/mharris717/overapp"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.7"
+  s.summary = "overapp"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<andand>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_development_dependency(%q<guard-spork>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_development_dependency(%q<lre>, [">= 0"])
+    else
+      s.add_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_dependency(%q<andand>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_dependency(%q<guard-spork>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_dependency(%q<lre>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mharris_ext>, [">= 0"])
+    s.add_dependency(%q<andand>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_dependency(%q<guard-spork>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+    s.add_dependency(%q<lre>, [">= 0"])
+  end
+end
+

data/spec/from_command_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'FromCommand' do
+  let(:command) do
+    "mkdir abc && cd abc && echo stuff > abc.txt"
+  end
+
+  let(:from_command) do
+    Overapp::FromCommand.new(:command => command, :path => "abc")
+  end
+
+  it 'files' do
+    from_command.files.size.should == 1
+    from_command.files.first.path.should == 'abc.txt'
+    from_command.files.first.full_body.strip.should == 'stuff'
+  end
+end

data/spec/input/top/.overlay

@@ -0,0 +1 @@
+c.base "file:///code/orig/fs_template/spec/input/repo/.git"

data/spec/input/top/b.txt

@@ -0,0 +1,6 @@
+<overlay>
+  action: insert
+  after: a
+</overlay>
+1
+2

data/spec/input/top/c.txt

@@ -0,0 +1 @@
+C Stuff

data/spec/input/top/place/d.txt

@@ -0,0 +1 @@
+Hello

data/spec/overapp_spec.rb

@@ -0,0 +1,183 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Overapp" do
+  include_context "setup"
+
+  it 'smoke' do
+    2.should == 2
+  end
+
+  base_file "a.txt","stuff"
+  on_top_file "b.txt","other"
+
+  it 'base files' do
+    base.files.size.should == 1
+  end
+
+  it 'top files' do
+    on_top.files.size.should == 1
+  end
+
+  it 'combined' do
+    combined.size.should == 2
+  end
+end
+
+describe "combine" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","here"
+  on_top_file "b.txt","other"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == 'other'
+  end
+end
+
+describe "dotfile" do
+  include_context "setup"
+
+  base_file ".abc","stuff"
+  base_file "b.txt","here"
+  on_top_file "c.txt","other"
+
+  it 'combined size' do
+    combined.size.should == 3
+  end
+
+  it 'dotfile there' do
+    f = combined.files.find { |x| x.path == ".abc" }
+    f.body.should == 'stuff'
+  end
+end
+
+describe "combine - append" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","here"
+  on_top_file "b.txt","FSTMODE:append\nother"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "here\nother"
+  end
+end
+
+describe "combine - append format2" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","here"
+  on_top_file "b.txt","<overapp>append</overapp>\nother"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "here\nother"
+  end
+end
+
+describe "combine - insert" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","a\nb\nc\nd"
+  on_top_file "b.txt","FSTMODE:insert:line:2\nother\n"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "a\nother\nb\nc\nd"
+  end
+end
+
+describe "combine - insert after" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","123\n456\n789"
+  on_top_file "b.txt","<overapp>action: insert\nafter: 456</overapp>\nabc"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "123\n456\nabc\n789"
+  end
+end
+
+describe "combine - insert before" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","123\n456\n789"
+  on_top_file "b.txt","<overapp>action: insert\nbefore: 456</overapp>abc\n"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "123\nabc\n456\n789"
+  end
+end
+
+describe "combine - replace" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","123\n456\n789"
+  on_top_file "b.txt","<overapp>action: replace\nbase: 456</overapp>abc"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "123\nabc\n789"
+  end
+end
+
+
+describe "combine - top file in new dir" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  on_top_file "place/b.txt","Hello"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+end
+
+describe "combine - error" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  on_top_file "a.txt","FSTMODE:fgdfgdfg\nstuff"
+
+  it 'combined size' do
+    lambda { combined.size }.should raise_error
+  end
+end

data/spec/project_note_spec.rb

@@ -0,0 +1,200 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "ProjectConfig" do
+  let(:config) do
+    res = Overapp::ProjectConfig.new
+    res.body = config_body
+    res
+  end
+
+  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.base.should == :foo
+    end
+  end
+
+  describe "base and overapp" do
+    let(:config_body) do
+      "c.base :foo
+      c.overapp :bar"
+    end
+
+    it 'eval' do
+      config.load!
+      config.base.should == :foo
+      config.overapps.should == [:bar]
+    end
+  end
+
+  it 'project no config' do
+    lambda { Overapp::Project.new.config }.should raise_error
+  end
+end
+
+describe 'Project' do
+  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 == 2
+    project.overapp_paths.last.should == "/fun"
+  end
+end
+
+describe 'Project with command' do
+  let(:config_body) do
+    "c.base :foo
+    c.overapp :bar
+    c.command 'ls'"
+  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 'commands' do
+    project.commands(:after).should == ["ls"]
+  end
+end
+
+describe 'Project order' do
+  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
+
+  it 'write' do
+    output_path = "/tmp/f/t/r/r"
+
+    Overapp.should_receive(:ec).with("cd #{output_path} && ls", :silent => true)
+    project.stub(:git_commit)
+    project.combined_files.stub("write_to!")
+
+    project.write_to! output_path
+  end
+end
+
+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'
+  end
+end
+
+
+describe "write project" do
+  include_context "output dir"
+
+  let(:repo_dir) do
+    "#{input_dir}/repo"
+  end
+  let(:input_dir) do
+    File.expand_path(File.dirname(__FILE__) + "/input")
+  end
+  let(:overapp_dir) do
+    "#{input_dir}/top"
+  end
+
+  def files_equal(source_dir,target_dir,file)
+    source = File.read("#{source_dir}/#{file}")
+    target = File.read("#{target_dir}/#{file}")
+    FileTest.should be_exist("#{target_dir}/#{file}")
+    source.should == target
+  end
+
+  describe "from git" do
+    before do
+      Overapp.write_project overapp_dir, output_dir
+    end
+
+    it 'has README' do
+      files_equal repo_dir, output_dir, "README.md"
+    end
+
+    it 'c.txt' do
+      files_equal overapp_dir, output_dir, "c.txt"
+    end
+
+    it 'b.txt insert' do
+      File.read("#{output_dir}/b.txt").should == %w(a 1 2 b c d).join("\n") + "\n"
+    end
+  end
+
+  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

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'spork'
+
+
+Spork.prefork do
+  unless ENV['DRB']
+    require 'simplecov'
+    SimpleCov.start
+  end
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+  require 'rspec'
+
+
+  # Requires supporting files with custom matchers and macros, etc,
+  # in ./support/ and its subdirectories.
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+  RSpec.configure do |config|
+    #config.filter_run :focus => true
+    config.fail_fast = false
+  end
+end
+
+Spork.each_run do
+  if ENV['DRB']
+    require 'simplecov'
+    SimpleCov.start
+  end
+  load File.dirname(__FILE__) + "/../lib/overapp.rb"
+  #Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| load f}
+end

data/spec/support/output_dir.rb

@@ -0,0 +1,14 @@
+shared_context "output dir" do
+  def make_fresh_output_dir
+    `mkdir /tmp/fresh_output` unless FileTest.exist?("/tmp/fresh_output")
+    dir = "/tmp/fresh_output/#{rand(10000000000000)}"
+    `mkdir #{dir}`
+    dir
+  end
+
+  let(:output_dir) { make_fresh_output_dir }
+
+  after do
+    `rm -rf #{output_dir}`
+  end
+end

data/spec/support/setup.rb

@@ -0,0 +1,33 @@
+shared_context "setup" do
+  class << self
+    fattr(:files) { [] }
+    def base_file(file,body)
+      self.files << {:loc => :base, :file => file, :body => body}
+    end
+    def on_top_file(file,body)
+      self.files << {:loc => :on_top, :file => file, :body => body}
+    end
+  end
+
+  let(:file_class) { Overapp::TemplateFile }
+
+  let(:base) do
+    res = Overapp::Files.new(:file_class => file_class)
+    self.class.files.select { |x| x[:loc] == :base }.each do |f|
+      res.add f
+    end
+    res
+  end
+
+  let(:on_top) do
+    res = Overapp::Files.new(:file_class => file_class)
+    self.class.files.select { |x| x[:loc] == :on_top }.each do |f|
+      res.add f
+    end
+    res
+  end
+
+  let(:combined) do
+    base.apply(on_top)
+  end
+end

data/vol/input/base/a.txt

@@ -0,0 +1 @@
+Stuff goes herezzz

data/vol/input/base/b.txt

@@ -0,0 +1,7 @@
+More Stuff
+a
+b
+c
+d
+e
+f

data/vol/input/top/.fstemplate

@@ -0,0 +1 @@
+c.base "https://github.com/mharris717/lre.git"

data/vol/input/top/b.txt

@@ -0,0 +1,3 @@
+FSTMODE:insert:line:2
+I don't belong here
+Neither do I

data/vol/input/top/c.txt

@@ -0,0 +1 @@
+C Stuff

data/vol/input/top/place/d.txt

@@ -0,0 +1 @@
+Hello

data/vol/test_write.rb

@@ -0,0 +1,10 @@
+load "lib/overapp.rb"
+
+dir = File.expand_path(File.dirname(__FILE__))
+
+Dir["#{dir}/output/**/*.*"].each do |f|
+  `rm #{f}`
+end
+
+#Overapp::Files.write_combined "#{dir}/input/base","#{dir}/input/top","#{dir}/output"
+Overapp.write_project "#{dir}/input/top","#{dir}/output"