vendorer 0.1.7 → 0.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vendorer (0.1.7)
+    vendorer (0.1.8)
 
 GEM
   remote: http://rubygems.org/

data/lib/vendorer/version.rb

@@ -1,3 +1,3 @@
 class Vendorer
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/vendorer.rb

@@ -30,6 +30,7 @@ class Vendorer
         if commit = (options[:ref] || options[:tag] || options[:branch])
           run "cd #{path} && git checkout '#{commit}'"
         end
+        run("cd #{path} && git submodule update --init --recursive")
         run "rm -rf #{path}/.git"
         yield path if block_given?
       end

data/spec/vendorer_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 describe Vendorer do
   before do
+    Dir.chdir File.dirname(File.dirname(__FILE__))
     `rm -rf spec/tmp`
     `mkdir spec/tmp`
+    Dir.chdir 'spec/tmp'
   end
 
   after do
@@ -11,29 +13,29 @@ describe Vendorer do
   end
 
   def write(file, content)
-    File.open("spec/tmp/#{file}",'w'){|f| f.write(content) }
+    File.open(file,'w'){|f| f.write(content) }
   end
 
   def read(file)
-    File.read("spec/tmp/#{file}")
+    File.read(file)
   end
 
   def size(file)
-    File.size("spec/tmp/#{file}")
+    File.size(file)
   end
 
   def run(cmd)
-    result = `cd spec/tmp && #{cmd} 2>&1`
+    result = `#{cmd} 2>&1`
     raise result unless $?.success?
     result
   end
 
   def ls(path)
-    `ls spec/tmp/#{path} 2>&1`.split("\n")
+    `ls #{path} 2>&1`.split("\n")
   end
 
   def vendorer(args='', options={})
-    out = `cd spec/tmp && bundle exec ../../bin/vendorer #{args} 2>&1`
+    out = `bundle exec ../../bin/vendorer #{args} 2>&1`
     raise out if $?.success? == !!options[:raise]
     out
   end
@@ -302,6 +304,60 @@ describe Vendorer do
         read('public/javascripts/jquery.js').should include('jQuery')
       end
     end
+
+    context "submodules" do
+      def create_git_repo(folder, command)
+        # create a git repo with a submodule
+        run "mkdir #{folder}"
+        run "cd #{folder} && git init"
+        run "cd #{folder} && #{command}"
+        run "cd #{folder} && git add ."
+        run "cd #{folder} && git commit -am 'initial'"
+      end
+
+      let(:vendorer){
+        v = Vendorer.new
+        def v.puts(x);end # silence
+        v
+      }
+
+      it "installs submodules" do
+        create_git_repo 'a', 'git submodule add `cd ../../../.git && pwd` sub'
+
+        vendorer.folder 'plugin', 'a/.git'
+
+        run("ls -a plugin").should == ".\n..\n.gitmodules\nsub\n"
+        run("ls -a plugin/sub").should include('Gemfile')
+      end
+
+      it "installs recursive submodules" do
+        create_git_repo 'a', 'git submodule add `cd ../../../.git && pwd` sub_a'
+        create_git_repo 'b', 'git submodule add `cd ../a/.git && pwd` sub_b'
+
+        vendorer.folder 'plugin', 'b/.git'
+
+        run("ls -a plugin").should == ".\n..\n.gitmodules\nsub_b\n"
+        run("ls -a plugin/sub_b").should == ".\n..\n.git\n.gitmodules\nsub_a\n"
+        run("ls -a plugin/sub_b/sub_a").should include('Gemfile')
+      end
+
+      it "installs recursive submodules from a branch" do
+        create_git_repo 'a', 'git submodule add `cd ../../../.git && pwd` sub_a'
+        create_git_repo 'b', 'touch .gitmodules'
+
+        # create submodules on a branch
+        run "cd b && git co -b with_submodules"
+        run "cd b && git submodule add `cd ../a/.git && pwd` sub_b"
+        run "cd b && git add . && git commit -am 'submodules'"
+        run "cd b && git checkout master"
+
+        vendorer.folder 'plugin', 'b/.git', :branch => 'with_submodules'
+
+        run("ls -a plugin").should == ".\n..\n.gitmodules\nsub_b\n"
+        run("ls -a plugin/sub_b").should == ".\n..\n.git\n.gitmodules\nsub_a\n"
+        run("ls -a plugin/sub_b/sub_a").should include('Gemfile')
+      end
+    end
   end
 
   describe '#rewrite' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 53423261
+      hash: -191468703
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 53423261
+      hash: -191468703
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10