stencil 0.1.1 → 0.1.2

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.1"
+  s.version = "0.1.2"
 end

data/lib/stencil/merge.rb

@@ -5,23 +5,26 @@ class Stencil
       def project(name, path)
         template = Config.read[:projects][name][:template]
         branches = Config.read[:projects][name][:branches]
-        if template
-          template = Config.read[:templates][template.intern]
-          if template && File.exists?(template[:path])
-            origin = get_origin template[:path]
-            Msg.template_url origin
-            add_remote 'template', path, origin
-            branches = %w(master) if branches.empty?
-            branches.each do |branch|
-              Msg.merge_remote_branch branch
-              Cmd.run path, "git pull template #{branch}"
-            end
-          else
-            Msg.template_not_found template
-            Msg.specify_template
+        Msg.error_specify_template unless template
+        template = Config.read[:templates][template.intern]
+        if template && File.exists?(template[:path])
+          
+          # Add remote template to project
+          origin = get_origin template[:path]
+          Msg.template_url origin
+          add_remote 'template', path, origin
+          
+          # Pull template into master if no branches specified
+          branches = %w(master) if branches.empty?
+          
+          # Pull template into each branch
+          branches.each do |branch|
+            Msg.merge_remote_branch branch
+            Cmd.run path, "git pull template #{branch}"
           end
         else
-          Msg.specify_template
+          Msg.template_not_found template
+          Msg.error_specify_template
         end
       end
       
@@ -33,20 +36,32 @@ class Stencil
         Cmd.run path, "git checkout master"
       end
       
-      def upstream(name, commit, branches=[])
+      def upstream(name, commit=nil, branches=[])
+        # Project variables
         project = Config.read[:projects][name]
         branch = Cmd.run(project[:path], "git branch").split
         branch = branch[branch.index('*') + 1]
         
+        # Template variables
         template = Config.read[:templates][project[:template].intern]
         path = template[:path]
         
+        # Add remote project to template and fetch
         origin = get_origin project[:path]
         Msg.project_url origin
         add_remote 'project', path, origin
         Cmd.run path, "git fetch project"
         
+        # Get last commit if none specified
+        unless commit
+          cmd = "git log HEAD~1..HEAD --pretty=format:'%H'"
+          commit = Cmd.run(template[:path], cmd).strip
+        end
+        
+        # Cherry pick into master if no branches specified
         branches = %w(master) if branches.empty?
+        
+        # Cherry pick commit into branches
         branches.each do |branch|
           output = Cmd.run path, "git checkout #{branch}"
           Msg.error(output) if output.downcase.include?('error')
@@ -74,7 +89,7 @@ class Stencil
         merger = branches.shift
         mergee = branches.first
         if merger && mergee
-          puts "Merging \"#{merger}\" into \"#{mergee}\""
+          Msg.merging_x_into_y merger, mergee
           output = Cmd.run path, "git checkout #{mergee}"
           Msg.error(output) if output.downcase.include?('error')
           output = Cmd.run path, "git merge #{merger}"

data/lib/stencil/msg.rb

@@ -13,6 +13,13 @@ class Stencil
         exit
       end
       
+      def error_specify_template
+        space
+        puts "Please tell stencil what template you want to receive updates from:"
+        puts "  stencil TEMPLATE [BRANCH BRANCH ...]"
+        exit
+      end
+      
       def is_template_or_project?(name)
         space
         puts "Is \"#{name}\" a template or a project?"
@@ -23,6 +30,10 @@ class Stencil
         puts "Merging remote branch \"#{branch}\""
       end
       
+      def merging_x_into_y(x, y)
+        puts "Merging \"#{x}\" into \"#{y}\""
+      end
+      
       def project_url(url)
         space
         puts "Found project URL: #{url}"
@@ -32,12 +43,6 @@ class Stencil
         puts ''
       end
       
-      def specify_template
-        space
-        puts "Please tell stencil what template you want to receive updates from:"
-        puts "  stencil TEMPLATE [BRANCH BRANCH ...]"
-      end
-      
       def template_not_found(template)
         space
         puts "Template \"#{template}\" not found."

data/stencil.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stencil}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Winton Welsh"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stencil
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Winton Welsh