overapp 0.3.1 → 0.4.0

data/lib/overapp.rb

@@ -1,38 +1,34 @@
 require 'mharris_ext'
 
-%w(files template_file thor_file project from_command).each do |f|
-  load File.dirname(__FILE__) + "/overapp/#{f}.rb"
+class Object
+  def klass
+    self.class
+  end
 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}`
+  def self.load_files!
+    %w(files template_file project from_command).each do |f|
+      load File.dirname(__FILE__) + "/overapp/#{f}.rb"
+    end
+
+    %w(base instance factory).each do |f|
+      load File.dirname(__FILE__) + "/overapp/load/#{f}.rb"
     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
+
+    %w(command raw_dir local_dir repo empty project).each do |f|
+      load File.dirname(__FILE__) + "/overapp/load/types/#{f}.rb"
     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
+
+    %w(config write config_entry).each do |f|
+      load File.dirname(__FILE__) + "/overapp/project/#{f}.rb"
     end
 
-    def ec(cmd,ops={})
-      MharrisExt.ec(cmd,ops)
+    %w(tmp_dir git dir cmd write).each do |f|
+      load File.dirname(__FILE__) + "/overapp/util/#{f}.rb"
     end
   end
-end
+end
+
+Overapp.load_files!
+

data/overapp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "overapp"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = "2013-11-11"
+  s.date = "2013-11-15"
   s.description = "overapp"
   s.email = "mharris717@gmail.com"
   s.executables = ["overapp"]
@@ -31,20 +31,74 @@ Gem::Specification.new do |s|
     "lib/overapp.rb",
     "lib/overapp/files.rb",
     "lib/overapp/from_command.rb",
+    "lib/overapp/load/base.rb",
+    "lib/overapp/load/factory.rb",
+    "lib/overapp/load/instance.rb",
+    "lib/overapp/load/types/command.rb",
+    "lib/overapp/load/types/empty.rb",
+    "lib/overapp/load/types/local_dir.rb",
+    "lib/overapp/load/types/project.rb",
+    "lib/overapp/load/types/raw_dir.rb",
+    "lib/overapp/load/types/repo.rb",
     "lib/overapp/project.rb",
+    "lib/overapp/project/config.rb",
+    "lib/overapp/project/config_entry.rb",
+    "lib/overapp/project/write.rb",
     "lib/overapp/template_file.rb",
-    "lib/overapp/thor_file.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",
     "overapp.gemspec",
     "spec/from_command_spec.rb",
+    "spec/input/rails_post_overlay/.overapp",
+    "spec/input/rails_post_overlay/app/models/post.rb",
+    "spec/input/rails_widget_overlay/.overapp",
+    "spec/input/rails_widget_overlay/app/models/widget.rb",
+    "spec/input/repo/.abc",
+    "spec/input/repo/README.md",
+    "spec/input/repo/b.txt",
+    "spec/input/repo/git_dir/COMMIT_EDITMSG",
+    "spec/input/repo/git_dir/HEAD",
+    "spec/input/repo/git_dir/MERGE_RR",
+    "spec/input/repo/git_dir/config",
+    "spec/input/repo/git_dir/description",
+    "spec/input/repo/git_dir/hooks/applypatch-msg.sample",
+    "spec/input/repo/git_dir/hooks/commit-msg.sample",
+    "spec/input/repo/git_dir/hooks/post-update.sample",
+    "spec/input/repo/git_dir/hooks/pre-applypatch.sample",
+    "spec/input/repo/git_dir/hooks/pre-commit.sample",
+    "spec/input/repo/git_dir/hooks/pre-push.sample",
+    "spec/input/repo/git_dir/hooks/pre-rebase.sample",
+    "spec/input/repo/git_dir/hooks/prepare-commit-msg.sample",
+    "spec/input/repo/git_dir/hooks/update.sample",
+    "spec/input/repo/git_dir/index",
+    "spec/input/repo/git_dir/info/exclude",
+    "spec/input/repo/git_dir/logs/HEAD",
+    "spec/input/repo/git_dir/logs/refs/heads/master",
+    "spec/input/repo/git_dir/objects/0f/0920d9d41f24629586ec1c20d2283d7df3a950",
+    "spec/input/repo/git_dir/objects/16/b5741fe01104ea0bdf50603b4c5d42ae5dcbc1",
+    "spec/input/repo/git_dir/objects/20/508dfdb202a80e2c533f259a526205448b0152",
+    "spec/input/repo/git_dir/objects/59/c5d2b4bc66e952a99b3b18a89cbc1e6704ffa0",
+    "spec/input/repo/git_dir/objects/7b/1c8984cafd98a5b369ef325a85cb80e3985148",
+    "spec/input/repo/git_dir/objects/bf/9307f21baa545173db65a417026088a033aa91",
+    "spec/input/repo/git_dir/objects/d6/8dd4031d2ad5b7a3829ad7df6635e27a7daa22",
+    "spec/input/repo/git_dir/objects/d6/cd9e553ef95332f3b77f70d11d0106ca06071c",
+    "spec/input/repo/git_dir/objects/f8/4c814d15674489c0b41035eb4243ccce522511",
+    "spec/input/repo/git_dir/refs/heads/master",
     "spec/input/top/.overlay",
     "spec/input/top/b.txt",
     "spec/input/top/c.txt",
     "spec/input/top/place/d.txt",
+    "spec/nesting_spec.rb",
     "spec/overapp_spec.rb",
     "spec/project_note_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/output_dir.rb",
     "spec/support/setup.rb",
+    "spec/support/tmp_dir.rb",
+    "tmp/.gitkeep",
     "vol/input/base/a.txt",
     "vol/input/base/b.txt",
     "vol/input/top/.fstemplate",
@@ -63,7 +117,7 @@ Gem::Specification.new do |s|
     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<mharris_ext>, [">= 1.7.1"])
       s.add_runtime_dependency(%q<andand>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -75,7 +129,7 @@ Gem::Specification.new do |s|
       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<mharris_ext>, [">= 1.7.1"])
       s.add_dependency(%q<andand>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -88,7 +142,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<lre>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mharris_ext>, [">= 0"])
+    s.add_dependency(%q<mharris_ext>, [">= 1.7.1"])
     s.add_dependency(%q<andand>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/spec/from_command_spec.rb

@@ -1,17 +1,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'FromCommand' do
+  include_context "tmp dir"
+  include_context "output dir"
+
   let(:command) do
     "mkdir abc && cd abc && echo stuff > abc.txt"
   end
 
-  let(:from_command) do
-    Overapp::FromCommand.new(:command => command, :path => "abc")
+  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 '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'
+  it 'runs' do
+    project.write_to! output_dir
+    Dir["#{output_dir}/**/*.*"].should == ['abc.txt','place.txt'].map { |x| "#{output_dir}/#{x}" }
   end
-end
+end

data/spec/input/rails_post_overlay/.overapp

@@ -0,0 +1 @@
+c.base "OVERAPP_ROOT_DIR/spec/input/rails_widget_overlay"

data/spec/input/rails_post_overlay/app/models/post.rb

@@ -0,0 +1,2 @@
+class Post < ActiveRecord::Base
+end

data/spec/input/rails_widget_overlay/.overapp

@@ -0,0 +1 @@
+c.command "mkdir config && echo route stuff > config/routes.rb"

data/spec/input/rails_widget_overlay/app/models/widget.rb

@@ -0,0 +1,2 @@
+class Widget < ActiveRecord::Base
+end

data/spec/input/repo/.abc

@@ -0,0 +1 @@
+stuff

data/spec/input/repo/README.md

@@ -0,0 +1 @@
+Stuff Here

data/spec/input/repo/b.txt

@@ -0,0 +1,4 @@
+a
+b
+c
+d

data/spec/input/repo/git_dir/COMMIT_EDITMSG

@@ -0,0 +1 @@
+.abc

data/spec/input/repo/git_dir/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/spec/input/repo/git_dir/config

@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = false

data/spec/input/repo/git_dir/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/spec/input/repo/git_dir/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/spec/input/repo/git_dir/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/spec/input/repo/git_dir/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/spec/input/repo/git_dir/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/spec/input/repo/git_dir/hooks/pre-commit.sample

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/spec/input/repo/git_dir/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

data/spec/input/repo/git_dir/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

data/spec/input/repo/git_dir/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"