stencil 0.1.4 → 0.1.5

data/gemspec.rb

@@ -14,5 +14,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 end

data/lib/stencil/merge.rb

@@ -84,17 +84,20 @@ class Stencil
       def progressive(path, branches, push)
         merger = branches.shift
         mergee = branches.first
-        if merger && mergee
-          unless merger.empty? || mergee.empty?
-            output = Cmd.run path, "git checkout #{mergee}"
-            Msg.error(output) if output.downcase.include?('error')
-            Msg.merging_x_into_y merger, mergee
-            output = Cmd.run path, "git merge #{merger}"
-            Msg.error(output) if output.downcase.include?('conflict')
-            Cmd.run(path, "git push origin #{mergee}") if push
+        branches.each do |mergee|
+          if merger && mergee
+            ok = mergee[0..merger.length-1] == merger || merger == 'master'
+            unless merger.empty? || mergee.empty? || !ok
+              output = Cmd.run path, "git checkout #{mergee}"
+              Msg.error(output) if output.downcase.include?('error')
+              Msg.merging_x_into_y merger, mergee
+              output = Cmd.run path, "git merge #{merger}"
+              Msg.error(output) if output.downcase.include?('conflict')
+              Cmd.run(path, "git push origin #{mergee}") if push
+            end
           end
-          progressive(path, branches, push)
         end
+        progressive(path, branches, push) unless branches.empty?
       end
     end
   end

data/require.rb

@@ -13,7 +13,7 @@ Require do
     name 'stencil'
     homepage "http://github.com/winton/#{name}"
     summary "Project template manager"
-    version '0.1.4'
+    version '0.1.5'
   end
   
   rakefile do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: stencil
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2011-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -46,21 +47,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Project template manager