optimis-workflow-scripts 0.0.3.1 → 0.4.0

data/lib/optimis-workflow/commands/finish_command.rb

@@ -10,6 +10,19 @@ module OptimisWorkflow
 
         @feature_branch = `git branch | grep '\*' | awk '{print $2}'`
       end
+      
+      def local_stuff
+        update_parent_branch
+        rebase_feature_with_parent
+        run_tests
+        integrate_with_parent
+      end
+
+      def remote_stuff
+        # currently nothing needs to be done here b/c we're inserting a hook
+        # into the commit msg that will get sent to pivotal via a github
+        # post-receive callback.
+      end
 
       def self.modified_files
         @modified_files ||= `git ls-files --modified && git ls-files --deleted && git ls-files --unmerged`
@@ -26,29 +39,23 @@ module OptimisWorkflow
       def update_parent_branch
         system "git checkout #{parent_branch}"
         system "git pull origin #{parent_branch}"
-        system "git checkout #{feature_branch}"
-        system "git rebase #{parent_branch}"
       end
 
       def run_tests
         system "rake build"
         fail "\n\nWhoops! You have failing tests! All tests must be passing before finishing the feature.\n\n" if $?.exitstatus == 1
       end
-
-      def local_stuff
-        update_parent_branch
-        run_tests
+      
+      def rebase_feature_with_parent
+        system "git checkout #{feature_branch}"
+        system "git rebase #{parent_branch}"
+      end
+      
+      def integrate_with_parent
         system "git checkout #{parent_branch}"
-        system "git merge --squash #{feature_branch}"
-        system "git commit -m '#{commit_msg} #{commit_msg_suffix}'"
+        system "git merge --no-ff #{feature_branch}"
         system "git push origin #{parent_branch}"
       end
-
-      def remote_stuff
-        # currently nothing needs to be done here b/c we're inserting a hook
-        # into the commit msg that will get sent to pivotal via a github
-        # post-receive callback.
-      end
     end
   end
 end

data/lib/optimis-workflow/commands/finish_hotfix.rb

@@ -28,13 +28,13 @@ module OptimisWorkflow
 
       def do_deploy
         system "git checkout #{feature_branch}"
-        system "git push -f origin #{feature_branch}:staging"
+        system "git push -f origin #{feature_branch}:#{parent_branch}"
       end
 
       def update_master
         system "git checkout master"
         system "git pull origin master"
-        system "git merge stable"
+        system "git merge #{parent_branch}"
       end
 
       def commit_msg_suffix
@@ -42,7 +42,7 @@ module OptimisWorkflow
       end
 
       def parent_branch
-        'stable'
+        'hotfix'
       end
     end
 

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 4
   - 0
-  - 3
-  - 1
-  version: 0.0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alex Sharp
@@ -15,13 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: Scripts include git workflow scripts that integrate with pivotal tracker.
 email: 
-- asharp@optimiscorp.com
+- ajsharp@gmail.com
 executables: 
 - finish-feature
 - start-feature