overapp 0.3.1 → 0.4.0

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

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/spec/input/repo/git_dir/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/spec/input/repo/git_dir/logs/HEAD

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 16b5741fe01104ea0bdf50603b4c5d42ae5dcbc1 Mike Harris <mharris717@gmail.com> 1383054467 -0400	commit (initial): Initial
+16b5741fe01104ea0bdf50603b4c5d42ae5dcbc1 bf9307f21baa545173db65a417026088a033aa91 Mike Harris <mharris717@gmail.com> 1383055661 -0400	commit: b.txt
+bf9307f21baa545173db65a417026088a033aa91 7b1c8984cafd98a5b369ef325a85cb80e3985148 Mike Harris <mharris717@gmail.com> 1383062048 -0400	commit: .abc

data/spec/input/repo/git_dir/logs/refs/heads/master

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 16b5741fe01104ea0bdf50603b4c5d42ae5dcbc1 Mike Harris <mharris717@gmail.com> 1383054467 -0400	commit (initial): Initial
+16b5741fe01104ea0bdf50603b4c5d42ae5dcbc1 bf9307f21baa545173db65a417026088a033aa91 Mike Harris <mharris717@gmail.com> 1383055661 -0400	commit: b.txt
+bf9307f21baa545173db65a417026088a033aa91 7b1c8984cafd98a5b369ef325a85cb80e3985148 Mike Harris <mharris717@gmail.com> 1383062048 -0400	commit: .abc

data/spec/input/repo/git_dir/objects/16/b5741fe01104ea0bdf50603b4c5d42ae5dcbc1

@@ -0,0 +1,2 @@
+x
��K
+1@]������Gq�щ�)N-�z�������ZP��U�X�|��i/81��:�e'"��D&��:\�S�{/o8�����QsYv���%��9D�"#�ծϡ����*���|
_�7?

data/spec/input/repo/git_dir/objects/7b/1c8984cafd98a5b369ef325a85cb80e3985148

@@ -0,0 +1,2 @@
+x
��A!=�
+>�f�a61ƣ1��Dq

data/spec/input/repo/git_dir/objects/bf/9307f21baa545173db65a417026088a033aa91

@@ -0,0 +1,2 @@
+x
��K
+1]���Cw�7".�x�|:N�8#x|�GpW��ŭ��%�zc��a!HKҘI[Z�l9b�hVɥ��b@<}�G�h�q�e@�B�,���I�<�CD��}ݚ��˳o��䡮?p�N���}�[=JT�c�E�
 �;��a�.�;�Do

data/spec/input/repo/git_dir/refs/heads/master

@@ -0,0 +1 @@
+7b1c8984cafd98a5b369ef325a85cb80e3985148

data/spec/input/top/.overlay

@@ -1 +1 @@
-c.base "file://ROOT_DIR/spec/input/repo"
+c.base "file://OVERAPP_ROOT_DIR/spec/input/repo"

data/spec/nesting_spec.rb

@@ -0,0 +1,44 @@
+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_note_spec.rb

@@ -18,7 +18,7 @@ describe "ProjectConfig" do
 
     it 'eval' do
       config.load!
-      config.base.should == :foo
+      config.overapps.first.descriptor.should == :foo
     end
   end
 
@@ -30,8 +30,7 @@ describe "ProjectConfig" do
 
     it 'eval' do
       config.load!
-      config.base.should == :foo
-      config.overapps.should == [:bar]
+      config.overapps.map { |x| x.descriptor }.should == [:foo,:bar]
     end
   end
 
@@ -57,8 +56,8 @@ describe 'Project' do
   end
 
   it 'overapps' do
-    project.overapps.size.should == 2
-    project.overapp_paths.last.should == "/fun"
+    project.overapps.size.should == 3
+    project.overapp_entries.last.descriptor.should == "/fun"
   end
 end
 
@@ -80,7 +79,7 @@ describe 'Project with command' do
   end
 
   it 'commands' do
-    project.commands(:after).should == ["ls"]
+    #project.commands(:after).should == ["ls"]
   end
 end
 
@@ -101,17 +100,23 @@ describe 'Project order' do
     Overapp::Files.stub(:load) { Overapp::Files.new }
   end
 
-  it 'write' do
-    output_path = "/tmp/f/t/r/r"
+  if false
+    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!")
+      Overapp.should_receive(:ec).with("cd #{output_path} && ls", :silent => true)
+      Overapp::Project::Write.class_eval do
+        def git_commit(*args)
+        end
+      end
+      project.combined_files("/tmp/sdfdsdfsd").stub("write_to!")
 
-    project.write_to! output_path
+      project.write_to! output_path
+    end
   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"
@@ -124,7 +129,7 @@ describe 'Project with no base' do
   end
 
   after do
-    `rm -rf #{output_path}`
+    #`rm -rf #{output_path}`
   end
 
   let(:project) do
@@ -143,6 +148,7 @@ describe 'Project with no base' do
     File.read("#{output_path}/abc.txt").strip.should == 'stuff'
   end
 end
+end
 
 
 describe "write project" do

data/spec/spec_helper.rb

@@ -1,5 +1,26 @@
 require 'rubygems'
 require 'spork'
+require 'mharris_ext'
+
+class SpecGitDir
+  include FromHash
+  attr_accessor :dir
+
+  def setup!
+    `cp -r #{dir}/git_dir #{dir}/.git` unless FileTest.exist?("#{dir}/.git")
+  end
+
+  def teardown!
+    `rm -rf #{dir}/.git` if FileTest.exist?("#{dir}/.git")
+  end
+
+  class << self
+    def make(name)
+      dir = File.dirname(__FILE__) + "/input/#{name}"
+      new(:dir => dir)
+    end
+  end
+end
 
 
 Spork.prefork do
@@ -19,7 +40,21 @@ Spork.prefork do
 
   RSpec.configure do |config|
     #config.filter_run :focus => true
-    config.fail_fast = false
+    config.fail_fast = true
+
+    repo_dirs = %w(repo)
+
+    config.before(:all) do
+      repo_dirs.each do |dir|
+        SpecGitDir.make(dir).setup!
+      end
+    end
+
+    config.after(:all) do
+      repo_dirs.each do |dir|
+        SpecGitDir.make(dir).teardown!
+      end
+    end
   end
 end
 

data/spec/support/output_dir.rb

@@ -1,14 +1,11 @@
 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
+  let(:output_dir) do
+    Overapp::TmpDir.with
+  end
+  before do
+    output_dir
   end
-
-  let(:output_dir) { make_fresh_output_dir }
-
   after do
-    `rm -rf #{output_dir}`
+    ec "rm -rf #{output_dir}", :silent => true
   end
 end

data/spec/support/tmp_dir.rb

@@ -0,0 +1,11 @@
+shared_context "tmp dir" do
+  let(:tmp_dir) do
+    Overapp::TmpDir.with
+  end
+  before do
+    tmp_dir
+  end
+  after do
+    ec "rm -rf #{tmp_dir}", :silent => true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
@@ -186,20 +186,74 @@ files:
 - 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